diff options
188 files changed, 25944 insertions, 11249 deletions
@@ -16,6 +16,7 @@ Thank you! * Alon Levy * Alex Camelio * András Veres-Szentkirályi +* Asheesh Laroia * Bassam Kurdali * Bernhard Keller * Brandon Invergo @@ -28,6 +29,7 @@ Thank you! * David Thompson * Daniel Neel * Deb Nicholson +* Devan Goodwin * Derek Moore * Duncan Paterson * Elrond of Samba TNG @@ -42,12 +44,14 @@ Thank you! * Jim Campbell * Joar Wandborg * Jorge Araya Navarro +* Josephine Bartholoma * Karen Rustad * Kenneth Dombrowski * Kushal Kumaran * Kuno Woudt * Laura Arjona * Larisa Hoffenbecker +* Lenna Peterson * Luke Slater * Manuel Urbano Santos * Marcel van der Boom diff --git a/Makefile.in b/Makefile.in index a79d6cbc..b9b91a0e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,7 @@ pkgpythondir = @pkgpythondir@ pkgpyexecdir = @pkgpyexecdir@ PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir) -all: install +all: develop .PHONY: all install develop uninstall distclean info install-html html \ install-pdf pdf install-dvi dvi install-ps ps clean dist check \ diff --git a/bootstrap.sh b/bootstrap.sh index 1540ea4b..78d0f1c7 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,3 +1,4 @@ #!/bin/bash +aclocal -I m4 --install autoreconf -fvi diff --git a/devtools/make_example_database.sh b/devtools/make_example_database.sh new file mode 100755 index 00000000..7e857f53 --- /dev/null +++ b/devtools/make_example_database.sh @@ -0,0 +1,105 @@ +#!/bin/bash + +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 GNU MediaGoblin Contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +USAGE="Usage: $0 -h | [-p PATH] -e ENVIRONMENT" + +ENVIRONMENT="migration-18" +USER_DEV="user_dev_default" +DEV_ENV_DIRECTORY_PATH="../mg-dev-environments" + +while getopts ":hp:e:" opt; +do + case $opt in + h) + echo $USAGE + echo "Sets up an example mediagoblin instance for testing code." + echo "" + echo " -h Shows this help message." + echo " -p=PATH The path to your mg-dev-environments repository" + echo " -e=ENVIRONMENT The name of the environment you want to set up. Useful" + echo " if you want to set up a database from a past version." + echo " This defaults to a database from the most recent version" + echo " of master." + exit 1 + ;; + e) + ENVIRONMENT=$OPTARG + ;; + p) + DEV_ENV_DIRECTORY_PATH=$OPTARG + ;; + \?) + echo "Invalid Option: -$OPTARG" >&2 + ;; + :) + echo "Option -$OPTARG requires an argument" >&2 + ;; + esac +done + +if [ ! -d $DEV_ENV_DIRECTORY_PATH ]; then + echo "$DEV_ENV_DIRECTORY_PATH not found. Have you downloaded the repo from \ +git@gitorious.org:mediagoblin/mg-dev-environments.git ?" >&2 + echo "" + exit 1 +fi + +if [ ! -d "user_dev" ]; then + echo "ERROR: This script should be executed from within your mediagoblin \ +instance directory" >&2 + exit 1 +fi + +if [ ! -e "$DEV_ENV_DIRECTORY_PATH/$ENVIRONMENT.tar.gz" ]; then + echo "$ENVIRONMENT.tar.gz not found in directory $DEV_ENV_DIRECTORY_PATH" >&2 + exit 1 +else + echo "***WARNING!***" + echo "This script will WIPE YOUR FULL CURRENT ENVIRONMENT and REPLACE IT with a test database and media!" + echo "Your databases and user_dev/ will all likely be wiped!" + echo -n "Do you want to continue? (y/n) " + read -n1 USER_CONFIRM + echo "" + counter=0 + while [ "$USER_CONFIRM"=="y" ]; do + case $USER_CONFIRM in + y) + break + ;; + n) + exit 1 + ;; + *) + if [ $counter -lt 5 ]; then + echo "Invalid option. Please enter 'y' or 'n'" + echo "Do you want to continue? (y/n)" + read -n1 USER_CONFIRM + echo "" + counter+=1 + continue + else + exit 1 + fi + ;; + esac + done + tar -xzf $DEV_ENV_DIRECTORY_PATH/$ENVIRONMENT.tar.gz + tar -xzf $DEV_ENV_DIRECTORY_PATH/$USER_DEV.tar.gz + echo "Completed." + exit 0 +fi diff --git a/docs/source/index.rst b/docs/source/index.rst index e7fda4ad..3ead6136 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -44,6 +44,7 @@ MediaGoblin website. It is written for site administrators. siteadmin/relnotes siteadmin/theming siteadmin/plugins + siteadmin/commandline-upload .. _core-plugin-section: @@ -61,6 +62,7 @@ Part 2: Core plugin documentation plugindocs/basic_auth plugindocs/openid plugindocs/persona + plugindocs/ldap Part 3: Plugin Writer's Guide diff --git a/docs/source/plugindocs/ldap.rst b/docs/source/plugindocs/ldap.rst new file mode 100644 index 00000000..3938c0c7 --- /dev/null +++ b/docs/source/plugindocs/ldap.rst @@ -0,0 +1,2 @@ +.. include:: ../../../mediagoblin/plugins/ldap/README.rst + diff --git a/docs/source/siteadmin/commandline-upload.rst b/docs/source/siteadmin/commandline-upload.rst new file mode 100644 index 00000000..be19df58 --- /dev/null +++ b/docs/source/siteadmin/commandline-upload.rst @@ -0,0 +1,41 @@ +.. MediaGoblin Documentation + + Written in 2011, 2012 by MediaGoblin contributors + + To the extent possible under law, the author(s) have dedicated all + copyright and related and neighboring rights to this software to + the public domain worldwide. This software is distributed without + any warranty. + + You should have received a copy of the CC0 Public Domain + Dedication along with this software. If not, see + <http://creativecommons.org/publicdomain/zero/1.0/>. + +====================== +Command-line uploading +====================== + +Want to submit media via the command line? It's fairly easy to do:: + + ./bin/gmg addmedia username your_media.jpg + +This will submit the file "your_media.jpg" to be a media entry +associated with the user "username". + +You can get help on all the available options by running:: + + ./bin/gmg addmedia --help + +Here's a longer example that makes use of more options:: + + ./bin/gmg addmedia aveyah awesome_spaceship.png \ + --title "My awesome spaceship" \ + --description "Flying my awesome spaceship, since I'm an awesome pilot" \ + --license "http://creativecommons.org/licenses/by-sa/3.0/" \ + --tags "spaceships, pilots, awesome" \ + --slug "awesome-spaceship" + +You can also pass in the `--celery` option if you would prefer that +your media be passed over to celery to be processed rather than be +processed immediately. + diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 8f34e145..3542bdcb 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -21,6 +21,105 @@ This chapter has important information for releases in it. If you're upgrading from a previous release, please read it carefully, or at least skim over it. +0.6.1 +===== + +This is a short, bugfix release. + +**Do this to upgrade** + +1. Update to the latest release. If checked out from git, run: + ``git fetch && git checkout -q v0.6.1`` +2. Make sure to run + ``./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate`` + +This release switches the default terms of service to be off by +default and corrects some mistakes in the default terms of service. + +Turning the terms of service on is very easy, just set ``show_tos`` in +the ``[mediagoblin]`` section of your config to ``true``. + + +0.6.0 +===== + +**Do this to upgrade** + +1. Update to the latest release. If checked out from git, run: + ``git fetch && git checkout -q v0.6.0`` +2. Make sure to run + ``./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate`` + +That's it, probably! If you run into problems, don't hesitate to +`contact us <http://mediagoblin.org/pages/join.html>`_ +(IRC is often best). + +This tool has a lot of new tools for administrators, hence the +nickname "Lore of the Admin"! + +**New features:** + +- New tools to control how much users can upload, both as a general + user limit, or per file. + + You can set this with the following options in your mediagoblin + config file: `upload_limit` and `max_file_size`. Both are integers + in megabytes. + + There is an option to control how much each individual user can + upload too, though an interface for this is not yet exposed. See + the "uploaded" field on the core__users table. + +- MediaGoblin now contains an authentication plugin for ldap! You + can turn on the mediagoblin.plugins.ldap plugin to make use of + this. See the documentation: :ref:`ldap-plugin` + +- There's a new command line upload tool! At long last! See + `./bin/gmg addmedia --help` for info on how to use this. + +- There's now a terms of service document included in MediaGoblin. + It's turned on by default, but you can turn it off if you prefer, + just set the configuration option of `show_tos` in the [mediagoblin] + section of your config to false. + + Alternately, you can override the template for the terms of service + document to set up your own. + +- We have a lot of new administrative tooling features! + - There's a built-in privileges/permissions system now. + Administrators are given access to modifying these parameters + from a user administration panel. + - Users can submit reports about other problematic users or media + and administrators are given tools to resolve said reports and + ban/unban users if needed. + +- New version of video.js is included with MediaGoblin. Slight + amount of skinning to match the MediaGoblin look, otherwise also + uses the new default skin. + +Developer-oriented changes: + +- New developer tool for quickly setting up a development environment + in `devtools/make_example_database.sh`. Requires doing a checkout + of our other tool `mg_dev_environments <https://gitorious.org/mediagoblin/mg-dev-environments/>`_ + (probably in the parent Directory) though! +- A "foundations" framework has entered into the codebase. + This is mostly just relevant to coders, but it does mean that it's + much easier to add database structures that need some entries filled + automatically by default. +- Refactoring to the authentication code and the reprocessing code + + +0.5.1 +===== + +v0.5.1 is a bugfix release... the steps are the same as for 0.5.1. + +**Bugfixes:** + +- python 2.6 compatibility restored +- Fixed last release's release notes ;) + 0.5.0 ===== @@ -48,9 +147,9 @@ now. Otherwise, jump in and have fun! :) 3. We have made a script to transition your ``mediagoblin_local.ini`` file for - you. This script can be found at + you. This script can be found at: -.. add a link to the script + http://mediagoblin.org/download/0.5.0_config_converter.py If you run into problems, don't hesitate to `contact us <http://mediagoblin.org/pages/join.html>`_ diff --git a/mediagoblin.ini b/mediagoblin.ini index cb908dd2..dc88cafa 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -20,6 +20,9 @@ email_debug_mode = true # Set to false to disable registrations allow_registration = true +# Set to false to disable the ability for users to report offensive content +allow_reporting = true + ## Uncomment this to put some user-overriding templates here # local_templates = %(here)s/user_dev/templates/ @@ -29,6 +32,9 @@ allow_registration = true ## install other themes. # theme = airy +## If you want the terms of service displayed, you can uncomment this +# show_tos = true + [storage:queuestore] base_dir = %(here)s/user_dev/media/queue diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index 3594c909..9ff2a374 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.6.0.dev" +__version__ = "0.6.2.dev" diff --git a/mediagoblin/admin/views.py b/mediagoblin/admin/views.py deleted file mode 100644 index 22ca74a3..00000000 --- a/mediagoblin/admin/views.py +++ /dev/null @@ -1,48 +0,0 @@ -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -from werkzeug.exceptions import Forbidden - -from mediagoblin.db.models import MediaEntry -from mediagoblin.decorators import require_active_login -from mediagoblin.tools.response import render_to_response - -@require_active_login -def admin_processing_panel(request): - ''' - Show the global processing panel for this instance - ''' - # TODO: Why not a "require_admin_login" decorator throwing a 403 exception? - if not request.user.is_admin: - raise Forbidden() - - processing_entries = MediaEntry.query.filter_by(state = u'processing').\ - order_by(MediaEntry.created.desc()) - - # Get media entries which have failed to process - failed_entries = MediaEntry.query.filter_by(state = u'failed').\ - order_by(MediaEntry.created.desc()) - - processed_entries = MediaEntry.query.filter_by(state = u'processed').\ - order_by(MediaEntry.created.desc()).limit(10) - - # Render to response - return render_to_response( - request, - 'mediagoblin/admin/panel.html', - {'processing_entries': processing_entries, - 'failed_entries': failed_entries, - 'processed_entries': processed_entries}) diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index 2a6abb47..7a688a49 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -25,9 +25,4 @@ auth_routes = [ ('mediagoblin.auth.verify_email', '/verify_email/', 'mediagoblin.auth.views:verify_email'), ('mediagoblin.auth.resend_verification', '/resend_verification/', - 'mediagoblin.auth.views:resend_activation'), - ('mediagoblin.auth.forgot_password', '/forgot_password/', - 'mediagoblin.auth.views:forgot_password'), - ('mediagoblin.auth.verify_forgot_password', - '/forgot_password/verify/', - 'mediagoblin.auth.views:verify_forgot_password')] + 'mediagoblin.auth.views:resend_activation')] diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index 579775ff..88716e1c 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -14,12 +14,14 @@ # 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 logging import wtforms +from sqlalchemy import or_ from mediagoblin import mg_globals from mediagoblin.tools.crypto import get_timed_signer_url -from mediagoblin.db.models import User +from mediagoblin.db.models import User, Privilege from mediagoblin.tools.mail import (normalize_email, send_email, email_debug_message) from mediagoblin.tools.template import render_template @@ -101,38 +103,6 @@ def send_verification_email(user, request, email=None, rendered_email) -EMAIL_FP_VERIFICATION_TEMPLATE = ( - u"{uri}?" - u"token={fp_verification_key}") - - -def send_fp_verification_email(user, request): - """ - Send the verification email to users to change their password. - - Args: - - user: a user object - - request: the request - """ - fp_verification_key = get_timed_signer_url('mail_verification_token') \ - .dumps(user.id) - - rendered_email = render_template( - request, 'mediagoblin/auth/fp_verification_email.txt', - {'username': user.username, - 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format( - uri=request.urlgen('mediagoblin.auth.verify_forgot_password', - qualified=True), - fp_verification_key=fp_verification_key)}) - - # TODO: There is no error handling in place - send_email( - mg_globals.app_config['email_sender_address'], - [user.email], - 'GNU MediaGoblin - Change forgotten password!', - rendered_email) - - def basic_extra_validation(register_form, *args): users_with_username = User.query.filter_by( username=register_form.username.data).count() @@ -161,6 +131,14 @@ def register_user(request, register_form): # Create the user user = auth.create_user(register_form) + # give the user the default privileges + default_privileges = [ + Privilege.query.filter(Privilege.privilege_name==u'commenter').first(), + Privilege.query.filter(Privilege.privilege_name==u'uploader').first(), + Privilege.query.filter(Privilege.privilege_name==u'reporter').first()] + user.all_privileges += default_privileges + user.save() + # log the user in request.session['user_id'] = unicode(user.id) request.session.save() @@ -196,7 +174,10 @@ def check_auth_enabled(): def no_auth_logout(request): - """Log out the user if authentication_disabled, but don't delete the messages""" + """ + Log out the user if no authentication is enabled, but don't delete + the messages + """ if not mg_globals.app.auth and 'user_id' in request.session: del request.session['user_id'] request.session.save() diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index d114833c..3d132f84 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -17,18 +17,15 @@ from itsdangerous import BadSignature from mediagoblin import messages, mg_globals -from mediagoblin.db.models import User +from mediagoblin.db.models import User, Privilege from mediagoblin.tools.crypto import get_timed_signer_url from mediagoblin.decorators import auth_enabled, allow_registration from mediagoblin.tools.response import render_to_response, redirect, render_404 from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.mail import email_debug_message from mediagoblin.tools.pluginapi import hook_handle -from mediagoblin.auth import forms as auth_forms from mediagoblin.auth.tools import (send_verification_email, register_user, - send_fp_verification_email, check_login_simple) -from mediagoblin import auth @allow_registration @@ -150,9 +147,12 @@ def verify_email(request): user = User.query.filter_by(id=int(token)).first() - if user and user.email_verified is False: - user.status = u'active' - user.email_verified = True + if user and user.has_privilege(u'active') is False: + user.verification_key = None + user.all_privileges.append( + Privilege.query.filter( + Privilege.privilege_name==u'active').first()) + user.save() messages.add_message( @@ -186,7 +186,7 @@ def resend_activation(request): return redirect(request, 'mediagoblin.auth.login') - if request.user.email_verified: + if request.user.has_privilege(u'active'): messages.add_message( request, messages.ERROR, @@ -204,161 +204,3 @@ def resend_activation(request): return redirect( request, 'mediagoblin.user_pages.user_home', user=request.user.username) - - -def forgot_password(request): - """ - Forgot password view - - Sends an email with an url to renew forgotten password. - Use GET querystring parameter 'username' to pre-populate the input field - """ - if not 'pass_auth' in request.template_env.globals: - return redirect(request, 'index') - - fp_form = auth_forms.ForgotPassForm(request.form, - username=request.args.get('username')) - - if not (request.method == 'POST' and fp_form.validate()): - # Either GET request, or invalid form submitted. Display the template - return render_to_response(request, - 'mediagoblin/auth/forgot_password.html', {'fp_form': fp_form,}) - - # If we are here: method == POST and form is valid. username casing - # has been sanitized. Store if a user was found by email. We should - # not reveal if the operation was successful then as we don't want to - # leak if an email address exists in the system. - found_by_email = '@' in fp_form.username.data - - if found_by_email: - user = User.query.filter_by( - email = fp_form.username.data).first() - # Don't reveal success in case the lookup happened by email address. - success_message=_("If that email address (case sensitive!) is " - "registered an email has been sent with instructions " - "on how to change your password.") - - else: # found by username - user = User.query.filter_by( - username = fp_form.username.data).first() - - if user is None: - messages.add_message(request, - messages.WARNING, - _("Couldn't find someone with that username.")) - return redirect(request, 'mediagoblin.auth.forgot_password') - - success_message=_("An email has been sent with instructions " - "on how to change your password.") - - if user and not(user.email_verified and user.status == 'active'): - # Don't send reminder because user is inactive or has no verified email - messages.add_message(request, - messages.WARNING, - _("Could not send password recovery email as your username is in" - "active or your account's email address has not been verified.")) - - return redirect(request, 'mediagoblin.user_pages.user_home', - user=user.username) - - # SUCCESS. Send reminder and return to login page - if user: - email_debug_message(request) - send_fp_verification_email(user, request) - - messages.add_message(request, messages.INFO, success_message) - return redirect(request, 'mediagoblin.auth.login') - - -def verify_forgot_password(request): - """ - Check the forgot-password verification and possibly let the user - change their password because of it. - """ - # get form data variables, and specifically check for presence of token - formdata = _process_for_token(request) - if not formdata['has_token']: - return render_404(request) - - formdata_vars = formdata['vars'] - - # Catch error if token is faked or expired - try: - token = get_timed_signer_url("mail_verification_token") \ - .loads(formdata_vars['token'], max_age=10*24*3600) - except BadSignature: - messages.add_message( - request, - messages.ERROR, - _('The verification key or user id is incorrect.')) - - return redirect( - request, - 'index') - - # check if it's a valid user id - user = User.query.filter_by(id=int(token)).first() - - # no user in db - if not user: - messages.add_message( - request, messages.ERROR, - _('The user id is incorrect.')) - return redirect( - request, 'index') - - # check if user active and has email verified - if user.email_verified and user.status == 'active': - - cp_form = auth_forms.ChangePassForm(formdata_vars) - - if request.method == 'POST' and cp_form.validate(): - user.pw_hash = auth.gen_password_hash( - cp_form.password.data) - user.save() - - messages.add_message( - request, - messages.INFO, - _("You can now log in using your new password.")) - return redirect(request, 'mediagoblin.auth.login') - else: - return render_to_response( - request, - 'mediagoblin/auth/change_fp.html', - {'cp_form': cp_form,}) - - if not user.email_verified: - messages.add_message( - request, messages.ERROR, - _('You need to verify your email before you can reset your' - ' password.')) - - if not user.status == 'active': - messages.add_message( - request, messages.ERROR, - _('You are no longer an active user. Please contact the system' - ' admin to reactivate your account.')) - - return redirect( - request, 'index') - - -def _process_for_token(request): - """ - Checks for tokens in formdata without prior knowledge of request method - - For now, returns whether the userid and token formdata variables exist, and - the formdata variables in a hash. Perhaps an object is warranted? - """ - # retrieve the formdata variables - if request.method == 'GET': - formdata_vars = request.GET - else: - formdata_vars = request.form - - formdata = { - 'vars': formdata_vars, - 'has_token': 'token' in formdata_vars} - - return formdata diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 6f318d64..cc1ac637 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -42,6 +42,14 @@ allow_comments = boolean(default=True) # Whether comments are ascending or descending comments_ascending = boolean(default=True) +# Enable/disable reporting +allow_reporting = boolean(default=True) + +# Enable/disable terms of service +# ... Note: you can override the terms of service template on a +# per-site basis... +show_tos = boolean(default=False) + # By default not set, but you might want something like: # "%(here)s/user_dev/templates/" local_templates = string() diff --git a/mediagoblin/db/extratypes.py b/mediagoblin/db/extratypes.py index f2304af0..8e04d58d 100644 --- a/mediagoblin/db/extratypes.py +++ b/mediagoblin/db/extratypes.py @@ -15,6 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +from sqlalchemy.ext.mutable import Mutable from sqlalchemy.types import TypeDecorator, Unicode, TEXT import json @@ -38,7 +39,7 @@ class PathTupleWithSlashes(TypeDecorator): return value -# The following class and only this one class is in very +# The following two classes and only these two classes is in very # large parts based on example code from sqlalchemy. # # The original copyright notice and license follows: @@ -61,3 +62,30 @@ class JSONEncoded(TypeDecorator): if value is not None: value = json.loads(value) return value + + +class MutationDict(Mutable, dict): + @classmethod + def coerce(cls, key, value): + "Convert plain dictionaries to MutationDict." + + if not isinstance(value, MutationDict): + if isinstance(value, dict): + return MutationDict(value) + + # this call will raise ValueError + return Mutable.coerce(key, value) + else: + return value + + def __setitem__(self, key, value): + "Detect dictionary set events and emit change events." + + dict.__setitem__(self, key, value) + self.changed() + + def __delitem__(self, key): + "Detect dictionary del events and emit change events." + + dict.__delitem__(self, key) + self.changed() diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py index e75f3757..e39070c3 100644 --- a/mediagoblin/db/migration_tools.py +++ b/mediagoblin/db/migration_tools.py @@ -16,6 +16,7 @@ from mediagoblin.tools.common import simple_printer from sqlalchemy import Table +from sqlalchemy.sql import select class TableAlreadyExists(Exception): pass @@ -286,3 +287,35 @@ def inspect_table(metadata, table_name): """Simple helper to get a ref to an already existing table""" return Table(table_name, metadata, autoload=True, autoload_with=metadata.bind) + +def replace_table_hack(db, old_table, replacement_table): + """ + A function to fully replace a current table with a new one for migrati- + -ons. This is necessary because some changes are made tricky in some situa- + -tion, for example, dropping a boolean column in sqlite is impossible w/o + this method + + :param old_table A ref to the old table, gotten through + inspect_table + + :param replacement_table A ref to the new table, gotten through + inspect_table + + Users are encouraged to sqlalchemy-migrate replace table solutions, unless + that is not possible... in which case, this solution works, + at least for sqlite. + """ + surviving_columns = replacement_table.columns.keys() + old_table_name = old_table.name + for row in db.execute(select( + [column for column in old_table.columns + if column.name in surviving_columns])): + + db.execute(replacement_table.insert().values(**row)) + db.commit() + + old_table.drop() + db.commit() + + replacement_table.rename(old_table_name) + db.commit() diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index e2a0bf26..426080a2 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -19,16 +19,18 @@ import uuid from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, Integer, Unicode, UnicodeText, DateTime, - ForeignKey) + ForeignKey, Date) from sqlalchemy.exc import ProgrammingError from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.sql import and_ from migrate.changeset.constraint import UniqueConstraint -from mediagoblin.db.extratypes import JSONEncoded -from mediagoblin.db.migration_tools import RegisterMigration, inspect_table -from mediagoblin.db.models import MediaEntry, Collection, User, MediaComment +from mediagoblin.db.extratypes import JSONEncoded, MutationDict +from mediagoblin.db.migration_tools import ( + RegisterMigration, inspect_table, replace_table_hack) +from mediagoblin.db.models import (MediaEntry, Collection, MediaComment, User, + Privilege) MIGRATIONS = {} @@ -469,13 +471,12 @@ def wants_notifications(db): """Add a wants_notifications field to User model""" metadata = MetaData(bind=db.bind) user_table = inspect_table(metadata, "core__users") - col = Column('wants_notifications', Boolean, default=True) col.create(user_table) - db.commit() + @RegisterMigration(16, MIGRATIONS) def upload_limits(db): """Add user upload limit columns""" @@ -494,3 +495,228 @@ def upload_limits(db): col.create(media_entry_table) db.commit() + + +@RegisterMigration(17, MIGRATIONS) +def add_file_metadata(db): + """Add file_metadata to MediaFile""" + metadata = MetaData(bind=db.bind) + media_file_table = inspect_table(metadata, "core__mediafiles") + + col = Column('file_metadata', MutationDict.as_mutable(JSONEncoded)) + col.create(media_file_table) + + db.commit() + +################### +# Moderation tables +################### + +class ReportBase_v0(declarative_base()): + __tablename__ = 'core__reports' + id = Column(Integer, primary_key=True) + reporter_id = Column(Integer, ForeignKey(User.id), nullable=False) + report_content = Column(UnicodeText) + reported_user_id = Column(Integer, ForeignKey(User.id), nullable=False) + created = Column(DateTime, nullable=False, default=datetime.datetime.now) + discriminator = Column('type', Unicode(50)) + resolver_id = Column(Integer, ForeignKey(User.id)) + resolved = Column(DateTime) + result = Column(UnicodeText) + __mapper_args__ = {'polymorphic_on': discriminator} + + +class CommentReport_v0(ReportBase_v0): + __tablename__ = 'core__reports_on_comments' + __mapper_args__ = {'polymorphic_identity': 'comment_report'} + + id = Column('id',Integer, ForeignKey('core__reports.id'), + primary_key=True) + comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=True) + + +class MediaReport_v0(ReportBase_v0): + __tablename__ = 'core__reports_on_media' + __mapper_args__ = {'polymorphic_identity': 'media_report'} + + id = Column('id',Integer, ForeignKey('core__reports.id'), primary_key=True) + media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=True) + + +class UserBan_v0(declarative_base()): + __tablename__ = 'core__user_bans' + user_id = Column(Integer, ForeignKey(User.id), nullable=False, + primary_key=True) + expiration_date = Column(Date) + reason = Column(UnicodeText, nullable=False) + + +class Privilege_v0(declarative_base()): + __tablename__ = 'core__privileges' + id = Column(Integer, nullable=False, primary_key=True, unique=True) + privilege_name = Column(Unicode, nullable=False, unique=True) + + +class PrivilegeUserAssociation_v0(declarative_base()): + __tablename__ = 'core__privileges_users' + privilege_id = Column( + 'core__privilege_id', + Integer, + ForeignKey(User.id), + primary_key=True) + user_id = Column( + 'core__user_id', + Integer, + ForeignKey(Privilege.id), + primary_key=True) + + +PRIVILEGE_FOUNDATIONS_v0 = [{'privilege_name':u'admin'}, + {'privilege_name':u'moderator'}, + {'privilege_name':u'uploader'}, + {'privilege_name':u'reporter'}, + {'privilege_name':u'commenter'}, + {'privilege_name':u'active'}] + + +# vR1 stands for "version Rename 1". This only exists because we need +# to deal with dropping some booleans and it's otherwise impossible +# with sqlite. + +class User_vR1(declarative_base()): + __tablename__ = 'rename__users' + id = Column(Integer, primary_key=True) + username = Column(Unicode, nullable=False, unique=True) + email = Column(Unicode, nullable=False) + pw_hash = Column(Unicode) + created = Column(DateTime, nullable=False, default=datetime.datetime.now) + wants_comment_notification = Column(Boolean, default=True) + wants_notifications = Column(Boolean, default=True) + license_preference = Column(Unicode) + url = Column(Unicode) + bio = Column(UnicodeText) # ?? + uploaded = Column(Integer, default=0) + upload_limit = Column(Integer) + + +@RegisterMigration(18, MIGRATIONS) +def create_moderation_tables(db): + + # First, we will create the new tables in the database. + #-------------------------------------------------------------------------- + ReportBase_v0.__table__.create(db.bind) + CommentReport_v0.__table__.create(db.bind) + MediaReport_v0.__table__.create(db.bind) + UserBan_v0.__table__.create(db.bind) + Privilege_v0.__table__.create(db.bind) + PrivilegeUserAssociation_v0.__table__.create(db.bind) + + db.commit() + + # Then initialize the tables that we will later use + #-------------------------------------------------------------------------- + metadata = MetaData(bind=db.bind) + privileges_table= inspect_table(metadata, "core__privileges") + user_table = inspect_table(metadata, 'core__users') + user_privilege_assoc = inspect_table( + metadata, 'core__privileges_users') + + # This section initializes the default Privilege foundations, that + # would be created through the FOUNDATIONS system in a new instance + #-------------------------------------------------------------------------- + for parameters in PRIVILEGE_FOUNDATIONS_v0: + db.execute(privileges_table.insert().values(**parameters)) + + db.commit() + + # This next section takes the information from the old is_admin and status + # columns and converts those to the new privilege system + #-------------------------------------------------------------------------- + admin_users_ids, active_users_ids, inactive_users_ids = ( + db.execute( + user_table.select().where( + user_table.c.is_admin==True)).fetchall(), + db.execute( + user_table.select().where( + user_table.c.is_admin==False).where( + user_table.c.status==u"active")).fetchall(), + db.execute( + user_table.select().where( + user_table.c.is_admin==False).where( + user_table.c.status!=u"active")).fetchall()) + + # Get the ids for each of the privileges so we can reference them ~~~~~~~~~ + (admin_privilege_id, uploader_privilege_id, + reporter_privilege_id, commenter_privilege_id, + active_privilege_id) = [ + db.execute(privileges_table.select().where( + privileges_table.c.privilege_name==privilege_name)).first()['id'] + for privilege_name in + [u"admin",u"uploader",u"reporter",u"commenter",u"active"] + ] + + # Give each user the appopriate privileges depending whether they are an + # admin, an active user or an inactive user ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + for admin_user in admin_users_ids: + admin_user_id = admin_user['id'] + for privilege_id in [admin_privilege_id, uploader_privilege_id, + reporter_privilege_id, commenter_privilege_id, + active_privilege_id]: + db.execute(user_privilege_assoc.insert().values( + core__privilege_id=admin_user_id, + core__user_id=privilege_id)) + + for active_user in active_users_ids: + active_user_id = active_user['id'] + for privilege_id in [uploader_privilege_id, reporter_privilege_id, + commenter_privilege_id, active_privilege_id]: + db.execute(user_privilege_assoc.insert().values( + core__privilege_id=active_user_id, + core__user_id=privilege_id)) + + for inactive_user in inactive_users_ids: + inactive_user_id = inactive_user['id'] + for privilege_id in [uploader_privilege_id, reporter_privilege_id, + commenter_privilege_id]: + db.execute(user_privilege_assoc.insert().values( + core__privilege_id=inactive_user_id, + core__user_id=privilege_id)) + + db.commit() + + # And then, once the information is taken from is_admin & status columns + # we drop all of the vestigial columns from the User table. + #-------------------------------------------------------------------------- + if db.bind.url.drivername == 'sqlite': + # SQLite has some issues that make it *impossible* to drop boolean + # columns. So, the following code is a very hacky workaround which + # makes it possible. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + User_vR1.__table__.create(db.bind) + db.commit() + new_user_table = inspect_table(metadata, 'rename__users') + replace_table_hack(db, user_table, new_user_table) + else: + # If the db is not run using SQLite, this process is much simpler ~~~~~ + + status = user_table.columns['status'] + email_verified = user_table.columns['email_verified'] + is_admin = user_table.columns['is_admin'] + status.drop() + email_verified.drop() + is_admin.drop() + + db.commit() +@RegisterMigration(19, MIGRATIONS) +def drop_MediaEntry_collected(db): + """ + Drop unused MediaEntry.collected column + """ + metadata = MetaData(bind=db.bind) + + media_collected= inspect_table(metadata, 'core__media_entries') + media_collected = media_collected.columns['collected'] + + media_collected.drop() + + db.commit() diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 57b27d83..25ce6642 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -46,7 +46,6 @@ class UserMixin(object): def bio_html(self): return cleaned_markdown_conversion(self.bio) - class GenerateSlugMixin(object): """ Mixin to add a generate_slug method to objects. diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index a2675678..b750375d 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -23,15 +23,15 @@ import datetime from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \ Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \ - SmallInteger + SmallInteger, Date from sqlalchemy.orm import relationship, backref, with_polymorphic from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.sql.expression import desc from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property - -from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded +from mediagoblin.db.extratypes import (PathTupleWithSlashes, JSONEncoded, + MutationDict) from mediagoblin.db.base import Base, DictReadAttrProxy from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \ MediaCommentMixin, CollectionMixin, CollectionItemMixin @@ -48,6 +48,7 @@ from migrate import changeset _log = logging.getLogger(__name__) + class User(Base, UserMixin): """ TODO: We should consider moving some rarely used fields @@ -63,15 +64,12 @@ class User(Base, UserMixin): # point. email = Column(Unicode, nullable=False) pw_hash = Column(Unicode) - email_verified = Column(Boolean, default=False) created = Column(DateTime, nullable=False, default=datetime.datetime.now) - status = Column(Unicode, default=u"needs_email_verification", nullable=False) # Intented to be nullable=False, but migrations would not work for it # set to nullable=True implicitly. wants_comment_notification = Column(Boolean, default=True) wants_notifications = Column(Boolean, default=True) license_preference = Column(Unicode) - is_admin = Column(Boolean, default=False, nullable=False) url = Column(Unicode) bio = Column(UnicodeText) # ?? uploaded = Column(Integer, default=0) @@ -84,8 +82,8 @@ class User(Base, UserMixin): return '<{0} #{1} {2} {3} "{4}">'.format( self.__class__.__name__, self.id, - 'verified' if self.email_verified else 'non-verified', - 'admin' if self.is_admin else 'user', + 'verified' if self.has_privilege(u'active') else 'non-verified', + 'admin' if self.has_privilege(u'admin') else 'user', self.username) def delete(self, **kwargs): @@ -107,6 +105,36 @@ class User(Base, UserMixin): super(User, self).delete(**kwargs) _log.info('Deleted user "{0}" account'.format(self.username)) + def has_privilege(self,*priv_names): + """ + This method checks to make sure a user has all the correct privileges + to access a piece of content. + + :param priv_names A variable number of unicode objects which rep- + -resent the different privileges which may give + the user access to this content. If you pass + multiple arguments, the user will be granted + access if they have ANY of the privileges + passed. + """ + if len(priv_names) == 1: + priv = Privilege.query.filter( + Privilege.privilege_name==priv_names[0]).one() + return (priv in self.all_privileges) + elif len(priv_names) > 1: + return self.has_privilege(priv_names[0]) or \ + self.has_privilege(*priv_names[1:]) + return False + + def is_banned(self): + """ + Checks if this user is banned. + + :returns True if self is banned + :returns False if self is not + """ + return UserBan.query.get(self.id) is not None + class Client(Base): """ @@ -191,7 +219,6 @@ class MediaEntry(Base, MediaEntryMixin): state = Column(Unicode, default=u'unprocessed', nullable=False) # or use sqlalchemy.types.Enum? license = Column(Unicode) - collected = Column(Integer, default=0) file_size = Column(Integer, default=0) fail_error = Column(Unicode) @@ -267,6 +294,35 @@ class MediaEntry(Base, MediaEntryMixin): if media is not None: return media.url_for_self(urlgen) + def get_file_metadata(self, file_key, metadata_key=None): + """ + Return the file_metadata dict of a MediaFile. If metadata_key is given, + return the value of the key. + """ + media_file = MediaFile.query.filter_by(media_entry=self.id, + name=unicode(file_key)).first() + + if media_file: + if metadata_key: + return media_file.file_metadata.get(metadata_key, None) + + return media_file.file_metadata + + def set_file_metadata(self, file_key, **kwargs): + """ + Update the file_metadata of a MediaFile. + """ + media_file = MediaFile.query.filter_by(media_entry=self.id, + name=unicode(file_key)).first() + + file_metadata = media_file.file_metadata or {} + + for key, value in kwargs.iteritems(): + file_metadata[key] = value + + media_file.file_metadata = file_metadata + media_file.save() + @property def media_data(self): return getattr(self, self.media_data_ref) @@ -363,6 +419,7 @@ class MediaFile(Base): nullable=False) name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) file_path = Column(PathTupleWithSlashes) + file_metadata = Column(MutationDict.as_mutable(JSONEncoded)) __table_args__ = ( PrimaryKeyConstraint('media_entry', 'name_id'), @@ -644,16 +701,198 @@ class ProcessingNotification(Notification): 'polymorphic_identity': 'processing_notification' } - with_polymorphic( Notification, [ProcessingNotification, CommentNotification]) +class ReportBase(Base): + """ + This is the basic report object which the other reports are based off of. + + :keyword reporter_id Holds the id of the user who created + the report, as an Integer column. + :keyword report_content Hold the explanation left by the repor- + -ter to indicate why they filed the + report in the first place, as a + Unicode column. + :keyword reported_user_id Holds the id of the user who created + the content which was reported, as + an Integer column. + :keyword created Holds a datetime column of when the re- + -port was filed. + :keyword discriminator This column distinguishes between the + different types of reports. + :keyword resolver_id Holds the id of the moderator/admin who + resolved the report. + :keyword resolved Holds the DateTime object which descri- + -bes when this report was resolved + :keyword result Holds the UnicodeText column of the + resolver's reasons for resolving + the report this way. Some of this + is auto-generated + """ + __tablename__ = 'core__reports' + id = Column(Integer, primary_key=True) + reporter_id = Column(Integer, ForeignKey(User.id), nullable=False) + reporter = relationship( + User, + backref=backref("reports_filed_by", + lazy="dynamic", + cascade="all, delete-orphan"), + primaryjoin="User.id==ReportBase.reporter_id") + report_content = Column(UnicodeText) + reported_user_id = Column(Integer, ForeignKey(User.id), nullable=False) + reported_user = relationship( + User, + backref=backref("reports_filed_on", + lazy="dynamic", + cascade="all, delete-orphan"), + primaryjoin="User.id==ReportBase.reported_user_id") + created = Column(DateTime, nullable=False, default=datetime.datetime.now()) + discriminator = Column('type', Unicode(50)) + resolver_id = Column(Integer, ForeignKey(User.id)) + resolver = relationship( + User, + backref=backref("reports_resolved_by", + lazy="dynamic", + cascade="all, delete-orphan"), + primaryjoin="User.id==ReportBase.resolver_id") + + resolved = Column(DateTime) + result = Column(UnicodeText) + __mapper_args__ = {'polymorphic_on': discriminator} + + def is_comment_report(self): + return self.discriminator=='comment_report' + + def is_media_entry_report(self): + return self.discriminator=='media_report' + + def is_archived_report(self): + return self.resolved is not None + + def archive(self,resolver_id, resolved, result): + self.resolver_id = resolver_id + self.resolved = resolved + self.result = result + + +class CommentReport(ReportBase): + """ + Reports that have been filed on comments. + :keyword comment_id Holds the integer value of the reported + comment's ID + """ + __tablename__ = 'core__reports_on_comments' + __mapper_args__ = {'polymorphic_identity': 'comment_report'} + + id = Column('id',Integer, ForeignKey('core__reports.id'), + primary_key=True) + comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=True) + comment = relationship( + MediaComment, backref=backref("reports_filed_on", + lazy="dynamic")) + + +class MediaReport(ReportBase): + """ + Reports that have been filed on media entries + :keyword media_entry_id Holds the integer value of the reported + media entry's ID + """ + __tablename__ = 'core__reports_on_media' + __mapper_args__ = {'polymorphic_identity': 'media_report'} + + id = Column('id',Integer, ForeignKey('core__reports.id'), + primary_key=True) + media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=True) + media_entry = relationship( + MediaEntry, + backref=backref("reports_filed_on", + lazy="dynamic")) + +class UserBan(Base): + """ + Holds the information on a specific user's ban-state. As long as one of + these is attached to a user, they are banned from accessing mediagoblin. + When they try to log in, they are greeted with a page that tells them + the reason why they are banned and when (if ever) the ban will be + lifted + + :keyword user_id Holds the id of the user this object is + attached to. This is a one-to-one + relationship. + :keyword expiration_date Holds the date that the ban will be lifted. + If this is null, the ban is permanent + unless a moderator manually lifts it. + :keyword reason Holds the reason why the user was banned. + """ + __tablename__ = 'core__user_bans' + + user_id = Column(Integer, ForeignKey(User.id), nullable=False, + primary_key=True) + expiration_date = Column(Date) + reason = Column(UnicodeText, nullable=False) + + +class Privilege(Base): + """ + The Privilege table holds all of the different privileges a user can hold. + If a user 'has' a privilege, the User object is in a relationship with the + privilege object. + + :keyword privilege_name Holds a unicode object that is the recognizable + name of this privilege. This is the column + used for identifying whether or not a user + has a necessary privilege or not. + + """ + __tablename__ = 'core__privileges' + + id = Column(Integer, nullable=False, primary_key=True) + privilege_name = Column(Unicode, nullable=False, unique=True) + all_users = relationship( + User, + backref='all_privileges', + secondary="core__privileges_users") + + def __init__(self, privilege_name): + ''' + Currently consructors are required for tables that are initialized thru + the FOUNDATIONS system. This is because they need to be able to be con- + -structed by a list object holding their arg*s + ''' + self.privilege_name = privilege_name + + def __repr__(self): + return "<Privilege %s>" % (self.privilege_name) + + +class PrivilegeUserAssociation(Base): + ''' + This table holds the many-to-many relationship between User and Privilege + ''' + + __tablename__ = 'core__privileges_users' + + privilege_id = Column( + 'core__privilege_id', + Integer, + ForeignKey(User.id), + primary_key=True) + user_id = Column( + 'core__user_id', + Integer, + ForeignKey(Privilege.id), + primary_key=True) + MODELS = [ - User, Client, RequestToken, AccessToken, NonceTimestamp, MediaEntry, Tag, - MediaTag, MediaComment, Collection, CollectionItem, MediaFile, FileKeynames, - MediaAttachmentFile, ProcessingMetaData, Notification, CommentNotification, - ProcessingNotification, CommentSubscription] + User, MediaEntry, Tag, MediaTag, MediaComment, Collection, CollectionItem, + MediaFile, FileKeynames, MediaAttachmentFile, ProcessingMetaData, + Notification, CommentNotification, ProcessingNotification, Client, + CommentSubscription, ReportBase, CommentReport, MediaReport, UserBan, + Privilege, PrivilegeUserAssociation, + RequestToken, AccessToken, NonceTimestamp] """ Foundations are the default rows that are created immediately after the tables @@ -669,7 +908,13 @@ MODELS = [ FOUNDATIONS = {User:user_foundations} """ -FOUNDATIONS = {} +privilege_foundations = [{'privilege_name':u'admin'}, + {'privilege_name':u'moderator'}, + {'privilege_name':u'uploader'}, + {'privilege_name':u'reporter'}, + {'privilege_name':u'commenter'}, + {'privilege_name':u'active'}] +FOUNDATIONS = {Privilege:privilege_foundations} ###################################################### # Special, migrations-tracking table diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 8431361a..7a0a3a73 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -67,7 +67,6 @@ def check_collection_slug_used(creator_id, slug, ignore_c_id): does_exist = Session.query(Collection.id).filter(filt).first() is not None return does_exist - if __name__ == '__main__': from mediagoblin.db.open import setup_connection_and_db_from_config diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 685d0d98..8515d091 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -22,25 +22,45 @@ from oauthlib.oauth1 import ResourceEndpoint from mediagoblin import mg_globals as mgg from mediagoblin import messages -from mediagoblin.db.models import MediaEntry, User -from mediagoblin.tools.response import json_response, redirect, render_404 +from mediagoblin.db.models import MediaEntry, User, MediaComment +from mediagoblin.tools.response import ( + redirect, render_404, + render_user_banned, json_response) from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.oauth.tools.request import decode_authorization_header from mediagoblin.oauth.oauth import GMGRequestValidator + +def user_not_banned(controller): + """ + Requires that the user has not been banned. Otherwise redirects to the page + explaining why they have been banned + """ + @wraps(controller) + def wrapper(request, *args, **kwargs): + if request.user: + if request.user.is_banned(): + return render_user_banned(request) + return controller(request, *args, **kwargs) + + return wrapper + + def require_active_login(controller): """ - Require an active login from the user. + Require an active login from the user. If the user is banned, redirects to + the "You are Banned" page. """ @wraps(controller) + @user_not_banned def new_controller_func(request, *args, **kwargs): if request.user and \ - request.user.status == u'needs_email_verification': + not request.user.has_privilege(u'active'): return redirect( request, 'mediagoblin.user_pages.user_home', user=request.user.username) - elif not request.user or request.user.status != u'active': + elif not request.user or not request.user.has_privilege(u'active'): next_url = urljoin( request.urlgen('mediagoblin.auth.login', qualified=True), @@ -53,6 +73,34 @@ def require_active_login(controller): return new_controller_func + +def user_has_privilege(privilege_name): + """ + Requires that a user have a particular privilege in order to access a page. + In order to require that a user have multiple privileges, use this + decorator twice on the same view. This decorator also makes sure that the + user is not banned, or else it redirects them to the "You are Banned" page. + + :param privilege_name A unicode object that is that represents + the privilege object. This object is + the name of the privilege, as assigned + in the Privilege.privilege_name column + """ + + def user_has_privilege_decorator(controller): + @wraps(controller) + @require_active_login + def wrapper(request, *args, **kwargs): + user_id = request.user.id + if not request.user.has_privilege(privilege_name): + raise Forbidden() + + return controller(request, *args, **kwargs) + + return wrapper + return user_has_privilege_decorator + + def active_user_from_url(controller): """Retrieve User() from <user> URL pattern and pass in as url_user=... @@ -75,7 +123,7 @@ def user_may_delete_media(controller): @wraps(controller) def wrapper(request, *args, **kwargs): uploader_id = kwargs['media'].uploader - if not (request.user.is_admin or + if not (request.user.has_privilege(u'admin') or request.user.id == uploader_id): raise Forbidden() @@ -92,7 +140,7 @@ def user_may_alter_collection(controller): def wrapper(request, *args, **kwargs): creator_id = request.db.User.query.filter_by( username=request.matchdict['user']).first().id - if not (request.user.is_admin or + if not (request.user.has_privilege(u'admin') or request.user.id == creator_id): raise Forbidden() @@ -256,6 +304,48 @@ def allow_registration(controller): return wrapper +def allow_reporting(controller): + """ Decorator for if reporting is enabled""" + @wraps(controller) + def wrapper(request, *args, **kwargs): + if not mgg.app_config["allow_reporting"]: + messages.add_message( + request, + messages.WARNING, + _('Sorry, reporting is disabled on this instance.')) + return redirect(request, 'index') + + return controller(request, *args, **kwargs) + + return wrapper + +def get_optional_media_comment_by_id(controller): + """ + Pass in a MediaComment based off of a url component. Because of this decor- + -ator's use in filing Media or Comment Reports, it has two valid outcomes. + + :returns The view function being wrapped with kwarg `comment` set to + the MediaComment who's id is in the URL. If there is a + comment id in the URL and if it is valid. + :returns The view function being wrapped with kwarg `comment` set to + None. If there is no comment id in the URL. + :returns A 404 Error page, if there is a comment if in the URL and it + is invalid. + """ + @wraps(controller) + def wrapper(request, *args, **kwargs): + if 'comment' in request.matchdict: + comment = MediaComment.query.filter_by( + id=request.matchdict['comment']).first() + + if comment is None: + return render_404(request) + + return controller(request, comment=comment, *args, **kwargs) + else: + return controller(request, comment=None, *args, **kwargs) + return wrapper + def auth_enabled(controller): """Decorator for if an auth plugin is enabled""" @@ -272,6 +362,31 @@ def auth_enabled(controller): return wrapper +def require_admin_or_moderator_login(controller): + """ + Require a login from an administrator or a moderator. + """ + @wraps(controller) + def new_controller_func(request, *args, **kwargs): + if request.user and \ + not request.user.has_privilege(u'admin',u'moderator'): + + raise Forbidden() + elif not request.user: + next_url = urljoin( + request.urlgen('mediagoblin.auth.login', + qualified=True), + request.url) + + return redirect(request, 'mediagoblin.auth.login', + next=next_url) + + return controller(request, *args, **kwargs) + + return new_controller_func + + + def oauth_required(controller): """ Used to wrap API endpoints where oauth is required """ @wraps(controller) @@ -283,7 +398,7 @@ def oauth_required(controller): error = "Missing required parameter." return json_response({"error": error}, status=400) - + request_validator = GMGRequestValidator() resource_endpoint = ResourceEndpoint(request_validator) valid, request = resource_endpoint.validate_protected_resource_request( diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 388940b4..2c9b5e99 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -19,7 +19,7 @@ import wtforms from mediagoblin.tools.text import tag_length_validator from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.tools.licenses import licenses_as_choices -from mediagoblin.auth.forms import normalize_user_or_email_field +from mediagoblin.auth.tools import normalize_user_or_email_field class EditForm(wtforms.Form): @@ -81,6 +81,7 @@ class EditAttachmentsForm(wtforms.Form): attachment_file = wtforms.FileField( 'File') + class EditCollectionForm(wtforms.Form): title = wtforms.TextField( _('Title'), diff --git a/mediagoblin/edit/lib.py b/mediagoblin/edit/lib.py index aab537a0..6acebc96 100644 --- a/mediagoblin/edit/lib.py +++ b/mediagoblin/edit/lib.py @@ -19,6 +19,6 @@ def may_edit_media(request, media): """Check, if the request's user may edit the media details""" if media.uploader == request.user.id: return True - if request.user.is_admin: + if request.user.has_privilege(u'admin'): return True return False diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py index 75f5a6d8..a2d03d26 100644 --- a/mediagoblin/edit/routing.py +++ b/mediagoblin/edit/routing.py @@ -24,8 +24,6 @@ add_route('mediagoblin.edit.account', '/edit/account/', 'mediagoblin.edit.views:edit_account') add_route('mediagoblin.edit.delete_account', '/edit/account/delete/', 'mediagoblin.edit.views:delete_account') -add_route('mediagoblin.edit.pass', '/edit/password/', - 'mediagoblin.edit.views:change_pass') add_route('mediagoblin.edit.verify_email', '/edit/verify_email/', 'mediagoblin.edit.views:verify_email') add_route('mediagoblin.edit.email', '/edit/email/', diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index be19bcda..80590875 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -23,8 +23,8 @@ from werkzeug.utils import secure_filename from mediagoblin import messages from mediagoblin import mg_globals -from mediagoblin import auth -from mediagoblin.auth import tools as auth_tools +from mediagoblin.auth import (check_password, + tools as auth_tools) from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import (require_active_login, active_user_from_url, @@ -83,7 +83,7 @@ def edit_media(request, media): return redirect_obj(request, media) - if request.user.is_admin \ + if request.user.has_privilege(u'admin') \ and media.uploader != request.user.id \ and request.method != 'POST': messages.add_message( @@ -184,7 +184,7 @@ def legacy_edit_profile(request): def edit_profile(request, url_user=None): # admins may edit any user profile if request.user.username != url_user.username: - if not request.user.is_admin: + if not request.user.has_privilege(u'admin'): raise Forbidden(_("You can only edit your own profile.")) # No need to warn again if admin just submitted an edited profile @@ -324,7 +324,7 @@ def edit_collection(request, collection): return redirect_obj(request, collection) - if request.user.is_admin \ + if request.user.has_privilege(u'admin') \ and collection.creator != request.user.id \ and request.method != 'POST': messages.add_message( @@ -338,46 +338,6 @@ def edit_collection(request, collection): 'form': form}) -@require_active_login -def change_pass(request): - # If no password authentication, no need to change your password - if 'pass_auth' not in request.template_env.globals: - return redirect(request, 'index') - - form = forms.ChangePassForm(request.form) - user = request.user - - if request.method == 'POST' and form.validate(): - - if not auth.check_password( - form.old_password.data, user.pw_hash): - form.old_password.errors.append( - _('Wrong password')) - - return render_to_response( - request, - 'mediagoblin/edit/change_pass.html', - {'form': form, - 'user': user}) - - # Password matches - user.pw_hash = auth.gen_password_hash( - form.new_password.data) - user.save() - - messages.add_message( - request, messages.SUCCESS, - _('Your password was changed successfully')) - - return redirect(request, 'mediagoblin.edit.account') - - return render_to_response( - request, - 'mediagoblin/edit/change_pass.html', - {'form': form, - 'user': user}) - - def verify_email(request): """ Email verification view for changing email address @@ -442,7 +402,7 @@ def change_email(request): _('Sorry, a user with that email address' ' already exists.')) - if form.password and user.pw_hash and not auth.check_password( + if form.password and user.pw_hash and not check_password( form.password.data, user.pw_hash): form.password.errors.append( _('Wrong password')) diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index 165a76fd..a1eb599d 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -49,6 +49,10 @@ SUBCOMMAND_MAP = { 'setup': 'mediagoblin.gmg_commands.reprocess:reprocess_parser_setup', 'func': 'mediagoblin.gmg_commands.reprocess:reprocess', 'help': 'Reprocess media entries'}, + 'addmedia': { + 'setup': 'mediagoblin.gmg_commands.addmedia:parser_setup', + 'func': 'mediagoblin.gmg_commands.addmedia:addmedia', + 'help': 'Reprocess media entries'}, # 'theme': { # 'setup': 'mediagoblin.gmg_commands.theme:theme_parser_setup', # 'func': 'mediagoblin.gmg_commands.theme:theme', diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py new file mode 100644 index 00000000..c33a8c56 --- /dev/null +++ b/mediagoblin/gmg_commands/addmedia.py @@ -0,0 +1,105 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import os + +from mediagoblin.gmg_commands import util as commands_util +from mediagoblin.submit.lib import ( + submit_media, get_upload_file_limits, + FileUploadLimit, UserUploadLimit, UserPastUploadLimit) + +from mediagoblin import mg_globals + + +def parser_setup(subparser): + subparser.add_argument( + 'username', + help="Name of user this media entry belongs to") + subparser.add_argument( + 'filename', + help="Local file on filesystem") + subparser.add_argument( + "-d", "--description", + help="Description for this media entry") + subparser.add_argument( + "-t", "--title", + help="Title for this media entry") + subparser.add_argument( + "-l", "--license", + help=( + "License this media entry will be released under. " + "Should be a URL.")) + subparser.add_argument( + "-T", "--tags", + help=( + "Comma separated list of tags for this media entry.")) + subparser.add_argument( + "-s", "--slug", + help=( + "Slug for this media entry. " + "Will be autogenerated if unspecified.")) + + subparser.add_argument( + '--celery', + action='store_true', + help="Don't process eagerly, pass off to celery") + + +def addmedia(args): + # Run eagerly unless explicetly set not to + if not args.celery: + os.environ['CELERY_ALWAYS_EAGER'] = 'true' + + app = commands_util.setup_app(args) + + # get the user + user = app.db.User.query.filter_by(username=args.username.lower()).first() + if user is None: + print "Sorry, no user by username '%s'" % args.username + return + + # check for the file, if it exists... + filename = os.path.split(args.filename)[-1] + abs_filename = os.path.abspath(args.filename) + if not os.path.exists(abs_filename): + print "Can't find a file with filename '%s'" % args.filename + return + + upload_limit, max_file_size = get_upload_file_limits(user) + + def maybe_unicodeify(some_string): + # this is kinda terrible + if some_string is None: + return None + else: + return unicode(some_string) + + try: + submit_media( + mg_app=app, + user=user, + submitted_file=file(abs_filename, 'r'), filename=filename, + title=maybe_unicodeify(args.title), + description=maybe_unicodeify(args.description), + license=maybe_unicodeify(args.license), + tags_string=maybe_unicodeify(args.tags) or u"", + upload_limit=upload_limit, max_file_size=max_file_size) + except FileUploadLimit: + print "This file is larger than the upload limits for this site." + except UserUploadLimit: + print "This file will put this user past their upload limits." + except UserPastUploadLimit: + print "This user is already past their upload limits." diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index 961752f6..05762946 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -25,7 +25,8 @@ from mediagoblin.tools.common import import_component _log = logging.getLogger(__name__) logging.basicConfig() -_log.setLevel(logging.DEBUG) +## Let's not set the level as debug by default to avoid confusing users :) +# _log.setLevel(logging.DEBUG) def dbupdate_parse_setup(subparser): pass @@ -92,14 +93,8 @@ forgotten to add it? ({1})'.format(plugin, exc)) try: foundations = import_component('{0}.models:FOUNDATIONS'.format(plugin)) except ImportError as exc: - _log.debug('No foundations found for {0}: {1}'.format( - plugin, - exc)) - foundations = {} except AttributeError as exc: - _log.debug('Could not find FOUNDATIONS in {0}.models, have you \ -forgotten to add it? ({1})'.format(plugin, exc)) foundations = {} if models: diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py index e44b0aa9..4a730d9e 100644 --- a/mediagoblin/gmg_commands/users.py +++ b/mediagoblin/gmg_commands/users.py @@ -53,8 +53,17 @@ def adduser(args): entry.username = unicode(args.username.lower()) entry.email = unicode(args.email) entry.pw_hash = auth.gen_password_hash(args.password) - entry.status = u'active' - entry.email_verified = True + default_privileges = [ + db.Privilege.query.filter( + db.Privilege.privilege_name==u'commenter').one(), + db.Privilege.query.filter( + db.Privilege.privilege_name==u'uploader').one(), + db.Privilege.query.filter( + db.Privilege.privilege_name==u'reporter').one(), + db.Privilege.query.filter( + db.Privilege.privilege_name==u'active').one() + ] + entry.all_privileges = default_privileges entry.save() print "User created (and email marked as verified)" @@ -74,7 +83,10 @@ def makeadmin(args): user = db.User.query.filter_by( username=unicode(args.username.lower())).one() if user: - user.is_admin = True + user.all_privileges.append( + db.Privilege.query.filter( + db.Privilege.privilege_name==u'admin').one() + ) user.save() print 'The user is now Admin' else: diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo Binary files differindex e3888f1b..7c3411f7 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 efd7d170..8c0454d9 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n" "MIME-Version: 1.0\n" @@ -23,41 +23,41 @@ 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/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "عÙوًا، التسجيل غير Ù…ØªØ§Ø Ù‡Ù†Ø§." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "اسم المستخدم او الايميل" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "اسم مستخدم او ايميل غير صØÙŠØ." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "هذا الØقل لا يأخذ ايميل." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "هذا الØقل ÙŠØتاج ايميل." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الايميل." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -83,77 +83,37 @@ msgstr "لقد قمت بالÙعل بالتØقق من عنوان البريد Ø msgid "Resent your verification email." msgstr "أعدنا إرسال رسالة التØقق." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "إذا كان هذا الايميل(Øساس للØرو٠الكبيرة والصغيرة!) Ù…Ùسجل, Ùقد تم إرسال ايميل به تعليمات عن كيÙية تغيير رقمك السري." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "لم نتمكن من العثور على Ø£Øد له أسم المستخدم هذا." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "لقد تم إرسال ايميل به تعليمات عن كيÙية تغيير رقمك السري." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتØقق من بريدك الإلكتروني." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "تستطيع الآن الدخول باستخدام رقمك السري الجديد." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "العنوان" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "وص٠هذا العمل." #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "بامكانك استخدام âŽ\n<a href=\"http://daringfireball.net/projects/markdown/basics\">âŽ\nMarkdown</a> للإدراج." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "الوسوم" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "قم بÙصل المØددات بÙصلة." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "المسار" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "لا يمكن ترك المسار Ùارغًا" @@ -163,7 +123,7 @@ msgid "" "this." msgstr "مقدمة عنوان هذه الميديا, غالبا لن تØتاج لتغيره." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "ترخيص" @@ -196,45 +156,46 @@ msgstr "تÙضيل رخصة" msgid "This will be your default license on upload forms." msgstr "سو٠تكون هذه رخصتك المبدئية ÙÙŠ نماذج التØميل." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "لا يمكن ترك العنوان Ùارغًا" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "وص٠هذه المجموعة" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "مقدمة عنوان هذه المجموعة, غالبا لن تØتاج لتغيره." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr " كلمة السر القديمة" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "قم بإدخال رقمك السري القديم Øتى تثبت انك صاØب هذا الØساب." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "رقم سري جديد" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "كلمة السر" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -271,7 +232,7 @@ msgstr "تم ØÙظ خصائص Øسابك" msgid "You need to confirm the deletion of your account." msgstr "يجب عليك تأكيد إلغاء Øسابك." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -285,18 +246,14 @@ msgstr "توجد مجموعة اخرى بهذا المسار لهذا المست msgid "You are editing another user's collection. Proceed with caution." msgstr "أنت تعدل مجموعة مستخدم آخر. كن Øذرًا أثناء العملية." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "كلمة سر خاطئة" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "كلمة سر خاطئة" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "لم يتم ربط الثيم... لاتوجد مجموعة ثيمات\n" @@ -344,7 +301,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "Ùشل ÙÙŠ تØويل الÙيديو" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "قام بالتعليق على مشاركتك" @@ -366,14 +359,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "اسم المستخدم" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -387,6 +396,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "اسم المستخدم او الايميل" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "إذا كان هذا الايميل(Øساس للØرو٠الكبيرة والصغيرة!) Ù…Ùسجل, Ùقد تم إرسال ايميل به تعليمات عن كيÙية تغيير رقمك السري." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "لم نتمكن من العثور على Ø£Øد له أسم المستخدم هذا." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "لقد تم إرسال ايميل به تعليمات عن كيÙية تغيير رقمك السري." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتØقق من بريدك الإلكتروني." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "تستطيع الآن الدخول باستخدام رقمك السري الجديد." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "قم بضبط رقمك السري الجديد" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "قم بضبط رقم سري" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "ألا تملك Øسابًا بعد؟" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "أنشئ Øسابًا هنا!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "استعادة كلمة السر" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "ارسل تعليمات" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "أنسيت كلمة سرك؟" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "المكان" @@ -396,6 +493,10 @@ msgstr "المكان" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "عرض ÙÙŠ <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "سماØ" @@ -465,7 +566,7 @@ msgstr "عميلك المنشئ" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "اضÙ" @@ -543,10 +644,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "تسجيل دخول" @@ -606,8 +707,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -618,117 +719,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "المل٠المعطى لهذا النوع من الميديا غير صØÙŠØ." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "الملÙ" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "يجب أن تضع ملÙًا." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "يا سلام! Ù†Ùشرَت!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "تم إضاÙØ© المجموعة \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "صورة قزم مرتبك" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "تأكد من بريدك الإلكترونى!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "تسجيل خروج" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>'s Øساب" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "تغيير خصائص الØساب" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "لوØØ© معالجة الوسائط" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "تسجيل خروج" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "أض٠وسائط" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "إنشاء مجموعة جديدة" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "صورة قزم مرتبك" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Ø£Øدث الوسائط" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "يمكنك متابعة عملية معالجة وسائط معرضك من هنا." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "توجد وسائط تØت المعالجة" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "لا توجد وسائط تØت المعالجة" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Ùشلت معالجة هذه الملÙات:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "لا توجد مداخل Ùاشلة!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "آخر 10 تØويلات ناجØØ©" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "لا يوجد مداخل Ù…Ùعالجة بعد! " - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -782,50 +887,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "قم بضبط رقمك السري الجديد" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "قم بضبط رقم سري" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "استعادة كلمة السر" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "ارسل تعليمات" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "مرØبًا يا %(username)sØŒ\n\nإن أردت تغيير كلمة سرك ÙÙŠ غنو ميدياغوبلن ÙاÙØªØ Ø§Ù„ÙˆØµÙ„Ø© التالية ÙÙŠ متصÙØÙƒ:\n\n%(verification_url)s\n\nإن كنت ترى أن هذه الرسالة وصلتك خطأً Ùتجاهلها واستمتع بØياتك!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "ألا تملك Øسابًا بعد؟" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "أنشئ Øسابًا هنا!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "أنسيت كلمة سرك؟" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -861,6 +922,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "تم النشر ÙˆÙقا Ù„ <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Source code</a> متاØ." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "استكشÙ" @@ -910,13 +975,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "تعديل المرÙقات Ù„ %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "مرÙقات" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "أض٠مرÙقة" @@ -933,7 +998,7 @@ msgstr "ألغÙ" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -945,17 +1010,6 @@ msgstr "اØÙظ التغييرات" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -983,11 +1037,11 @@ msgstr "تØرير %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "نغيير %(username)s خصائص الØساب" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "إلغ٠Øسابي" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1022,8 +1076,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1043,7 +1100,7 @@ msgstr "يتم تØديد الميديا ب: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "تØميل" @@ -1067,7 +1124,7 @@ msgstr "تستطيع الØصول على متصÙØ Øديث âŽ\n»يمكنه #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "مل٠أصلي" @@ -1126,30 +1183,231 @@ msgstr "بنية الملÙ" msgid "Object Height" msgstr "طول الكائن" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "عذرا, لن يتم تشغيل هذا الÙيديو لأن âŽ\n»متصÙØÙƒ لا يدعم HTML5 âŽ\n»Ùيديو." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "تستطيع الØصول على متصÙØ Øديث âŽ\n»يمكنه تشغيل هذا الÙيديو ÙÙŠ <a href=\"http://getfirefox.com\">âŽ\n» http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "يمكنك متابعة عملية معالجة وسائط معرضك من هنا." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "توجد وسائط تØت المعالجة" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "لا توجد وسائط تØت المعالجة" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Ùشلت معالجة هذه الملÙات:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "لا توجد مداخل Ùاشلة!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "آخر 10 تØويلات ناجØØ©" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "لا يوجد مداخل Ù…Ùعالجة بعد! " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "إضاÙØ© مجموعة" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "اض٠الميديا الخاصة بك" @@ -1234,7 +1492,7 @@ msgstr "اض٠هذا التعليق" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1261,85 +1519,107 @@ msgstr "يمكنك متابعة عملية معالجة وسائط معرضك Ù… msgid "Your last 10 successful uploads" msgstr "آخر 10 تØميلات ناجØØ© خاصة بك" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "مل٠%(username)s الشخصي" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "عذرًا، تعذر العثور على مستخدم بهذا الاسم." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "يجب التØقق من البريد الإلكتروني" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "أوشكنا على الانتهاء! ما زال Øسابك بØاجة إلى التÙعيل." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "ستصلك رسالة إلكترونية خلال Ù„Øظات بها التعليمات." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "إن لم تصل." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "أعد إرسال رسالة التØقق" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "سجّل Ø£Øدهم Øسابًا بهذا الاسم، ولكننا بانتظار التÙعيل Øتى الآن." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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> وإعادة إرسالها." +msgid "%(username)s's profile" +msgstr "مل٠%(username)s الشخصي" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "هذه زاوية لتخبر الآخرين Ùيها عن Ù†Ùسك." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "ØرّÙر المل٠الشخصي" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "لم يعبئ هذا العضو بيانات ملÙÙ‡ بعد." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "تØديد مجموعة" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "أظهÙر كل وسائط %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "هنا ستظهر وسائطك، ولكن يبدو أنك لم تض٠شيئًا بعد." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "لا يبدو أنه توجد أي وسائط هنا Øتى الآن..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "يجب التØقق من البريد الإلكتروني" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "أوشكنا على الانتهاء! ما زال Øسابك بØاجة إلى التÙعيل." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "ستصلك رسالة إلكترونية خلال Ù„Øظات بها التعليمات." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "إن لم تصل." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "أعد إرسال رسالة التØقق" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "سجّل Ø£Øدهم Øسابًا بهذا الاسم، ولكننا بانتظار التÙعيل Øتى الآن." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(إلغاء)" @@ -1388,6 +1668,10 @@ msgstr "اجدد" msgid "older" msgstr "اقدم" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "تØدد ب" @@ -1396,34 +1680,34 @@ msgstr "تØدد ب" msgid "Could not read the image file." msgstr "لم نستطيع قراءة هذه الصورة." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "ويØÙŠ!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Øدث خطأ" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "غير Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø°Ù‡ العملية" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "عذرا ديÙ, لا استطيع ترك تÙعل هذا!</p><p>لقد Øاولت تشغيل خاصية ليست مسموØØ© لك. هل كنت تØاول إلغاء جميع Øسابات المستخدمين مجددا؟" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1491,15 +1775,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "عذرا, لقد قمت بادخال تعليق Ùارغ." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "لقد تم إرسال تعليقك!" @@ -1521,43 +1809,43 @@ msgstr "\"%s\" توجد بالÙعل ÙÙŠ المجموعة \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" Ø£ÙضيÙت للمجموعة \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "لقد قمت بإلغاء الميديا." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "لم يتم إلغاء الميديا لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "أنت على وشك Øذ٠وسائط مستخدم آخر. كن Øذرًا أثناء العملية." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "لقد قمت بإلغاء المادة من المجموعة." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "لم يتم إلغاء المادة لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "أنت على وشك Øذ٠مادة من مجموعة مستخدم آخر. كن Øذرا." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "لقد قمت بإلغاء المجموعة \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "لم يتم إلغاء المجموعة لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "أنت على وشك Øذ٠مجموعة مستخدم آخر. كن Øذرا." diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo Binary files differindex 9ffae8c1..484b62ba 100644 --- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po index e669285a..4d3be4a3 100644 --- a/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mediagoblin/language/bg/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "ПотребителÑко име или е-поща" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Ðеправилно потребителÑко име или е-поща." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Вече може да влезете Ñ Ð½Ð¾Ð²Ð°Ñ‚Ð° Ñи парола." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Заглавие" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Може да ползвате\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> за форматиране." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Етикети" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -159,7 +119,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Лиценз" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Заглавието е задължително" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "ОпиÑание на колекциÑта" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Стара парола" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Ðова парола" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Ðов Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Парола" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "ÐаÑтройките на профила Ñа запазени" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,18 +242,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Грешна парола" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Паролата ви е Ñменена уÑпешно" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "ÐдреÑÑŠÑ‚ на е-пощата ви е проверен." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Грешна парола" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "" @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "ПотребителÑко име" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "ПотребителÑко име или е-поща" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "ПотребителÑко име или е-поща" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Вече може да влезете Ñ Ð½Ð¾Ð²Ð°Ñ‚Ð° Ñи парола." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Паролата ви е Ñменена уÑпешно" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Задаване на нова парола" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Задаване на парола" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "ПромÑна паролата на %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "ЗапиÑ" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "ÐÑмате профил?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Създайте Ñи!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "ВъзÑтановÑване на парола" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Изпращане на указаниÑ" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Забравили Ñте паролата Ñи?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "МеÑтоположение" @@ -392,6 +489,10 @@ msgstr "МеÑтоположение" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Разглеждане Ñ <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Позволение" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "ДобавÑне" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Вход" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,115 +715,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Файл" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "ТрÑбва да предоÑтавите файл" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Проверете е-пощата Ñи!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "изход" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "ПромÑна наÑтройките на профила" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Изход" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Създаване на нова колекциÑ" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "ПоÑледни 10 уÑпешни качваниÑ" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Задаване на нова парола" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Задаване на парола" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "ВъзÑтановÑване на парола" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Изпращане на указаниÑ" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "ÐÑмате профил?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Създайте Ñи!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Забравили Ñте паролата Ñи?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Публикувано ÑъглаÑно <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">ИзходниÑÑ‚ код</a> е наличен." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -929,7 +994,7 @@ msgstr "Отказ" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "Запазване на промените" msgid "Changing %(username)s's email" msgstr "ПромÑна е-пощата на %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "ЗапиÑ" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "ПромÑна паролата на %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "Редактиране на %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "ПромÑна наÑтройките на профила на %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Изтриване на профила ми" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Е-поща" @@ -1018,8 +1072,11 @@ msgstr "Ðови коментари" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1039,7 +1096,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "ИзтеглÑне" @@ -1063,7 +1120,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1122,30 +1179,231 @@ msgstr "Файлов формат" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "ПоÑледни 10 уÑпешни качваниÑ" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "ДобавÑне на колекциÑ" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1230,7 +1488,7 @@ msgstr "ДобавÑне на коментара" msgid "Comment Preview" msgstr "Преглед на коментара" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Добавено" @@ -1257,85 +1515,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Профил на %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Ðе е открит такъв потребител." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Ðужна е проверка на е-пощата" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format +msgid "" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "" +msgid "%(username)s's profile" +msgstr "Профил на %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Редактиране на профила" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Преглед на колекциите" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Ðужна е проверка на е-пощата" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(премахване)" @@ -1384,6 +1664,10 @@ msgstr "по-ново" msgid "older" msgstr "по-Ñтаро" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1392,34 +1676,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Опа!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Възникна грешка" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Ðеправилна заÑвка" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "ДейÑтвието не е позволено" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Може да ползвате\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> за форматиране." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Коментарът ви е публикуван." @@ -1517,43 +1805,43 @@ msgstr "\"%s\" вече е в колекциÑта \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" е добавено към колекциÑта \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Изтрихте Ð·Ð°Ð¿Ð¸Ñ Ð¾Ñ‚ колекциÑта." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Изтрихте колекциÑта \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo Binary files differindex 3611ec56..d925b836 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index b061407a..000d84db 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n" "MIME-Version: 1.0\n" @@ -21,41 +21,41 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Ho sentim, el registre està desactivat en aquest cas." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Nom d'usuari o correu" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Lamentablement aquest usuari ja existeix." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Perdó, ja existeix un usuari amb aquesta adreça de correu." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -81,77 +81,37 @@ msgstr "Ja has verificat la teva adreça de correu!" msgid "Resent your verification email." msgstr "Torna'm a enviar el correu de verificació" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "S'ha enviat un correu amb instruccions de com cambiar la teva contrasenya" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "No hem pogut enviar el correu de recuperació de contrasenya perquè el teu nom d'usuari és inactiu o bé l'adreça electrònica del teu compte no ha sigut verificada." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Ara et pots conectar amb la teva nova contrasenya." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "TÃtol" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descripció d'aquest treball." #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Pots utilitzar⎠<a href=\"http://daringfireball.net/projects/markdown/basics\">⎠Markdown</a> per donar-li format" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiquetes" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Separa els tags amb comes." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Llimac" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "El llimac no pot ésser buit" @@ -161,7 +121,7 @@ msgid "" "this." msgstr "El tÃtol de l'adreça d'aquest mitjà . Normalment no necessites modificar això." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Llicència" @@ -194,45 +154,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "El tÃtol no pot ser buit" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descripció d'aquesta col.lecció" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "La part del tÃtol de l'adreça d'aquesta col.lecció. Normalment no cal que canviis això." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Contrasenya antiga" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte és teu." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nova contrasenya" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Contrasenya" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -269,7 +230,7 @@ msgstr "Els detalls del compte s'han guardat" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -283,18 +244,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Contrasenya errònia" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Contrasenya errònia" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "No es pot enllaçar el tema... no hi ha tema establert\n" @@ -342,7 +299,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "La transformació del vÃdeo ha fallat" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "comentat al teu post" @@ -364,14 +357,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nom d'usuari" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -385,6 +394,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Nom d'usuari o correu" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "S'ha enviat un correu amb instruccions de com cambiar la teva contrasenya" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "No hem pogut enviar el correu de recuperació de contrasenya perquè el teu nom d'usuari és inactiu o bé l'adreça electrònica del teu compte no ha sigut verificada." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Ara et pots conectar amb la teva nova contrasenya." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Estableix la teva nova contrasenya" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Establir contrasenya" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Encara no teniu un compte?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Creeu-ne un aquÃ!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Recuperar contrasenya" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Enviar instruccions" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Has oblidat la teva contrasenya?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Ubicació" @@ -394,6 +491,10 @@ msgstr "Ubicació" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Veure a <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Permetre" @@ -463,7 +564,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Afegir" @@ -541,10 +642,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Entra" @@ -604,8 +705,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -616,117 +717,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és và lid." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Fitxer" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Heu d'escollir un fitxer." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Visca! S'ha enviat!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "S'ha afegit la col.leccio \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Modificar els ajustaments del compte" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Quadre de processament de fitxers" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Tots els fitxers" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Mitjans més recents" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Aqui pots seguir l'estat del mitjà que s'està processant a aquesta instà ncia." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "S'està processant el fitxer" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "No s'està processant cap mitjà " - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "No s'han pogut penjar els següents fitxers:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Sense entrades fallades!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Les últimes 10 pujades correctes" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Encara no hi ha entrades processades!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -780,50 +885,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Estableix la teva nova contrasenya" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Establir contrasenya" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Recuperar contrasenya" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Enviar instruccions" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hola %(username)s,⎠⎠per cambiar la teva contrasenya de GNU MediaGoblin, obre la següent URL al ⎠teu navegador:⎠⎠%(verification_url)s⎠⎠Si creus que hi ha un error, ignora el correu i continua essent⎠un goblin feliç!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Encara no teniu un compte?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Creeu-ne un aquÃ!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Has oblidat la teva contrasenya?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -859,6 +920,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Alliberat segons la <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Codi font</a> disponible." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Explorar" @@ -908,13 +973,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editant afegits per a %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -931,7 +996,7 @@ msgstr "Cancel·la" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -943,17 +1008,6 @@ msgstr "Desa els canvis" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -981,11 +1035,11 @@ msgstr "Edició %(media_title)s " msgid "Changing %(username)s's account settings" msgstr "Modificant els detalls del compte de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1020,8 +1074,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1041,7 +1098,7 @@ msgstr "Mitjà marcat amb: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Descarregar" @@ -1065,7 +1122,7 @@ msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'à udio, #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Arxiu original" @@ -1124,30 +1181,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Aqui pots seguir l'estat del mitjà que s'està processant a aquesta instà ncia." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "S'està processant el fitxer" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "No s'està processant cap mitjà " + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "No s'han pogut penjar els següents fitxers:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Sense entrades fallades!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Les últimes 10 pujades correctes" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Encara no hi ha entrades processades!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Afegir a la col.lecció" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Afegeix el teu mitjà " @@ -1232,7 +1490,7 @@ msgstr "Afegir aquest comentari" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1259,85 +1517,107 @@ msgstr "Aqui pots seguir l'estat del mitjà que s'està processant per la teva g msgid "Your last 10 successful uploads" msgstr "Les teves 10 últimes pujades correctes" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Perfil de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Lamentablement no s'ha trobat l'usuari que cercà veu." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Cal que verifiqueu l'adreça electrònica" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Gairebé esteu! Tan sols falta que activeu el vostre compte" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Us hauria d'arribar un correu amb les instruccions per a fer-ho." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Per si no hi fos:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Torna'm a enviar el correu de verificació" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Algú ja ha registrat un compte amb aquest nom d'usuari, però encara l'ha d'activar." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -msgid "" -"If you are that person but you've lost your verification email, you can <a " -"href=\"%(login_url)s\">log in</a> and resend it." -msgstr "Si siu aqeust usuari però heu perdut el correu de verificació, podeu <a href=\"%(login_url)s\">entrar</a> i tornar-lo a enviar." +msgid "%(username)s's profile" +msgstr "Perfil de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Aqui hi ha un espai per explicar de tu als demés" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Edita el perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Aquest usuari encara no ha escrit res al seu perfil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "View all of %(username)s's media" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Aqui és on apareixerà el teu mitjà , però sembla que encara no hi has afegit res." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Sembla que no hi ha cap mitjà aqui encara..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Cal que verifiqueu l'adreça electrònica" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Gairebé esteu! Tan sols falta que activeu el vostre compte" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Us hauria d'arribar un correu amb les instruccions per a fer-ho." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Per si no hi fos:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Torna'm a enviar el correu de verificació" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Algú ja ha registrat un compte amb aquest nom d'usuari, però encara l'ha d'activar." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can <a " +"href=\"%(login_url)s\">log in</a> and resend it." +msgstr "Si siu aqeust usuari però heu perdut el correu de verificació, podeu <a href=\"%(login_url)s\">entrar</a> i tornar-lo a enviar." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1386,6 +1666,10 @@ msgstr "més nou" msgid "older" msgstr "més antic" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1394,34 +1678,34 @@ msgstr "" msgid "Could not read the image file." msgstr "No s'ha pogut llegir l'arxiu d'imatge" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1489,15 +1773,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" @@ -1519,43 +1807,43 @@ msgstr "\"%s\" ja és a la col.lecció \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" afegir a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Has esborrat el mitjà " -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "El mitjà no s'ha esborrat perque no has marcat que n'estiguessis segur." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Ets a punt d'esborrar el mitjà d'un altre usuari. Prossegueix amb cautela." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Has esborrat l'element de la col.lecció" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "L'element no s'ha eliminat perque no has marcat que n'estiguessis segur." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Ets a punt d'esborrar un element de la col.lecció d'un altre usuari. Prossegueix amb cautela." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Has esborrat la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "La col.lecció no s'ha esborrat perquè no has marcat que n'estiguessis segur." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Ets a punt d'esborrar la col.lecció d'un altre usuari. Prossegueix amb cautela." diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo Binary files differindex b524a104..b78e483e 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index b5b546fd..bece988b 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Aputsiaĸ Niels Janussen <aj@isit.gl>, 2013 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012 # Olle Jonsson <olle.jonsson@gmail.com>, 2012 # ttrudslev <tanja.trudslev@gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n" "MIME-Version: 1.0\n" @@ -21,43 +22,43 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Desværre, registrering er ikke muligt pÃ¥ denne instans" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Brugernavn eller email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "Beklager, godkendelse er slÃ¥et fra pÃ¥ denne instans." -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." -msgstr "" +msgstr "Ugyldigt brugernavn eller e-mailadresse." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." -msgstr "" +msgstr "Dette felt accepterer ikke e-mailadresser." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." -msgstr "" +msgstr "Dette felt kræver en e-mailadresse." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Desværre, det brugernavn er allerede brugt" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Desværre, en bruger er allerede oprettet for den email" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "Nøglen til bekræftigelse eller bruger-id er ugyldigt." #: mediagoblin/auth/views.py:161 msgid "" @@ -81,79 +82,39 @@ msgstr "Du har allerede bekræftet din email adresse!" msgid "Resent your verification email." msgstr "Email til godkendelse sendt igen." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "En email er blevet sendt med instruktioner til at ændre dit kodeord." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Vi kunne ikke sende en kodeords nulstillings email da dit brugernavn er inaktivt, eller din konto's email adresse er ikke blevet godkendt." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Du kan nu logge ind med dit nye kodeord." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Beskrivelse af arbejdet" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Du kan bruge\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> til formattering." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Separer tags med kommaer." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" -msgstr "" +msgstr "Webnavn" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" -msgstr "" +msgstr "Webnavnet kan ikke stÃ¥ tomt" #: mediagoblin/edit/forms.py:42 msgid "" @@ -161,7 +122,7 @@ msgid "" "this." msgstr "Titeldelen af dette medie's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licens" @@ -184,61 +145,62 @@ msgstr "Email mig nÃ¥r andre kommenterer pÃ¥ mine medier" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "Aktivér insite-notifikationer for begivenheder." #: mediagoblin/edit/forms.py:69 msgid "License preference" -msgstr "" +msgstr "Præferencer for licens" #: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." -msgstr "" +msgstr "Dette vil blive dit standardlicens i formularer til overførsler." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Titlen kan ikke være tom" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Beskrivelse af denne samling" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Gammelt kodeord" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Skriv dit gamle kodeord for at bevise det er din konto." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Ny kodeord" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" -msgstr "" +msgstr "Ny e-mailadresse" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Kodeord" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Angiv dit kodeord for at bevise at du ejer denne konto." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." -msgstr "" +msgstr "Et post med dette webnavn findes allerede for denne bruger." #: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." @@ -247,11 +209,11 @@ msgstr "Du er ved at ændre en anden brugers' medier. Pas pÃ¥." #: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Du tilføjede den vedhæftede fil %s!" #: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." -msgstr "" +msgstr "Du kan kun redigere din egen profil." #: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." @@ -267,9 +229,9 @@ msgstr "Kontoindstillinger gemt" #: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." -msgstr "" +msgstr "Du skal bekræfte at du vil slette din konto." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -277,24 +239,20 @@ msgstr "Du har allerede en samling ved navn \"%s\"!" #: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "En samling med dette webnavn findes allerede for denne bruger." #: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du er ved at ændre en anden bruger's samling. Pas pÃ¥." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "Din e-mailadresse er blevet bekræftet." + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Kan ikke linke til tema... intet tema sat\n" @@ -315,19 +273,19 @@ msgstr "" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format msgid "Skipping \"%s\"; already set up.\n" -msgstr "" +msgstr "Springer over \"%s\"; allerede konfigureret.\n" #: mediagoblin/gmg_commands/assetlink.py:124 #, python-format msgid "Old link found for \"%s\"; removing.\n" -msgstr "" +msgstr "Gammel henvisning fundet for \"%s\"; fjerner.\n" #: mediagoblin/meddleware/csrf.py:134 msgid "" "CSRF cookie not present. This is most likely the result of a cookie blocker " "or somesuch.<br/>Make sure to permit the settings of cookies for this " "domain." -msgstr "" +msgstr "CSRF-cookie er ikke tilstede. Dette skyldes højest sandsynligt en blokering af cookie eller lignende.<br/>Sørg for at tillade, at der angives cookie'er for dette domæne." #: mediagoblin/media_types/__init__.py:78 #: mediagoblin/media_types/__init__.py:100 @@ -336,42 +294,94 @@ msgstr "Desværre, jeg understøtter ikke den filtype :(" #: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" -msgstr "" +msgstr "unoconv kunne ikke køres, tjek logfilen" #: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" +msgstr "Omkodning af video mislykkedes" + +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" msgstr "" +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 +msgid "commented on your post" +msgstr "kommenterede pÃ¥ dit opslag" + #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Abonnerede pÃ¥ kommentarer pÃ¥ %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Du vil ikke modtage notifikationer for kommentarer pÃ¥ %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Der skal angives en oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Brugernavn" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -379,19 +389,111 @@ msgstr "Email adresse" #: mediagoblin/plugins/basic_auth/forms.py:39 msgid "Username or Email" -msgstr "" +msgstr "Brugernavn eller e-mail" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" +msgstr "Forbliv logget ind" + +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Brugernavn eller email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "En email er blevet sendt med instruktioner til at ændre dit kodeord." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Vi kunne ikke sende en kodeords nulstillings email da dit brugernavn er inaktivt, eller din konto's email adresse er ikke blevet godkendt." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "Bruger-id er ugyldigt." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Du kan nu logge ind med dit nye kodeord." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." msgstr "" +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Ændringen af din adgangskode blev gennemført" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Angiv dit nye kodeord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Angiv kodeord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Ændrer %(username)s's kodeord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Gem" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Har du endnu ikke en konto?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Opret én her!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Generhverv dit kodeord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Send instruktioner" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Glemt dit kodeord?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" -msgstr "" +msgstr "Placering" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 #, python-format msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Vis pÃ¥ <a href=\"%(osm_url)s\">OpenStreetMap</a>" + +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" msgstr "" #: mediagoblin/plugins/oauth/forms.py:29 @@ -432,11 +534,11 @@ msgid "" " <strong>Public</strong> - The client can't make confidential\n" " requests to the GNU MediaGoblin instance (e.g. client-side\n" " JavaScript client)." -msgstr "" +msgstr "<strong>Fortrolig</strong> - Klienten kan foretage\n forespørgsler GNU MediaGoblin-instansen, der ikke kan\n opsnappes af brugeren (dvs. serverside-klienten).<br />\n <strong>Offentlig</strong> - Klienten kan ikke foretage fortrolige\n forespørgsler til GNU MediaGoblin-instansen (dvs. JavaScript-klient\n pÃ¥ klientsiden)." #: mediagoblin/plugins/oauth/forms.py:52 msgid "Redirect URI" -msgstr "" +msgstr "Omdirigér URI" #: mediagoblin/plugins/oauth/forms.py:54 msgid "" @@ -454,120 +556,120 @@ msgstr "Klienten {0} er blevet registreret!" #: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 msgid "OAuth client connections" -msgstr "" +msgstr "OAuth-klientforbindelser" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +msgstr "Dine OAuth-klienter" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" -msgstr "" +msgstr "Tilføj" #: mediagoblin/plugins/openid/__init__.py:97 #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Beklager, der er allerede tilmeldt en konto med dette OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Beklager, OpenID-serveren blev ikke fundet" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Der blev ikke fundet en OpenID-tjeneste for %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Verifikation af %s mislykkedes: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Verifikation blev annulleret" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Din OpenID-url blev glemt." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Du kan ikke slette din eneste OpenID-url, medmindre du har angivet en adgangskode" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Denne OpenID er ikke registreret for denne konto." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "Fjernelse af OpenID blev gennemført." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Tilføj et OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Slet et OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 #: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" -msgstr "" +msgstr "Slet" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID'er" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Log ind" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 #: mediagoblin/templates/mediagoblin/auth/login.html:39 msgid "Logging in failed!" -msgstr "" +msgstr "Login mislykkedes!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Log ind for at oprette en konto!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Eller log ind med et kodeord!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Eller log ind med OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Eller tilmeld dig med OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." @@ -594,7 +696,7 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Din e-postadresse for Persona blev gemt." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" @@ -604,8 +706,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -616,213 +718,173 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Du mÃ¥ give mig en fil" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Juhuu! Delt!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" +msgstr "Samlingen \"%s\" blev tilføjet!" + +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" -msgstr "" +msgstr "log ud" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "" +msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>'s konto" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" -msgstr "" +msgstr "Skift kontoindstillinger" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" -msgstr "" +msgstr "Panel til mediebehandling" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" -msgstr "" +msgstr "Log ud" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" -msgstr "" +msgstr "Tilføj medie" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" +msgstr "Opret ny samling" + +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "" +msgstr "Seneste mediefil" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Godkendelse" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Godkend" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Du er logget ind som" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Ønsker du at godkende" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "et ukendt program" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "for at tilgÃ¥ din konto?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Programmer med adgang til din konto kan:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Afsend nyt medie som dig selv" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Se dine informationer (dvs. profil, medie, osv.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Tilpas dine informationer" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Godkendelse er afsluttet" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Godkendelse er udført" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Har du endnu ikke en konto?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Opret en her!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" +msgstr "Kopiér og indsæt dette i din klient:" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -831,7 +893,7 @@ msgstr "Opret en konto!" #: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" -msgstr "" +msgstr "Opret" #: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 #, python-format @@ -842,14 +904,14 @@ msgid "" "your web browser:\n" "\n" "%(verification_url)s" -msgstr "" +msgstr "Hej %(username)s,\n\nfor at aktivere din GNU MediaGoblin-konto, Ã¥bner du følgende\nadresse i din webbrowser:\n\n%(verification_url)s" #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21 #, python-format msgid "" "Powered by <a href=\"http://mediagoblin.org/\" title='Version " "%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." -msgstr "" +msgstr "Drevet af <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, et <a href=\"http://gnu.org/\">GNU</a>-projekt." #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 #, python-format @@ -857,6 +919,10 @@ msgid "" "Released under the <a " "href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a " "href=\"%(source_link)s\">Source code</a> available." +msgstr "Udgivet under licenset <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Kildekoden</a> er tilgængelig." + +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" msgstr "" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 @@ -871,7 +937,7 @@ msgstr "Hey, velkommen til denne MediaGoblin side!" msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." -msgstr "" +msgstr "Dette sted kører <a href=\"http://mediagoblin.org\">MediaGoblin</a>, et særdeles godt stykke software til hosting af medier." #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" @@ -888,13 +954,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n >Opret en konto pÃ¥ dette sted</a>\n eller" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Opsæt MediaGoblin pÃ¥ din egen server</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -905,18 +971,18 @@ msgstr "MediaGoblin logo" #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format msgid "Editing attachments for %(media_title)s" -msgstr "" +msgstr "Redigerer vedhæftede filer for %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" -msgstr "" +msgstr "Vedhæftede filer" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" -msgstr "" +msgstr "Tilføj en vedhæftet fil" #: mediagoblin/templates/mediagoblin/edit/attachments.html:61 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:42 @@ -931,7 +997,7 @@ msgstr "Afbryd" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,18 +1007,7 @@ msgstr "Gem ændringer" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" +msgstr "Ændrer %(username)ss e-mail" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format @@ -961,38 +1016,38 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" -msgstr "" +msgstr "Ja, min konto skal slettes" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 msgid "Delete permanently" -msgstr "" +msgstr "Slet permanent" #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format msgid "Editing %(media_title)s" -msgstr "" +msgstr "Redigerer %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" -msgstr "" +msgstr "Ændrer %(username)s's kontoindstillinger" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" -msgstr "" +msgstr "Slet min konto" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "E-mail" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" -msgstr "" +msgstr "Redigerer %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 @@ -1012,23 +1067,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Hej,\n\nVi vil gerne sikre, at du er %(username)s. Er dette tilfældet, sÃ¥ følg\nvenligst henvisningen nedenfor, for at bekræfte din nye e-postadresse.\n\n%(verification_url)s\n\nHvis du ikke er %(username)s, eller ikke har forespurgt ændring af e-post, kan du ignorere denne e-mail." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nye kommentarer" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" -msgstr "" +msgstr "%(formatted_time)s siden" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Markér alle som læst" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1036,46 +1094,46 @@ msgstr "" #: mediagoblin/templates/mediagoblin/listings/tag.html:35 #, python-format msgid "Media tagged with: %(tag_name)s" -msgstr "" +msgstr "Medie mærket med: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" -msgstr "" +msgstr "Hent" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" -msgstr "" +msgstr "Original" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:44 msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "" +msgstr "Beklager, denne lydfil vil ikke fungere, fordi \n\tdin webbrowser ikke understøtter \n\tHTML5-lyd." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47 msgid "" "You can get a modern web browser that \n" "\tcan play the audio at <a href=\"http://getfirefox.com\">\n" "\t http://getfirefox.com</a>!" -msgstr "" +msgstr "Du kan hente en moderne webbrowser som \n\tkan afspille lyden pÃ¥ <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" -msgstr "" +msgstr "Original fil" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 msgid "WebM file (Vorbis codec)" -msgstr "" +msgstr "WebM-fil (Vorbis-indkodning)" #: mediagoblin/templates/mediagoblin/media_displays/image.html:36 msgid "Created" -msgstr "" +msgstr "Oprettet" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 @@ -1086,261 +1144,484 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media.html:65 #, python-format msgid "Image for %(media_title)s" -msgstr "" +msgstr "Bilelde for %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "PDF-fil" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" -msgstr "" +msgstr "Perspektiv" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" -msgstr "" +msgstr "Forside" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" -msgstr "" +msgstr "Top" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" -msgstr "" +msgstr "Side" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" -msgstr "" +msgstr "WebGL" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" -msgstr "" +msgstr "Hent model" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" -msgstr "" +msgstr "Filformat" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" -msgstr "" +msgstr "Objektets højde" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +msgstr "Beklager, denne video vil ikke fungere, da\ndin webbrowser ikke understøtter HTML5-\nvideoer." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" +msgstr "WebM-fil (VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Her kan du følge status for mediet, der bliver behandlet pÃ¥ denne instans." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Mediet er under behandling" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Intet medie er under behandling" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Disse overførsler kunne ikke behandles:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Ingen mislykkede poster!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Seneste 10 succesfulde overførsler" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Ingen behandlede poster, endnu!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" -msgstr "" +msgstr "Tilføj en samling" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" -msgstr "" +msgstr "Tilføj dit medie" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (%(username)s's samling)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "%(collection_title)s fra <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" -msgstr "" +msgstr "Redigér" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format msgid "Really delete %(title)s?" -msgstr "" +msgstr "Sikker pÃ¥ at du vil slette %(title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" -msgstr "" +msgstr "Sikker pÃ¥ at du vil fjerne %(media_title)s fra %(collection_title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 msgid "Remove" -msgstr "" +msgstr "Fjern" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "%(username)ss samlinger" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "<a href=\"%(user_url)s\">%(username)s</a>s samlinger" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" "Hi %(username)s,\n" "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n" -msgstr "" +msgstr "Hej %(username)s,\n%(comment_author)s kommenterede dit opslag, (%(comment_url)s) pÃ¥ %(instance_name)s\n" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 #, python-format msgid "%(username)s's media" -msgstr "" +msgstr "%(username)s's medie" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 #, python-format msgid "" "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " "href=\"%(tag_url)s\">%(tag)s</a>" -msgstr "" +msgstr "<a href=\"%(user_url)s\">%(username)s</a>s medie med mærket <a href=\"%(tag_url)s\">%(tag)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" -msgstr "" +msgstr "<a href=\"%(user_url)s\">%(username)s</a>s mediefil" #: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "â– Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "â– Gennemser medier fra <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" -msgstr "" +msgstr "Tilføj en kommentar" #: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" -msgstr "" +msgstr "Tilføj denne kommentar" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "ForhÃ¥ndsvisning af kommentar" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" -msgstr "" +msgstr "Tilføjet" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s†to a collection" -msgstr "" +msgstr "Tilføj “%(media_title)s†til en samling" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" -msgstr "" +msgstr "Tilføj en ny samling" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "" +msgstr "Du kan følge tilstanden for mediet som behandles til dit galleri her." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" -msgstr "" +msgstr "Dine seneste 10 succesfulde overførsler" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Desværre, fandt ikke den bruger." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Næsten færdig! Din konto skal stadig aktiveres." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Der skulle komme email om et par øjeblikke med instrukser om hvordan." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Hvis det ikke gør:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Gensend verificeringsemail" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "" +msgid "%(username)s's profile" +msgstr "%(username)s's profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Her kan du fortælle andre om dig selv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Ret profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." -msgstr "" +msgstr "Brugeren har ikke udfyldt sin profil (endnu)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" -msgstr "" +msgstr "Gennemse samlinger" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" -msgstr "" +msgstr "Vis alle %(username)s's mediefiler" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "" +msgstr "Her bliver dine medier vist, men det ser ikke ud til at du har tilføjet noget endnu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." -msgstr "" +msgstr "Der ser ikke ud til at være nogen mediefiler her endnu ..." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Der kræves godkendelse af e-mail" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Næsten færdig! Din konto skal stadig aktiveres." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Der skulle komme email om et par øjeblikke med instrukser om hvordan." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Hvis det ikke gør:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Gensend verificeringsemail" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Nogen har tilmeldt en konto med dette brugernavn, men den mangler stadig at blive aktiveret." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Hvis du er denne person, men har mistet godkendelsesbeskeden, sÃ¥ kan du <a href=\"%(login_url)s\">logge ind</a> og sende den pÃ¥ny." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(fjern)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" @@ -1348,80 +1629,84 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" -msgstr "" +msgstr "Tilføj til en samling" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" -msgstr "" +msgstr "Kilde-ikon" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" -msgstr "" +msgstr "Atom-kilde" #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" -msgstr "" +msgstr "Alle rettigheder forbeholdes" #: mediagoblin/templates/mediagoblin/utils/pagination.html:39 msgid "↠Newer" -msgstr "" +msgstr "↠Nyere" #: mediagoblin/templates/mediagoblin/utils/pagination.html:45 msgid "Older →" -msgstr "" +msgstr "Ældre →" #: mediagoblin/templates/mediagoblin/utils/pagination.html:48 msgid "Go to page:" -msgstr "" +msgstr "GÃ¥ til side:" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 msgid "newer" -msgstr "" +msgstr "nyere" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 msgid "older" +msgstr "ældre" + +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" msgstr "" #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" -msgstr "" +msgstr "Mærket med" #: mediagoblin/tools/exif.py:83 msgid "Could not read the image file." -msgstr "" +msgstr "Kunne ikke indlæse billedfilen." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" -msgstr "" +msgstr "Der opstod en fejl" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "Forkert forespørgsel" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "Forespørgslen som blev sendt til serveren er ugyldig, tjek den venligst ekstra grundigt" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" -msgstr "" +msgstr "Handlingen er ikke tilladt" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Beklager Søren, jeg kan ikke lade dig gøre det!</p><p>Du har forsøgt at udføre en funktion som du ikke har lov til at foretage. Har du nu forsøgt at slette alle brugerkontiene igen?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1430,132 +1715,136 @@ msgstr "" #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "Ã¥r" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "mÃ¥ned" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "uge" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "dag" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "time" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minut" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Kommentar" #: mediagoblin/user_pages/forms.py:25 msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Du kan anvende <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> til formatering." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" -msgstr "" +msgstr "Jeg er sikker pÃ¥ at jeg vil slette dette" #: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "Jeg er helt sikker pÃ¥ at jeg vil fjerne dette element fra samlingen" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Samling" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" -msgstr "" +msgstr "-- Vælg --" #: mediagoblin/user_pages/forms.py:42 msgid "Include a note" -msgstr "" +msgstr "Inkludér en note" #: mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." +msgstr "Du kan anvende\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> til formatering." + +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Beklager, kommentarer er slÃ¥et fra." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." -msgstr "" +msgstr "Uups, din kommentar var uden indhold." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" -msgstr "" +msgstr "Din kommentar er blevet slÃ¥et op!" #: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." -msgstr "" +msgstr "Tjek venligst dine poster og forsøg igen." #: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" -msgstr "" +msgstr "Du skal vælge eller tilføje en samling" #: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" -msgstr "" +msgstr "\"%s\" er allerede i samlingen \"%s\"" #: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "" +msgstr "\"%s\" blev tiløføjet til samlingen \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." -msgstr "" +msgstr "Du slettede mediet." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "Mediet blev ikke slettet, fordi du ikke markerede at du var sikker." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." -msgstr "" +msgstr "Der er i gang med at slette en anden brugers mediefil. Fortsæt med varsomhed." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." -msgstr "" +msgstr "Du slettede elementet fra samlingen." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." -msgstr "" +msgstr "Elementet blev ikke fjernet, fordi du ikke markerede at du var sikker." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." -msgstr "" +msgstr "Du er i færd med at slette et element fra en anden brugers samling. Fortsæt med varsomhed." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "Du slettede samlingen \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "Samlingen blev ikke slettet, fordi du undlod at angive at du var sikker." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." -msgstr "" +msgstr "Du er i færd med at slette en anden brugers samling. Fortsæt med varsomhed." diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo Binary files differindex f9036b92..5aee44a7 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 7ca48ab7..e1202161 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" @@ -32,41 +32,41 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Benutzername oder E-Mail-Adresse" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Ungültiger Benutzername oder E-Mail-Adresse." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Dieses Feld benötigt eine E-Mail-Adresse." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -92,77 +92,37 @@ msgstr "Deine E-Mail-Adresse wurde bereits aktiviert." msgid "Resent your verification email." msgstr "Aktivierungsmail wurde erneut versandt." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Falls jemand mit dieser E-Mail-Adresse (Groß- und Kleinschreibung wird unterschieden!) registriert ist, wurde eine E-Mail mit Anleitungen verschickt, wie Du Dein Passwort ändern kannst." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Es konnte niemand mit diesem Benutzernamen gefunden werden." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Es wurde eine E-Mail mit der Anleitung zur Änderung des Passwortes an Dich gesendet." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Die E-Mail zur Wiederherstellung des Passworts konnte nicht verschickt werden, weil dein Benutzername inaktiv oder deine E-Mail-Adresse noch nicht aktiviert wurde." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Du kannst dich jetzt mit deinem neuen Passwort anmelden." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Beschreibung des Werkes" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Die Texte lassen sich durch <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> formatieren." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Schlagwörter" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Kommaseparierte Schlagwörter" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Kurztitel" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Bitte gib einen Kurztitel ein" @@ -172,7 +132,7 @@ msgid "" "this." msgstr "Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert werden." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Lizenz" @@ -205,45 +165,46 @@ msgstr "Bevorzugte Lizenz" msgid "This will be your default license on upload forms." msgstr "Dies wird Deine Standardlizenz in den Upload-Forumularen sein." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Der Titel kann nicht leer sein" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Beschreibung dieser Sammlung" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Der Titelteil dieser Sammlungsadresse. Du musst ihn normalerweise nicht ändern." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Altes Passwort" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du dieses Konto besitzt." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Neues Passwort" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Passwort" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -280,7 +241,7 @@ msgstr "Kontoeinstellungen gespeichert" msgid "You need to confirm the deletion of your account." msgstr "Du musst die Löschung deines Kontos bestätigen." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -294,18 +255,14 @@ msgstr "Eine Sammlung mit diesem Kurztitel existiert bereits für diesen Benutze msgid "You are editing another user's collection. Proceed with caution." msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Falsches Passwort" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Falsches Passwort" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Theme kann nicht verknüpft werden … Kein Theme gesetzt\n" @@ -353,7 +310,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "Videokonvertierung fehlgeschlagen" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "hat dein Medium kommentiert" @@ -375,14 +368,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Benutzername" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -396,6 +405,94 @@ msgstr "Benutzername oder E-Mail-Adresse" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Benutzername oder E-Mail-Adresse" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Falls jemand mit dieser E-Mail-Adresse (Groß- und Kleinschreibung wird unterschieden!) registriert ist, wurde eine E-Mail mit Anleitungen verschickt, wie Du Dein Passwort ändern kannst." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Es konnte niemand mit diesem Benutzernamen gefunden werden." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Es wurde eine E-Mail mit der Anleitung zur Änderung des Passwortes an Dich gesendet." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Die E-Mail zur Wiederherstellung des Passworts konnte nicht verschickt werden, weil dein Benutzername inaktiv oder deine E-Mail-Adresse noch nicht aktiviert wurde." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Du kannst dich jetzt mit deinem neuen Passwort anmelden." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Dein neues Passwort" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Passwort setzen" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Hast du noch keines?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Registriere dich einfach hier!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Passwort wiederherstellen" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Anweisungen senden" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Passwort vergessen?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Aufnahmeort" @@ -405,6 +502,10 @@ msgstr "Aufnahmeort" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "In <a href=\"%(osm_url)s\">OpenStreetMap</a> öffnen" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Erlauben" @@ -474,7 +575,7 @@ msgstr "Deine OAuth-Clients" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Hinzufügen" @@ -552,10 +653,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Anmelden" @@ -615,8 +716,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -627,117 +728,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Datei" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Du musst eine Datei angeben." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "JAAA! Geschafft!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Sammlung »%s« hinzugefügt!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Bild eines gestressten Goblins" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Bitte bestätige Deine E-Mail-Adresse!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "abmelden" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>s Konto" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Kontoeinstellungen ändern" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Medienverarbeitung" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Abmelden" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Medien hinzufügen" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Neues Album erstellen" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Bild eines gestressten Goblins" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Neuste Medien" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Hier kann man den Status von zu verarbeitenden Medien in diesem MediaGoblin-Exemplar sehen." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Medien in Bearbeitung" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Keine Medien in Bearbeitung" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Die folgenden Uploads sind fehlgeschlagen:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Keine fehlgeschlagenen Einträge!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Die letzten zehn erfolgreichen Uploads" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Noch keine verarbeiteten Einträge!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -791,50 +896,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Dein neues Passwort" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Passwort setzen" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Passwort wiederherstellen" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Anweisungen senden" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hallo %(username)s,\n\num dein GNU-MediaGoblin-Passwort zu ändern, öffne folgende URL\nin deinem Webbrowser:\n\n%(verification_url)s\n\nWenn du denkst, dass es sich hierbei um einen Fehler handelt,\nignoriere einfach diese E-Mail und bleib ein glücklicher Goblin!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Hast du noch keines?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Registriere dich einfach hier!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Passwort vergessen?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -870,6 +931,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Veröffentlicht unter der <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a> (<a href=\"%(source_link)s\">Quellcode</a>)." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Entdecken" @@ -919,13 +984,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Bearbeite Anhänge von %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Anhänge" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Anhang hinzufügen" @@ -942,7 +1007,7 @@ msgstr "Abbrechen" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -954,17 +1019,6 @@ msgstr "Änderungen speichern" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -992,11 +1046,11 @@ msgstr "%(media_title)s bearbeiten" msgid "Changing %(username)s's account settings" msgstr "%(username)ss Kontoeinstellungen ändern" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Mein Konto löschen" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1031,8 +1085,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1052,7 +1109,7 @@ msgstr "Medien mit Schlagwort: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Download" @@ -1076,7 +1133,7 @@ msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Originaldatei" @@ -1135,30 +1192,231 @@ msgstr "Dateiformat" msgid "Object Height" msgstr "Objekthöhe" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Entschuldige, dieses Video wird nicht funktionieren, weil dein Webbrowser kein HTML5-Video unterstützt." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> einen modernen Webbrowser, der dieses Video abspielen kann!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Hier kann man den Status von zu verarbeitenden Medien in diesem MediaGoblin-Exemplar sehen." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Medien in Bearbeitung" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Keine Medien in Bearbeitung" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Die folgenden Uploads sind fehlgeschlagen:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Keine fehlgeschlagenen Einträge!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Die letzten zehn erfolgreichen Uploads" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Noch keine verarbeiteten Einträge!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Eine Sammlung hinzufügen" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Deine Medien" @@ -1243,7 +1501,7 @@ msgstr "Kommentar absenden" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Hinzugefügt" @@ -1270,85 +1528,107 @@ msgstr "Du kannst hier den Status der Medien verfolgen, die sich gerade in Bearb msgid "Your last 10 successful uploads" msgstr "Deine zehn letzten erfolgreichen Uploads" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)ss Profil" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Dieser Benutzer konnte leider nicht gefunden werden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "E-Mail Aktivierung benötigt" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Fast fertig! Dein Konto muss noch freigeschaltet werden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Gleich solltest du eine E-Mail erhalten, die beschreibt was noch zu tun bleibt." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Falls sie nicht ankommt:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Aktivierungsmail erneut senden" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, aber es muss noch aktiviert werden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Wenn dir dieses Konto gehört und die Aktivierungsmail verloren gegangen ist, kannst du dich <a href=\"%(login_url)s\">anmelden</a> und sie erneut senden." +msgid "%(username)s's profile" +msgstr "%(username)ss Profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Hier kannst Du Dich selbst beschreiben." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Profil bearbeiten" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Dieser Benutzer hat (noch) keine Daten in seinem Profil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Sammlungen durchstöbern" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Alle Medien von %(username)s anschauen" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Hier erscheinen deine Medien, sobald du etwas hochgeladen hast." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Scheinbar gibt es hier noch nichts …" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "E-Mail Aktivierung benötigt" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Fast fertig! Dein Konto muss noch freigeschaltet werden." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Gleich solltest du eine E-Mail erhalten, die beschreibt was noch zu tun bleibt." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Falls sie nicht ankommt:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Aktivierungsmail erneut senden" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, aber es muss noch aktiviert werden." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Wenn dir dieses Konto gehört und die Aktivierungsmail verloren gegangen ist, kannst du dich <a href=\"%(login_url)s\">anmelden</a> und sie erneut senden." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(entfernen)" @@ -1397,6 +1677,10 @@ msgstr "neuer" msgid "older" msgstr "älter" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Schlagwörter" @@ -1405,34 +1689,34 @@ msgstr "Schlagwörter" msgid "Could not read the image file." msgstr "Die Bilddatei konnte nicht gelesen werden." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Hoppla!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Ein Fehler trat auf" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Funktion nicht erlaubt" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "So nicht!</p><p>Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1500,15 +1784,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Hoppla, der Kommentartext fehlte." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Dein Kommentar wurde angenommen!" @@ -1530,43 +1818,43 @@ msgstr "»%s« ist bereits in der Sammlung »%s«" msgid "\"%s\" added to collection \"%s\"" msgstr "»%s« zur Sammlung »%s« hinzugefügt" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Du hast das Medium gelöscht." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Das Medium wurde nicht gelöscht, da nicht angekreuzt hast, dass du es wirklich löschen möchtest." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei bitte vorsichtig." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Du hast das Objekt aus der Sammlung gelöscht." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Das Objekt wurde nicht aus der Sammlung entfernt, weil du nicht bestätigt hast, dass du dir sicher bist." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Du bist dabei ein Objekt aus der Sammlung eines anderen Nutzers zu entfernen. Sei vorsichtig." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Du hast die Sammlung »%s« gelöscht" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Die Sammlung wurde nicht gelöscht, weil du nicht bestätigt hast, dass du dir sicher bist." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Du bist dabei eine Sammlung eines anderen Nutzers zu entfernen. Sei vorsichtig." diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index bc5baccb..0d418eb9 100644 --- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-09-04 16:07-0500\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\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,41 +17,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -77,57 +77,18 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been " -"sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or " -"your account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a " @@ -135,19 +96,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -157,7 +118,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -190,45 +151,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -265,7 +227,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -279,16 +241,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -338,7 +296,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -360,14 +354,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -381,6 +391,93 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been " +"sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or " +"your account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -390,6 +487,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -463,7 +564,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -541,10 +642,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,114 +716,120 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +885,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +921,10 @@ msgid "" " href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -909,13 +976,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -932,7 +999,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -944,17 +1011,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -982,11 +1038,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1023,8 +1079,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1044,7 +1103,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1068,7 +1127,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1127,30 +1186,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them." +"\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1236,7 +1496,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1262,84 +1522,106 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "An email should arrive in a few moments with instructions on how to do so." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format +msgid "" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to" -" be activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to" +" be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1388,6 +1670,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1396,34 +1682,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're " "sure the address is correct, maybe the page you're looking for has been " @@ -1494,15 +1780,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1524,44 +1814,44 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed " "with caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were " "sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo Binary files differindex 067d4f4f..4a4a1cf4 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 4510069d..bb6aef38 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/mediagoblin/language/eo/)\n" "MIME-Version: 1.0\n" @@ -22,41 +22,41 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "BedaÅrinde, registrado estas malaktivigita en tiu ĉi instalaĵo." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Salutnomo aÅ retpoÅtadreso" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nevalida ensalutnomo aÅ retpoÅtadreso." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Ĉi tiu kampo ne akceptas retpoÅtadresojn." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Ĉi tiu kampo postulas retpoÅtadreson." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "BedaÅrinde, uzanto kun tiu nomo jam ekzistas." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Ni bedaÅras, sed konto kun tiu retpoÅtadreso jam ekzistas." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -82,77 +82,37 @@ msgstr "Vi jam konfirmis vian retpoÅtadreson!" msgid "Resent your verification email." msgstr "Resendi vian kontrol-mesaÄon." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Se tiu retpoÅtadreso (majuskloj gravas!) estas registrita, tien senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Trovitas neniu kun tiu ensalutnomo." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Ni ne povas sendi pasvortsavan retleteron, ĉar aÅ via konto estas neaktiva, aÅ Äia retpoÅtadreso ne estis konfirmita." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Nun vi povas ensaluti per via nova pasvorto." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Priskribo de ĉi tiu verko" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Vi povas uzi por markado la lingvon\n «<a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a>»." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etikedoj" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Dividu la etikedojn per komoj." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "La distingiga adresparto" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "La distingiga adresparto ne povas esti malplena" @@ -162,7 +122,7 @@ msgid "" "this." msgstr "La dosiertitol-bazita parto de la dosieradreso. Ordinare ne necesas Äin ÅanÄi." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Permesilo" @@ -195,45 +155,46 @@ msgstr "Permesila prefero" msgid "This will be your default license on upload forms." msgstr "Tiu ĉi permesilo estos antaÅelektita en la alÅutformularoj." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "La titolo ne povas malpleni." -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Priskribo de la kolekto" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "La distingiga adresparto de ĉi tiu kolekto. Ordinare ne necesas Äin ÅanÄi." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "La malnova pasvorto" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "La nova pasvorto" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Pasvorto" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -270,7 +231,7 @@ msgstr "Kontagordoj estis konservitaj" msgid "You need to confirm the deletion of your account." msgstr "Vi bezonas konfirmi la forigon de via konto." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -284,18 +245,14 @@ msgstr "Ĉi tiu uzanto jam havas kolekton kun tiu distingiga adresparto." msgid "You are editing another user's collection. Proceed with caution." msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "MalÄusta pasvorto" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Via pasvorto estas sukcese ÅanÄita" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "MalÄusta pasvorto" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Alligo de etoso ne eblas… ne estas elektita ekzistanta etoso\n" @@ -343,7 +300,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "Malsukcesis transkodado de filmo" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "komentis je via afiÅo" @@ -365,14 +358,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Uzantnomo" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -386,6 +395,94 @@ msgstr "Uzantonomo aÅ retpoÅtadreso" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Salutnomo aÅ retpoÅtadreso" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Se tiu retpoÅtadreso (majuskloj gravas!) estas registrita, tien senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Trovitas neniu kun tiu ensalutnomo." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Senditas retletero kun instrukcio pri kiel ÅanÄi vian pasvorton." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Ni ne povas sendi pasvortsavan retleteron, ĉar aÅ via konto estas neaktiva, aÅ Äia retpoÅtadreso ne estis konfirmita." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Nun vi povas ensaluti per via nova pasvorto." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Via pasvorto estas sukcese ÅanÄita" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Enigu vian novan pasvorton" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Difini pasvorton" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "ÅœanÄado de pasvorto de %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Konservi" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Ĉu ankoraÅ sen konto?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Kreu Äin ĉi tie!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Ekhavo de nova pasvorto" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Sendi instrukcion" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Ĉu vi forgesis vian pasvorton?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Loko" @@ -395,6 +492,10 @@ msgstr "Loko" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Vidi sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -464,7 +565,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Aldoni" @@ -542,10 +643,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Ensaluti" @@ -605,8 +706,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -617,117 +718,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Dosiero" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Vi devas provizi dosieron." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Hura! AlÅutitas!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekto «%s» aldonitas!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Bildo de zorgigita koboldo" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoÅtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "elsaluti" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Konto de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "ÅœanÄi kontagordojn" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Kontrolejo pri dosierpreparado." -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Elsaluti" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Aldoni dosieron" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Krei novan kolekton" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Bildo de zorgigita koboldo" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Laste aldonitaj dosieroj" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Ĉi tie vi povas observi la staton de prilaborado de alÅutaĵoj en ĉi tiu servilo." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Dosieroj preparataj" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Neniu dosieroj preparatas" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Preparado de ĉi tiuj alÅutaĵoj malsukcesis:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Ne ekzistas malsukcesaj eroj!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "La dek lastaj sukcesaj alÅutoj" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "AnkoraÅ ne ekzistas eroj prilaboritaj!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -781,50 +886,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Enigu vian novan pasvorton" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Difini pasvorton" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Ekhavo de nova pasvorto" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Sendi instrukcion" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Saluton, %(username)s,\n\npor ÅanÄi vian pasvorton ĉe GNUa MediaGoblin, sekvu la jenan retadreson per via TTT-legilo:\n\n%(verification_url)s\n\nSe vi pensas, ke ĉi tiu retletero estas sendita erare, simple ignoru Äin kaj plu restu feliĉa koboldo!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Ĉu ankoraÅ sen konto?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Kreu Äin ĉi tie!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Ĉu vi forgesis vian pasvorton?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -860,6 +921,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Disponigita laÅ la permesilo <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. Haveblas<a href=\"%(source_link)s\">fontotekstaro</a>." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "ĈirkaÅrigardi" @@ -909,13 +974,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Aldoni kundosierojn por %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Kundosieroj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Aldoni kundosieron" @@ -932,7 +997,7 @@ msgstr "Nuligi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -944,17 +1009,6 @@ msgstr "Konservi ÅanÄojn" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Konservi" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "ÅœanÄado de pasvorto de %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -982,11 +1036,11 @@ msgstr "Priredaktado de %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "ÅœanÄado de kontagordoj de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Forigi mian konton." -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1021,8 +1075,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "antaÅ %(formatted_time)s" @@ -1042,7 +1099,7 @@ msgstr "Dosieroj kun etikedo: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "ElÅuti" @@ -1066,7 +1123,7 @@ msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "originalan dosieron" @@ -1125,30 +1182,231 @@ msgstr "InformaranÄo" msgid "Object Height" msgstr "Alto de la objekto" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "BedaÅrinde, ĉi tiu filmo ne montriÄos\n ĉar via TTT-legilo ne subtenas sufiĉe\n filmojn laÅ HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Vi povas elÅuti modernan TTT-legilon, kapablan \n montri la filmon, de <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Ĉi tie vi povas observi la staton de prilaborado de alÅutaĵoj en ĉi tiu servilo." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Dosieroj preparataj" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Neniu dosieroj preparatas" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Preparado de ĉi tiuj alÅutaĵoj malsukcesis:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Ne ekzistas malsukcesaj eroj!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "La dek lastaj sukcesaj alÅutoj" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "AnkoraÅ ne ekzistas eroj prilaboritaj!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Aldonado de kolekto" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Aldono de via dosiero" @@ -1233,7 +1491,7 @@ msgstr "Aldoni ĉi tiun komenton" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Aldonita" @@ -1260,85 +1518,107 @@ msgstr "Ĉi tie vi povas informiÄi pri la stato de preparado de dosieroj por vi msgid "Your last 10 successful uploads" msgstr "Viaj 10 lastaj sukcesaj alÅutoj." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profilo de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Uzanto ne trovita." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Necesas konfirmo de retpoÅtadreso" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "PreskaÅ finite! Restas nur validigi vian konton." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Post kelkaj momentoj devas veni retletero kun instrukcio pri kiel tion fari." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Se tio ne okazas:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Resendi kontrolmesaÄon" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Iu registris konton kun tiu ĉi uzantonomo, sed Äi devas ankoraÅ esti aktivigita." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Se vi estas tiu sed vi perdis vian kontrolmesaÄon, vi povas <a href=\"%(login_url)s\">ensaluti</a> kaj resendi Äin." +msgid "%(username)s's profile" +msgstr "Profilo de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Jen estas spaceto por rakonti pri vi al aliaj." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Redakti profilon" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Ĉi tiu uzanto ne jam aldonis informojn pri si." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Vidi kolektojn" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Rigardi ĉiujn dosierojn de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Äœuste ĉi tie aperos viaj dosieroj, sed vi Åajne ankoraÅ nenion alÅutis." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Ĉi tie Åajne estas ankoraÅ neniuj dosieroj…" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Necesas konfirmo de retpoÅtadreso" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "PreskaÅ finite! Restas nur validigi vian konton." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Post kelkaj momentoj devas veni retletero kun instrukcio pri kiel tion fari." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Se tio ne okazas:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Resendi kontrolmesaÄon" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Iu registris konton kun tiu ĉi uzantonomo, sed Äi devas ankoraÅ esti aktivigita." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Se vi estas tiu sed vi perdis vian kontrolmesaÄon, vi povas <a href=\"%(login_url)s\">ensaluti</a> kaj resendi Äin." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(forigi)" @@ -1387,6 +1667,10 @@ msgstr "pli nova" msgid "older" msgstr "malpli nova" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Markita per" @@ -1395,34 +1679,34 @@ msgstr "Markita per" msgid "Could not read the image file." msgstr "Malsukcesis lego de la bildodosiero" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oj!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Okazis eraro" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1490,15 +1774,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Ve, komentado estas malebligita." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Via komento estis afiÅita!" @@ -1520,43 +1808,43 @@ msgstr "«%s» jam estas en la kolekto «%s»" msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» estis aldonita al la kolekto «%s»" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Vi forigis la dosieron el la kolekto." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Vi estas forigonta dosieron el kolekto de alia uzanto. Agu singardeme." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vi forigis la kolekton «%s»" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "La kolekto ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Vi estas forigonta kolekton de alia uzanto. Agu singardeme." diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo Binary files differindex c9965ccf..7ae0d7e3 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 934fdad6..5f77bf0f 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -6,6 +6,7 @@ # aleksejrs <deletesoftware@yandex.ru>, 2011, 2012 # ekenbrand <ekenbrand@hotmail.com>, 2011 # nvjacobo <jacobo@gnu.org>, 2011-2012 +# nvjacobo <jacobo@gnu.org>, 2013 # Javier Di Mauro <javierdimauro@gmail.com>, 2011 # case <juangsub@gmail.com>, 2011 # juanman <juanma@kde.org.ar>, 2011, 2012 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" @@ -30,41 +31,41 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Lo sentimos, el registro está deshabilitado en este momento." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "Lo siento, el envÃo de informes está deshabilitado en esta instancia." + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "Lo siento, la autenticación está deshabilitada en esta instancia." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Nombre de usuario o email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nombre de usuario o correo electrónico inválido." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Este campo no acepta direcciones de correo." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Este campo requiere una dirección de correo." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Lo sentimos, ya existe un usuario con ese nombre." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Lo sentimos, ya existe un usuario con esa dirección de email." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "La clave de verificación o el identificador de usuario son incorrectos." @@ -90,77 +91,37 @@ msgstr "¡Ya has verificado tu dirección de correo!" msgid "Resent your verification email." msgstr "Se reenvió tu correo electrónico de verificación." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "No se ha podido encontrar a nadie con ese nombre de usuario." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "El identificador de usuario es incorrecto." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Ahora tu puedes iniciar sesión usando tu nueva contraseña." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Necesitas verificar tu correo electrónico antes de restablecer tu contraseña." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "TÃtulo" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descripción de esta obra" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Puedes usar\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> para el formato." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiquetas" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Separa las etiquetas por comas." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Ficha" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "La ficha no puede estar vacÃa" @@ -170,7 +131,7 @@ msgid "" "this." msgstr "El tÃtulo de esta parte de la dirección de los contenidos. Por lo general no es necesario cambiar esto." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencia" @@ -193,7 +154,7 @@ msgstr "EnvÃame un correo cuando otros escriban comentarios sobre mi contenido" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "Habilitar dentro del sitio notificaciones sobre eventos." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -203,45 +164,46 @@ msgstr "Preferencias de licencia" msgid "This will be your default license on upload forms." msgstr "Ésta será tu licencia predeterminada en los formularios de subida." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "El tÃtulo no puede estar vacÃo" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descripción de esta colección" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "El tÃtulo de la dirección de esta colección. Generalmente no necesitas cambiar esto." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Vieja contraseña" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te pertenece." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nueva contraseña" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Nueva dirección de correo electrónico" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Contraseña" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Introduce tu contraseña para probar que posees la cuenta." @@ -278,7 +240,7 @@ msgstr "las configuraciones de cuenta fueron salvadas" msgid "You need to confirm the deletion of your account." msgstr "Necesitas confirmar el borrado de tu cuenta." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -292,18 +254,14 @@ msgstr "Una colección con esa ficha ya existe para este usuario/a." msgid "You are editing another user's collection. Proceed with caution." msgstr "Estás editando la colección de otro usuario/a. Ten cuidado." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Contraseña incorrecta" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Se ha cambiado la contraseña correctamente" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Tu dirección de correo electrónico ha sido verificada." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Contraseña incorrecta" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "No se puede enlazar al tema... no hay un tema seleccionado\n" @@ -351,7 +309,43 @@ msgstr "ha fallado la ejecución de unoconv, comprueba el fichero de registro (l msgid "Video transcoding failed" msgstr "Ha fallado la conversión de vÃdeo" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "Retirar el privilegio" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Inhabilitar el usuario" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Enviar un mensaje al usuario" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "Borrar el contenido" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "El usuario estará inhabilitado hasta:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "¿Por qué estás inhabilitando este usuario?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "¿Qué acción tomarás para resolver el informe?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "¿Qué privilegios vas a retirar?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Advertencia de" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "comentó tu publicación" @@ -373,14 +367,30 @@ msgstr "Se debe proporcionar un código (token) de OAuth." msgid "No request token found." msgstr "No se ha encontrado el código (token) de petición." +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "Lo siento, el archivo es demasiado grande." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "Lo siento, subir este archivo sobrepasarÃa tu lÃmite de subida." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Lo siento, has alcanzado tu lÃmite de subida." + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nombre de usuario" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -394,6 +404,94 @@ msgstr "Nombre de usuario o correo electrónico" msgid "Stay logged in" msgstr "Mantener iniciada la sesión" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Nombre de usuario o email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "No se ha podido encontrar a nadie con ese nombre de usuario." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "El identificador de usuario es incorrecto." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Ahora tu puedes iniciar sesión usando tu nueva contraseña." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "Ya no eres un usuario activo. Por favor contacta con el administrador del sistema para reactivar tu cuenta." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Se ha cambiado la contraseña correctamente" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Coloca tu nueva contraseña " + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Coloca la contraseña" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Cambiando la contraseña de %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Guardar" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "¿No tienes una cuenta?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "¡Crea una aquÃ!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "Cambiar tu contraseña." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Recuperar contraseña" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Enviar instrucciones" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "¿Olvidaste tu contraseña?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locación" @@ -403,6 +501,10 @@ msgstr "Locación" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "¡Inicia sesión para crear una cuenta!" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Permitir" @@ -472,7 +574,7 @@ msgstr "Tus clientes OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Añadir " @@ -550,10 +652,10 @@ msgstr "OpenID's" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Iniciar sesión" @@ -613,9 +715,9 @@ msgstr "Eliminar una dirección de correo electrónico de Persona" msgid "Add a Persona email address" msgstr "Agregar una dirección de correo electrónico de Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" -msgstr "Editar tus direcciones de correo electrónico de Persona" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" +msgstr "De Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" @@ -625,117 +727,121 @@ msgstr "¡O inicia sesión con Persona!" msgid "Or register with Persona!" msgstr "¡O regÃstrate con Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Archivo inválido para el formato seleccionado." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "La copia al almacenamiento público ha fallado." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "No se ha encontrado un fichero de procesamiento aceptable" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Tamaño máximo de archivo: {0} mb" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Archivo" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Puedes usarâŽ\n<a href=\"http://daringfireball.net/projects/markdown/basics\">âŽ\nMarkdown</a> para dar formato." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Debes proporcionar un archivo." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "¡Yuju! ¡Enviado!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "¡Colección \"%s\" añadida!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "Estás inhabilitado." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Imagen de un goblin estresándose" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "Has sido inhabilitado" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "hasta el %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "indefinidamente" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "¡Verifica tu email!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "cerrar sesión" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Cuenta de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Cambiar la configuración de la cuenta" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Panel de procesamiento de contenido" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Cerrar sesión" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Añadir contenido" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Crear nueva colección" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Imagen de un goblin estresándose" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Panel de gestión de usuarios" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "Panel de gestión de informes" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "El contenido más reciente" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Aquà puedes llevar un seguimiento del estado del contenido que se está procesando en esta instancia." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Procesando contenido" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "No hay contenidos en procesamiento" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Estos archivos no pudieron ser procesados:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "¡No han fallado entradas!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Últimos 10 envÃos con éxito" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "¡Aún no hay entradas procesadas!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "Autorización" @@ -789,50 +895,6 @@ msgstr "Autorización completa" msgid "Copy and paste this into your client:" msgstr "Copia y pega esto en tu cliente:" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Coloca tu nueva contraseña " - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Coloca la contraseña" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Recuperar contraseña" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Enviar instrucciones" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hola %(username)s,\n\nPara cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n\n%(verification_url)s \n\nSi piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un duende feliz." - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "¿No tienes una cuenta?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "¡Crea una aquÃ!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "¿Olvidaste tu contraseña?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -868,6 +930,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Publicado bajo la <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\"> Código fuente</a> disponible." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "Términos del Servicio" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Explorar" @@ -917,13 +983,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editando archivos adjuntos a %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Adjuntos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Agregar adjunto" @@ -940,7 +1006,7 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -952,17 +1018,6 @@ msgstr "Guardar cambios" msgid "Changing %(username)s's email" msgstr "Cambiando el correo electrónico de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Guardar" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Cambiando la contraseña de %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -990,11 +1045,11 @@ msgstr "Editando %(media_title)s " msgid "Changing %(username)s's account settings" msgstr "Cambio de %(username)s la configuración de la cuenta " -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Borrar mi cuenta" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Correo electrónico" @@ -1029,8 +1084,11 @@ msgstr "Nuevos comentarios" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "hace %(formatted_time)s" @@ -1050,7 +1108,7 @@ msgstr "Contenido etiquetado con: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Descargar" @@ -1074,7 +1132,7 @@ msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Archivo original" @@ -1099,7 +1157,7 @@ msgstr "Imágenes para %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "Fichero PDF" +msgstr "Archivo PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" @@ -1133,30 +1191,231 @@ msgstr "Formato de Archivo" msgid "Object Height" msgstr "Altura del Objeto" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Lo siento, este vÃdeo no funcionará\n porque tu navegador no soporta \n vÃdeo HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "¡Puedes conseguir un navegador moderno \n que pueda reproducir este vÃdeo en <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "Archivo WebM (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Aquà puedes llevar un seguimiento del estado del contenido que se está procesando en esta instancia." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Procesando contenido" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "No hay contenidos en procesamiento" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Estos archivos no pudieron ser procesados:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "¡No han fallado entradas!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Últimos 10 envÃos con éxito" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "¡Aún no hay entradas procesadas!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "Lo siento, no se ha encontrado el informe." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "Volver al panel de informes" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "Informe" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "Comentario enviado" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\nâ– Informe de <a href=\"%(user_url)s\">%(user_name)s</a> sobre contenidoâŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\nESTE CONTENIDO DEâŽ\n<a href=\"%(user_url)s\"> %(user_name)s</a>âŽ\nHA SIDO BORRADOâŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "Resolver" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "Resolver este informe" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "Estado" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "RESUELTO" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "No puedes tomar una acción contra un administrador" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "Panel de informes" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\nAquà puedes mirar informes abiertos que han sido enviados por usuarios.âŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "Informes activos enviados" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "Ofensor" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "Cuándo se informó" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "Informe enviado por" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Razón" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\nInforme de comentario nº %(report_id)sâŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\nInforme de contenido nº %(report_id)sâŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "No se han encontrado informes abiertos." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "Informes cerrados" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "Resuelto" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "Acción tomada" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\nInforme cerrado nº %(report_id)sâŽ" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "No se han encontrado informes cerrados." + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Panel de usuarios" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\nAquà puedes buscar usuarios de cara a tomar acciones punitivas sobre ellos.âŽ" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Usuarios activos" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "ID" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "Cuándo se unió" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "Nº de comentarios enviados" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "No se han encontrado usuarios." + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Añadir una colección" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Añade tu contenido " @@ -1241,7 +1500,7 @@ msgstr "Añade un comentario " msgid "Comment Preview" msgstr "Previsualización del comentario" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Agregado" @@ -1268,85 +1527,107 @@ msgstr "Aquà puedes hacer un seguimiento del contenido que está siendo procesa msgid "Your last 10 successful uploads" msgstr "Tus últimos 10 envÃos exitosos" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Perfil de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Lo sentimos, no se encontró ese usuario." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>Enviar un informe</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Es necesario que verifiques tu cuenta mediante el correo de notiicación" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "Informar sobre este comentario" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "¡Casi hemos terminado! Solo falta activar la cuenta." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "Informar sobre esta entrada de contenido" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "En unos momentos te deberÃa llegar un correo electrónico con las instrucciones para hacerlo." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "En caso de que no:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Reenviar correo electrónico de verificación" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Alguien ya registró una cuenta con ese nombre de usuario, pero todavÃa no ha sido activada." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format msgid "" -"If you are that person but you've lost your verification email, you can <a " -"href=\"%(login_url)s\">log in</a> and resend it." -msgstr "Si tú eres esa persona, pero has perdido tu correo electrónico de verificación, puedes <a href=\"%(login_url)s\">iniciar sesión</a> y reenviarlo." +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\nâ– Publicado por <a href=\"%(user_url)s\"âŽ\nclass=\"comment_authorlink\">%(username)s</a>âŽ" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "Enviar informe" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "Perfil de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Aquà hay un lugar para que le cuentes a los demás sobre ti." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Editar perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Este usuario (todavÃa) no ha completado su perfil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Explorar colecciones" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Ver todo el contenido de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Aquà es donde estará ubicado tu contenido, pero parece que aún no has añadido nada." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Parece que aún no hay ningún contenido aquÃ..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Es necesario que verifiques tu cuenta mediante el correo de notiicación" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "¡Casi hemos terminado! Solo falta activar la cuenta." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "En unos momentos te deberÃa llegar un correo electrónico con las instrucciones para hacerlo." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "En caso de que no:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Reenviar correo electrónico de verificación" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Alguien ya registró una cuenta con ese nombre de usuario, pero todavÃa no ha sido activada." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can <a " +"href=\"%(login_url)s\">log in</a> and resend it." +msgstr "Si tú eres esa persona, pero has perdido tu correo electrónico de verificación, puedes <a href=\"%(login_url)s\">iniciar sesión</a> y reenviarlo." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(borrar)" @@ -1395,6 +1676,10 @@ msgstr "Más nuevo" msgid "older" msgstr "Más viejo" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "Informar sobre contenido" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Marcado con" @@ -1403,34 +1688,34 @@ msgstr "Marcado con" msgid "Could not read the image file." msgstr "No se pudo leer el archivo de imagen." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "¡Ups!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Ha ocurrido un error" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Petición errónea" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "La petición enviada al servidor no es válida, por favor compruébala" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Operación no permitida" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "¡Lo siento Dave, no puedo permitir que hagas eso!</p><p>Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1498,15 +1783,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Puedes usar\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> para dar formato." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "Razón del informe" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Lo siento, los comentarios están desactivados." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Ups, tu comentario estaba vacÃo." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "¡Tu comentario ha sido publicado!" @@ -1528,43 +1817,43 @@ msgstr "%s\" ya está en la colección \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" añadido a la colección \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Eliminaste el contenido" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "El contenido no se eliminó porque no marcaste que estabas seguro." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Estás a punto de eliminar un contenido de otro usuario. Procede con precaución." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Borraste el Ãtem de la colección." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "El Ãtem no fue removido porque no confirmaste que estuvieras seguro/a." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Estás a punto de borrar un Ãtem de la colección de otro usuario. Procede con cuidado." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Borraste la colección \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "La colección no fue borrada porque no confirmaste que estuvieras seguro/a." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Estás a punto de borrar la colección de otro usuario. Procede con cuidado." diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo Binary files differindex 533a29bb..24e95900 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po index c1a16616..6e549e0d 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "متاسÙانه،ثبتنام به طور موقت غیر Ùعال است." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "متاسÙانه کاربری با این نام کاربری وجود دارد." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "" msgid "Resent your verification email." msgstr "ایمیل تاییدیه باز ارسال شد." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "عنوان" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "برچسب" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -159,7 +119,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "گذرواٰژه" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,16 +242,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "نام کاربری" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "آیا Øساب کاربری ندارید؟" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "در اینجا یکی بسازید!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -392,6 +489,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "ورود" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,115 +715,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Ùایلی نا معتبر برای نوع رسانه داده شده." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Ùایل" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "شما باید Ùایلی ارايه بدهید." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "هورا!ثبت شد!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "پنل رسیدگی به رسانه ها" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "آیا Øساب کاربری ندارید؟" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "در اینجا یکی بسازید!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -929,7 +994,7 @@ msgstr "انصراÙ" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "ذخیره تغییرات" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "ویرایش %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1018,8 +1072,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1039,7 +1096,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1063,7 +1120,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1122,30 +1179,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1230,7 +1488,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1257,85 +1515,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "نمایه %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "متاسÙانه کاربر مورد نظر یاÙت نشد." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "به زودی ایمیلی Øاوی Ø´Ø±Ø Ú©Ø§Ø± ها برای شما ارسال خواهد شد." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "در این Øالت وجود ندارد." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "باز ارسال ایمیل تاییدیه" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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\">log in</a> Ùˆ دوباره آنرا بÙرستید.." +msgid "%(username)s's profile" +msgstr "نمایه %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "ویرایش نمایه" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "نمایش تمامی رسانه های %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "به زودی ایمیلی Øاوی Ø´Ø±Ø Ú©Ø§Ø± ها برای شما ارسال خواهد شد." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "در این Øالت وجود ندارد." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "باز ارسال ایمیل تاییدیه" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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\">log in</a> Ùˆ دوباره آنرا بÙرستید.." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1384,6 +1664,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1392,34 +1676,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "اوه" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1517,43 +1805,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo Binary files differindex 9eb5dc65..98777a9a 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 9d596861..c0734f2d 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -29,41 +29,41 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "L'inscription n'est pas activée sur ce serveur, désolé." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "Désolé, l'authentification est désactivée sur ce serveur." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Nom d'utilisateur ou email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nom d'utilisateur ou adresse de courriel invalide." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Ce champ n'accepte pas les adresses email." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Ce champ nécessite une adresse email." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Un utilisateur existe déjà avec ce nom, désolé." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Désolé, il existe déjà un utilisateur ayant cette adresse e-mail." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "La clé de vérification ou l'identifiant de l'utilisateur est incorrect." @@ -89,77 +89,37 @@ msgstr "Votre adresse e-mail a déjà été vérifiée !" msgid "Resent your verification email." msgstr "E-mail de vérification renvoyé." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Si cette adresse email (sensible à la casse !) est enregistrée, un email a été envoyé avec les instructions pour changer votre mot de passe." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Nom d'utilisateur introuvable." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Un email contenant les instructions pour changer votre mot de passe viens de vous être envoyé" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Impossible d'envoyer un email de récupération de mot de passe : votre compte est inactif ou bien l'email de votre compte n'a pas été vérifiée." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "L'identifiant de l'utilisateur est incorrect." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Vous devez vérifier votre email avant de pouvoir réinitialiser votre mot de passe." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titre" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descriptif pour ce travail" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Vous pouvez utiliser\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> pour le formattage." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Séparez les champs avec des virgules." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Légende" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "La légende ne peut pas être laissée vide." @@ -169,7 +129,7 @@ msgid "" "this." msgstr "Le titre présent dans l'URL du média. Vous n'avez généralement pas besoin de le modifier" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licence" @@ -192,7 +152,7 @@ msgstr "Me prévenir par email lorsque d'autres commentent mes médias" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "Activer les notifications sur le site concernant les évènements." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -202,45 +162,46 @@ msgstr "Préférence de licence" msgid "This will be your default license on upload forms." msgstr "Cette licence sera appliquée par défaut à vos contributions." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Le titre ne peut être vide" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Description de cette collection" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Le titre affiché dans l'URL de la collection. Vous n'avez généralement pas besoin d'y toucher." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Ancien mot de passe." -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le propriétaire de ce compte." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nouveau mot de passe" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Nouvelle adresse email" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Mot de passe" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Entrez votre mot de passe pour prouver que vous possédez ce compte." @@ -277,7 +238,7 @@ msgstr "Les changements des préférences du compte ont étés sauvegardés" msgid "You need to confirm the deletion of your account." msgstr "Vous devez confirmer la suppression de votre compte." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -291,18 +252,14 @@ msgstr "Une collection avec la même légende existe déjà pour cet utilisateur msgid "You are editing another user's collection. Proceed with caution." msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Mauvais mot de passe" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Votre mot de passe a correctement été changé" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Votre adresse email a bien été validée." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Mauvais mot de passe" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Impossible de lier le thème... Aucun thème associé\n" @@ -350,7 +307,43 @@ msgstr "unoconv n'arrive pas à s'exécuter, vérifiez le fichier log" msgid "Video transcoding failed" msgstr "L'encodage de la vidéo à échoué" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "a commenté votre post" @@ -372,14 +365,30 @@ msgstr "Doit fournir un oauth_token." msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nom d'utilisateur" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -393,6 +402,94 @@ msgstr "Nom d'utilisateur ou email" msgid "Stay logged in" msgstr "Rester connecter" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Nom d'utilisateur ou email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Si cette adresse email (sensible à la casse !) est enregistrée, un email a été envoyé avec les instructions pour changer votre mot de passe." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Nom d'utilisateur introuvable." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Un email contenant les instructions pour changer votre mot de passe viens de vous être envoyé" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Impossible d'envoyer un email de récupération de mot de passe : votre compte est inactif ou bien l'email de votre compte n'a pas été vérifiée." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "L'identifiant de l'utilisateur est incorrect." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Vous pouvez maintenant vous connecter avec votre nouveau mot de passe." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Votre mot de passe a correctement été changé" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Enregistrez votre nouveau mot de passe" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Enregistrez votre mot de passe" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Changement du mot de passe de %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Sauvegarder" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Pas encore de compte ?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Créez-en un ici !" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Récupérer le mot de passe" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Envoyer les instructions" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Vous avez oublié votre mot de passe ?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Position" @@ -402,6 +499,10 @@ msgstr "Position" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Regarder sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Autoriser" @@ -471,7 +572,7 @@ msgstr "Vos clients OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Ajouter" @@ -549,10 +650,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "S'identifier" @@ -612,9 +713,9 @@ msgstr "Supprimer une adresse email Persona" msgid "Add a Persona email address" msgstr "Ajouter une adresse email Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" -msgstr "Éditer vos adresses email Persona" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" +msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" @@ -624,117 +725,121 @@ msgstr "Ou se connecter avec Persona !" msgid "Or register with Persona!" msgstr "Ou s'enregistrer avec Persona !" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Le fichier envoyé ne correspond pas au type de média." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "La copie vers le stockage public a échoué." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Fichier" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Il vous faut fournir un fichier." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Youhou, c'est envoyé !" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Collection \"%s\" ajoutée !" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "Déconnexion" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Compte de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Changer les paramètres du compte" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Panneau pour le traitement des médias" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Se déconnecter" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Ajouter des médias" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Créer une nouvelle collection" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Tout derniers media" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Ici, vous pouvez suivre l'état des médias en cours de traitement par cette instance." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Médias en transformation" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Aucun média en transformation" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Le traitement de ces ajouts a échoué :" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Aucune entrée ayant échoué !" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "10 derniers envois terminés" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Aucune entrée traitée jusqu'à présent !" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "Autorisation" @@ -788,50 +893,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "Copier-coller ceci dans votre client :" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Enregistrez votre nouveau mot de passe" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Enregistrez votre mot de passe" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Récupérer le mot de passe" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Envoyer les instructions" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Bonjour %(username)s,\n\nPour changer votre mot de passe GNU MediaGoblin, ouvrez l'URL suivante dans \nvotre navigateur internet :\n\n%(verification_url)s\n\nSi vous pensez qu'il s'agit d'une erreur, ignorez simplement cet email et restez\nun goblin heureux !" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Pas encore de compte ?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Créez-en un ici !" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Vous avez oublié votre mot de passe ?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -867,6 +928,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Disponible sous la licence <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Code source</a> disponible." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Explorer" @@ -916,13 +981,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Éditer les pièces jointes de %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Pièces jointes" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Ajouter une pièce jointe" @@ -939,7 +1004,7 @@ msgstr "Annuler" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -951,17 +1016,6 @@ msgstr "Enregistrer les modifications" msgid "Changing %(username)s's email" msgstr "Changement de l'email de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Sauvegarder" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Changement du mot de passe de %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -989,11 +1043,11 @@ msgstr "Modification de %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Changement des préférences du compte de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Supprimer mon compte" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Email" @@ -1028,8 +1082,11 @@ msgstr "Nouveaux commentaires" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "Il y a %(formatted_time)s" @@ -1049,7 +1106,7 @@ msgstr "Médias taggés avec : %(tag_name)s " #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Télécharger" @@ -1073,7 +1130,7 @@ msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo s #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Fichier original" @@ -1132,30 +1189,231 @@ msgstr "Format de fichier" msgid "Object Height" msgstr "Hauteur de l'objet" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Désolé, cette vidéo ne marchera pas parce que votre navigateur web ne supporte pas les vidéos HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Vous pouvez télécharger un navigateur web moderne qui peut lire cette vidéo à <a href=\"http://getfirefox.com\">http://getfirefox.com</a> !" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "Fichier WebM (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Ici, vous pouvez suivre l'état des médias en cours de traitement par cette instance." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Médias en transformation" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Aucun média en transformation" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Le traitement de ces ajouts a échoué :" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Aucune entrée ayant échoué !" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "10 derniers envois terminés" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Aucune entrée traitée jusqu'à présent !" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Ajouter une collection" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Ajoutez votre média" @@ -1240,7 +1498,7 @@ msgstr "Ajouter ce commentaire" msgid "Comment Preview" msgstr "Prévisualisation du commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Ajouté" @@ -1267,85 +1525,107 @@ msgstr "Vous pouvez suivre l'état des médias en cours de traitement pour votre msgid "Your last 10 successful uploads" msgstr "Vos 10 derniers envois réussis" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "profil de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Impossible de trouver cet utilisateur, désolé." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Vérification d'email nécessaire" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Presque fini ! Votre compte a encore besoin d'être activé." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Un e-mail devrait vous parvenir dans quelques instants ; il vous indiquera comment procéder." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Si la vérification n'est pas arrivée à bon port :" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Renvoyer l'e-mail de vérification" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Quelqu'un a enregistré un compte avec ce nom, mais il doit encore être activé." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -msgid "" -"If you are that person but you've lost your verification email, you can <a " -"href=\"%(login_url)s\">log in</a> and resend it." -msgstr "Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de vérification, vous pouvez vous <a href=\"%(login_url)s\">identifier</a> et le renvoyer." +msgid "%(username)s's profile" +msgstr "profil de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Voici un endroit pour parler aux autres de vous-même." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Modifier le profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Cet utilisateur n'a pas (encore) rempli son profil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Parcourir les collections" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Voir tous les médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "C'est là où vos médias apparaîssent, mais vous ne semblez pas avoir encore ajouté quoi que ce soit." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Il ne semble pas y avoir de média là , pour l'instant ..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Vérification d'email nécessaire" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Presque fini ! Votre compte a encore besoin d'être activé." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Un e-mail devrait vous parvenir dans quelques instants ; il vous indiquera comment procéder." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Si la vérification n'est pas arrivée à bon port :" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Renvoyer l'e-mail de vérification" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Quelqu'un a enregistré un compte avec ce nom, mais il doit encore être activé." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +msgid "" +"If you are that person but you've lost your verification email, you can <a " +"href=\"%(login_url)s\">log in</a> and resend it." +msgstr "Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de vérification, vous pouvez vous <a href=\"%(login_url)s\">identifier</a> et le renvoyer." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(supprimer)" @@ -1394,6 +1674,10 @@ msgstr "le plus récent" msgid "older" msgstr "le plus vieux" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Taggé avec" @@ -1402,34 +1686,34 @@ msgstr "Taggé avec" msgid "Could not read the image file." msgstr "Impossible de lire l'image." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Zut !" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Une erreur est survenue" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Mauvaise requête" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "La requête envoyée au serveur est non valide, veuillez la vérifier" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Opération non autorisée" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Je regrette Dave, cela m'est malheureusement impossible !</p><p>Vous avez essayé d'effectuer une action pour laquelle vous n'avez pas de permission. Avez-vous tenté de supprimer tous les comptes utilisateur à nouveau ?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1497,15 +1781,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Vous pouvez utiliser\n<a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a> pour le formatage." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Désolé, les commentaires sont désactivés." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" @@ -1527,43 +1815,43 @@ msgstr "\"%s\" est déjà dans la collection \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" as été ajouté à la collection \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Ce media n'a pas été supprimé car vous n'avez pas confirmer que vous étiez sur." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Vous êtes sur le point de supprimer des médias d'un autre utilisateur. Procédez avec prudence." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Vous avez supprimé cet élément de la collection." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "L'élément n'as pas été supprimé car vous n'avez pas confirmé votre certitude." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Vous vous apprêtez à supprimer un élément de la collection d'un autre utilisateur. Procédez avec attention." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vous avez supprimé la collection \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "La collection n'as pas été supprimée car vous n'avez pas confirmé votre certitude" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Vous vous apprêtez à supprimer la collection d'un autre utilisateur. Procédez avec attention." diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo Binary files differindex 487668e1..ff7f26d7 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index 251b528d..2ee7f3dd 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-02 09:28-0600\n" +"PO-Revision-Date: 2013-12-02 17:53+0000\n" +"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/mediagoblin/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,41 +21,41 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "×œ×¦×¢×¨× ×•, ×¨×™×©×•× ×”×™× ×• ×ž× ×•×˜×¨×œ על שרת ×–×”." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "×œ×¦×¢×¨× ×•, דיווח ×”×™× ×• ×ž× ×•×˜×¨×œ×™× ×¢×œ שרת ×–×”." + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "×œ×¦×¢×¨× ×•, ×ימות ×”×™× ×• ×ž× ×•×˜×¨×œ על שרת ×–×”." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." -msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל שגוי." +msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל שגויי×." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "שדה ×–×” ×œ× ×œ×•×§×— כתובות דו×״ל." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "שדה ×–×” מצריך כתובת דו×״ל." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "×œ×¦×¢×¨× ×•, משתמש ×¢× ×©× ×–×” כבר קיי×." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." -msgstr "×œ×¦×¢×¨× ×•, משתמש ×¢× ×“×•×״ל ×–×” כבר קיי×." +msgstr "×œ×¦×¢×¨× ×•, משתמש ×¢× ×›×ª×•×‘×ª דו×״ל זו כבר קיי×." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "מפתח ×”×ימות ×ו מזהה המשתמש ××™× ×• מדויק." @@ -81,77 +81,37 @@ msgstr "כבר ×ימתת ×ת כתובת הדו×״ל שלך!" msgid "Resent your verification email." msgstr "שלח שוב ×ת דו×״ל ×”×ימות שלך." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "במידה וכתובת הדו×״ל הזו (תלוי רישיות!) רשומה דו×״ל × ×©×œ×— ×¢× ×”×•×¨×ות ×‘× ×•×’×¢ לכיצד ×œ×©× ×•×ª ×ת סיסמתך." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "×œ× ×”×™×” × ×™×ª×Ÿ ×œ×ž×¦×•× ×ž×™×©×”×• ×¢× ×©× ×ž×©×ª×ž×© ×–×”." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "דו×״ל × ×©×œ×— בצירוף הור×ות ×‘× ×•×’×¢ לכיצד × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת סיסמתך." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "×œ× ×”×™×” × ×™×ª×Ÿ לשלוח דו×״ל לשחזור סיסמה מ×חר ×•×©× ×”×ž×©×ª×ž×© שלך ××™× ×• פעיל ×ו שכתובת הדו×״ל של ×—×©×‘×•× ×š ×œ× ×ומתה." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "מזהה המשתמש ××™× ×• מדויק." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "כעת ביכולתך להתחבר ב×מצעות סיסמתך החדשה." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "עליך ל×מת ×ת הדו×ל שלך ×˜×¨× ×יפוס סיסמתך." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "כותרת" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "תי×ור של מל××›×” זו" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." -msgstr "ביכולתך להשתמש בתחביר\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> לעיצוב." +msgstr "ב×פשרותך להשתמש בתחביר\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> לעיצוב." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "תגיות" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "הפרד תגיות בעזרת פסיקי×." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "חשופית" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "החשופית ×œ× ×™×›×•×œ×” להיות ריקה" @@ -161,7 +121,7 @@ msgid "" "this." msgstr "×זור הכותרת של כתובת מדיה זו. לרוב ×ין הכרח ×œ×©× ×•×ª ×ת חלק ×–×”." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "רשיון" @@ -194,47 +154,48 @@ msgstr "עדיפות רשיון" msgid "This will be your default license on upload forms." msgstr "×–×” ×™×”×™×” הרשיוןן המשתמט (ברירת מחדל) שלך בטופסי העל××”." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "הכותרת ×œ× ×™×›×•×œ×” להיות ריקה" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "תי×ור ×וסף ×–×”" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "×זור הכותרת של כתובת ×וסף ×–×”. לרוב ×ין הכרח ×œ×©× ×•×ª ×ת חלק ×–×”." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "סיסמה ×™×©× ×”" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "הזן ×ת סיסמתך ×”×™×©× ×” כדי להוכיח ש×תה ×”×‘×¢×œ×™× ×©×œ חשבון ×–×”." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "סיסמה חדשה" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "כתובת דו×״ל חדשה" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "סיסמה" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "הזן ×ת הסיסמה שלך כדי להוכיח ×›×™ ×תה ×”×‘×¢×œ×™× ×©×œ חשבון ×–×”." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -269,7 +230,7 @@ msgstr "הגדרות חשבון × ×©×ž×¨×•" msgid "You need to confirm the deletion of your account." msgstr "עליך ל×מת ×ת המחיקה של ×—×©×‘×•× ×š." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -283,18 +244,14 @@ msgstr "×וסף ×¢× ×—×©×•×¤×™×ª זו כבר ×§×™×™× ×¢×‘×•×¨ משתמש ×–×” msgid "You are editing another user's collection. Proceed with caution." msgstr "×תה עורך ×וסף של משתמש ×חר. המשך בזהירות." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "סיסמה שגויה" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "סיסמתך ×©×•× ×ª×” בהצלחה" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "כתובת הדו×״ל שלך ×ומתה." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "סיסמה שגויה" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "×œ× × ×™×ª×Ÿ לקשר ×ל מוטיב... ×œ× ×”×•×’×“×¨ מוטיב\n" @@ -342,7 +299,43 @@ msgstr "unoconv × ×›×©×œ לפעול, בדוק קובץ יומן" msgid "Video transcoding failed" msgstr "המרת ויד×ו × ×›×©×œ×”" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "הסר פריבילגיה" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "×סור ×ת המשתמש" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "שלח ×ל המשתמש הודעה" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "מחק ×ת התוכן" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "משתמש ×™×סר עד:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "מדוע ×תה ×וסר ×ת משתמש ×–×”?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "ב×יזו פעולה ×ª× ×§×•×˜ כדי לפתור ×ת דיווח ×–×”?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "×ילו פריבילגיות ×תה תסיר?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "×זהרה מ×ת" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "הגיב/×” על פרסומך" @@ -354,24 +347,40 @@ msgstr "×”×™×¨×©× ×ל תגובות בתוך %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "×תה ×œ× ×ª×§×‘×œ התר×ות עבור הודעות על %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "יש לספק oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." -msgstr "" +msgstr "×œ× × ×ž×¦××” ×ות בקשה." + +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "×œ×¦×¢×¨× ×•, גודל הקובץ גדול מדי." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "×œ×¦×¢×¨× ×•, העל×ת קובץ ×–×” ×ª×©×™× ×ותך למעלה מן גבול ההעל××” שלך." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "×œ×¦×¢×¨× ×•, חצית ×ת מגבלת ההעל××”." #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "×©× ×ž×©×ª×ž×©" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -385,6 +394,94 @@ msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל" msgid "Stay logged in" msgstr "היש×ר מחובר" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "×©× ×ž×©×ª×ž×© ×ו דו×״ל" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "במידה וכתובת הדו×״ל הזו (תלוי רישיות!) רשומה דו×״ל × ×©×œ×— ×¢× ×”×•×¨×ות ×‘× ×•×’×¢ לכיצד ×œ×©× ×•×ª ×ת סיסמתך." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "×œ× ×”×™×” × ×™×ª×Ÿ ×œ×ž×¦×•× ×ž×™×©×”×• ×¢× ×©× ×ž×©×ª×ž×© ×–×”." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "דו×״ל × ×©×œ×— בצירוף הור×ות ×‘× ×•×’×¢ לכיצד × ×™×ª×Ÿ ×œ×©× ×•×ª ×ת סיסמתך." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "×œ× ×”×™×” × ×™×ª×Ÿ לשלוח דו×״ל לשחזור סיסמה מ×חר ×•×©× ×”×ž×©×ª×ž×© שלך ××™× ×• פעיל ×ו שכתובת הדו×״ל של ×—×©×‘×•× ×š ×œ× ×ומתה." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "מזהה המשתמש ××™× ×• מדויק." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "כעת ב×פשרותך להתחבר ב×מצעות סיסמתך החדשה." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "××™× ×š משתמש פעיל עוד. ×× × ×¦×•×¨ קשר ×¢× ×ž× ×”×œ המערכת כדי לתפעל מחדש ×ת ×—×©×‘×•× ×š." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "סיסמתך ×©×•× ×ª×” בהצלחה" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "הגדר ×ת סיסמתך החדשה" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "הגדר סיסמה" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "×ž×©× ×” כעת ×ת הסיסמה של %(username)s'" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "שמור" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "×ין לך חשבון עדיין?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "צור חשבון ×›×ן!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "×©× ×” ×ת הסיסמה שלך." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "שחזור סיסמה" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "שלח הור×ות" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "שכחת ×ת סיסמתך?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "מיקו×" @@ -392,7 +489,11 @@ msgstr "מיקו×" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 #, python-format msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "הצגה ×צל <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "הצג בתוך <a href=\"%(osm_url)s\">OpenStreetMap</a>" + +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "התחבר כדי ליצור חשבון!" #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" @@ -463,7 +564,7 @@ msgstr "לקוחות OAuth שלך" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "הוסף" @@ -490,29 +591,29 @@ msgstr "×œ× × ×ž×¦× ×©×™×¨×•×ª OpenID עבור %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "×ימות של %s × ×›×©×œ: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "×ימות בוטל" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "כתובת OpenID × ×©×ž×¨×” בהצלחה." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "×ין ב×פשרותך למחוק כתובת ×›×שר זו היחידה שלך ××œ× ×× ×›×Ÿ הגדרת סיסמה." #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "כתובת זו ×œ× ×¨×©×•×ž×” לחשבון ×–×”." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID הוסר בהצלחה." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 @@ -541,10 +642,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "התחברות" @@ -575,17 +676,17 @@ msgstr "×œ×¦×¢×¨× ×•, ×§×™×™× ×›×‘×¨ חשבון ×שר ×¨×©×•× ×œ×ישיות #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "כתובת דו×״ל ×ישיות הוסרה בהצלחה." #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "×ין ב×פשרותך למחוק כתובת דו×״ל ×ישיות ×›×שר זו היחידה שלך ××œ× ×× ×›×Ÿ הגדרת סיסמה." #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "כתובת דו×״ל ×ישיות זו ×œ× ×¨×©×•×ž×” לחשבון ×–×”." #: mediagoblin/plugins/persona/views.py:176 msgid "" @@ -594,167 +695,171 @@ msgstr "×œ×¦×¢×¨× ×•, ×§×™×™× ×›×‘×¨ חשבון ×שר ×¨×©×•× ×¢× ×ישיו #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "כתובת דו×״ל ×ישיות × ×©×ž×¨×” בהצלחה." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "מחק כתובת דו×״ל ×ישיות" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "הוסף כתובת דו×״ל ×ישיות" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "×ו תתחבר ×¢× ×ישיות!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "×ו ×¨×©×•× ×ישיות חדשה!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "× ×™×ª×Ÿ קובץ שגוי עבור טיפוס מדיה." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." -msgstr "" +msgstr "העתקה ×ל ×חסון פומבי × ×›×©×œ×”." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" -msgstr "" +msgstr "קובץ עיבוד קביל ×œ× × ×ž×¦×" + +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "גודל קובץ מירבי {0} מ״ב" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "קובץ" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "ב×פשרותך להשתמש בתחביר\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> עבור עיצוב." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "עליך לספק קובץ." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "הידד! × ×©×œ×—!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "×וסף \"%s\" התווסף!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "×תה חסו×." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "×ª×ž×•× ×” של גובלין מת×מץ יתר על המידה" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "× ×סרת" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "עד %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "לצמיתה" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "×מת ×ת הדו×״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "×”×ª× ×ª×§×•×ª" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "החשבון של <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "×©× ×” הגדרות חשבון" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "לוח עיבוד מדיה" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "×”×ª× ×ª×§×•×ª" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "הוספת מדיה" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "צור ×וסף חדש" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "×ª×ž×•× ×” של גובלין מת×מץ יתר על המידה" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "לוח × ×™×”×•×œ משתמש" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "לוח ×רגון דיווחי×" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" -msgstr "המדיה ×”××—×¨×•× ×” ביותר" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "×›×ן ביכולתך לעקוב ×חר המצב של המדיה שמתעבדת בשרת ×–×”." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "מדיה ב×מצע-עיבוד" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "×ין מדיה ב×מצע-עיבוד" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "העל×ות ×לה × ×›×©×œ×• להתעבד:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "×ין רשומות כושלות!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "10 העל×ות מוצלחות ××—×¨×•× ×•×ª" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "×ין ×¨×™×©×•×ž×™× ×ž×¢×•×‘×“×™×, עדיין!" +msgstr "המדיות ×”××—×¨×•× ×•×ª ביותר" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "הרש××”" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "×שר" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "×תה מחובר בתור" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "×”×× ×‘×¨×¦×•× ×š להתיר " #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "ל×פליקציה ×œ× ×ž×•×›×¨×ª" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr " לגשת ×ל החשבון שלך? " #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "×פליקציות ×¢× ×’×™×©×” ×ל החשבון שלך מסוגלות: " #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" @@ -762,72 +867,28 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "ר××” ×ת המידע שלך (למשל דיוקן, מדיה, וכו׳...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "×©× ×” ×ת המידע שלך" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "הרש××” הסתיימה" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "הרש××” הושלמה" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "הגדר ×ת סיסמתך החדשה" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "הגדר סיסמה" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "שחזר סיסמה" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "שלח הור×ות" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "×©×œ×•× %(username)s,\n\nבכדי ×œ×©× ×•×ª ×ת סיסמתך ×צל GNU MediaGoblin, עליך לפתוח ×ת הכתובת הב××” \nבתוך דפדפן הרשת שלך:\n\n%(verification_url)s\n\nבמידה ו×תה חושב שמדובר בשגי××”, פשוט ×”×ª×¢×œ× ×ž×Ÿ דו×״ל ×–×” והמשך להיות\nגובלין מ×ושר!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "×ין לך חשבון עדיין?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "צור חשבון ×›×ן!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "שכחת ×ת סיסמתך?" +msgstr "העתק והדבק ×ת מידע ×–×” ×ל תוך הלקוח שלך:" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "צור חשבון!" +msgstr "יצירת חשבון!" #: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" @@ -842,7 +903,7 @@ msgid "" "your web browser:\n" "\n" "%(verification_url)s" -msgstr "×©×œ×•× %(username)s,\n\nבכדי להפעיל ×ת ×—×©×‘×•× ×š ×צל GNU MediaGoblin, עליך לפתוח ×ת הכתובת הב××”\nבתוך דפדפן הרשת שלך:\n\n%(verification_url)s" +msgstr "×©×œ×•× %(username)s,\n\nבכדי להפעיל ×ת ×—×©×‘×•× ×š בשירות GNU MediaGoblin, עליך לפתוח ×ת הכתובת הב××”\nבתוך דפדפן הרשת שלך:\n\n%(verification_url)s" #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21 #, python-format @@ -859,13 +920,17 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "משוחרר תחת הרשיון <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">קוד מקור</a> זמין." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "×ª× ××™ שירות" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "לחקור" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "×©×œ×•× ×œ×š, ברוך בו×ך ×ל ×תר MediaGoblin ×–×”!" +msgstr "שלו×, ברוך בו×ך ×ל ×תר MediaGoblin ×–×”!" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24 msgid "" @@ -877,7 +942,7 @@ msgstr "×תר ×–×” מריץ <a href=\"http://mediagoblin.org\">MediaGoblin</a>, msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." -msgstr "בכדי להוסיף ×ת המדיה שלך, ×œ×”×©×™× ×ª×’×•×‘×•×ª, ועוד, ביכולתך להתחבר ×¢× ×—×©×‘×•×Ÿ MediaGoblin." +msgstr "בכדי להוסיף ×ת המדיה שלך, ×œ×¤×¨×¡× ×ª×’×•×‘×•×ª, ועוד, ב×פשרותך להתחבר ×¢× ×—×©×‘×•×Ÿ MediaGoblin." #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" @@ -888,13 +953,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n >צור חשבון חדש ב×תר ×–×”</a>\n ×ו" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">התקן MediaGoblin על השרת שלך</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -908,13 +973,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "עריכת ×ª×¦×¨×™×¤×™× ×¢×‘×•×¨ %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "תצריפי×" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "הוספת תצריף" @@ -931,7 +996,7 @@ msgstr "ביטול" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,18 +1006,7 @@ msgstr "שמור ×©×™× ×•×™×™×" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "שמור" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "×ž×©× ×” כעת ×ת הסיסמה של %(username)s'" +msgstr "×©×™× ×•×™ דו×״ל של %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format @@ -981,13 +1035,13 @@ msgstr "ערוך %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "×©×™× ×•×™ הגדרות חשבון עבור %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "מחק ×ת החשבון שלי" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "דו×״ל" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1012,23 +1066,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "שלו×,\n\n×‘×¨×¦×•× × ×• ל×מת ×›×™ ×”×™× ×š %(username)s. ×× ×›×›×” ×כן, עליך \nלעקוב ×חר הקישור מטה כדי ל×מת ×ת כתובת הדו×״ל שלך.\n\n%(verification_url)s\n\n×× ××™× ×š %(username)s ×ו ×œ× ×‘×™×§×©×ª ×©×™× ×•×™ דו×״ל, ×פשר להתעל×\nמהודעת דו×״ל זו." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "תגובות חדשות" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" -msgstr "×ž×œ×¤× ×™ %(formatted_time)s" +msgstr "×œ×¤× ×™ %(formatted_time)s" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "סמן הכל ×›× ×§×¨×" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1041,7 +1098,7 @@ msgstr "מדיה מתויגת ×¢×: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "הורד" @@ -1061,11 +1118,11 @@ msgid "" "You can get a modern web browser that \n" "\tcan play the audio at <a href=\"http://getfirefox.com\">\n" "\t http://getfirefox.com</a>!" -msgstr "ביכולתך להשיג דפדפן רשת ×ž×•×“×¨× ×™ \n\tשכן מסוגל ×œ× ×’×Ÿ ×ת ×ודיו ×–×” ×צל <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +msgstr "ב×פשרותך להשיג דפדפן רשת ×ž×•×“×¨× ×™ \n\tשכן מסוגל ×œ× ×’×Ÿ ×ת ×ודיו ×–×” ב×תר <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "קובץ מקורי" @@ -1124,30 +1181,359 @@ msgstr "פורמט קובץ" msgid "Object Height" msgstr "גובה ×ובייקט" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "×œ×¦×¢×¨× ×•, ויד×ו ×–×” ×œ× ×™×¢×‘×•×“ מכיוון \n שדפדפן הרשת שלך ×œ× ×ª×•×ž×š \n ויד×ו של HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" -msgstr "ביכולתך להשיג דפדפן רשת ×ž×•×“×¨× ×™ \n שכן מסוגל ×œ× ×’×Ÿ ×ת ויד×ו ×–×” ×צל <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" +msgstr "ב×פשרותך להשיג דפדפן רשת ×ž×•×“×¨× ×™ \n שכן מסוגל ×œ× ×’×Ÿ ×ת ויד×ו ×–×” ב×תר <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "קובץ WebM ‏(VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "×›×ן ב×פשרותך לעקוב ×חר המצב של המדיה שמתעבדת בשרת ×–×”." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "מדיה ב×מצע-עיבוד" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "×ין מדיה ב×מצע-עיבוד" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "העל×ות ×לה × ×›×©×œ×• להתעבד:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "×ין רשומות כושלות!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "10 העל×ות מוצלחות ××—×¨×•× ×•×ª" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "×ין ×¨×™×©×•×ž×™× ×ž×¢×•×‘×“×™×, עדיין!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "×œ×¦×¢×¨× ×•, ×œ× × ×ž×¦× ×“×™×•×•×— ×›×–×”." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "חזור ×ל לוח דיווחי×" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "דווח" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "תגובה מדווחת" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\n ■מדיה מדווחת של <a href=\"%(user_url)s\">%(user_name)s</a>\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\n תוכן מ×ת\n <a href=\"%(user_url)s\"> %(user_name)s</a>\n × ×ž×—×§\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +#: mediagoblin/templates/mediagoblin/moderation/user.html:128 +msgid "Resolve" +msgstr "פתור" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "פתור ×ת דיווח ×–×”" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "סטטוס" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "× ×¤×ª×¨" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "×ין ב×פשרותך ×œ× ×§×•×˜ ב××ž×¦×¢×™× ×›× ×’×“ ×”×ž× ×”×œ×Ÿ" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "לוח דיווחי×" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\n ×›×ן ב×פשרותך לבדוק ×“×™×•×•×—×™× ×¤×ª×•×—×™× ×שר מול×ו על ידי משתמשי×.\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "×“×™×•×•×—×™× ×¤×¢×™×œ×™× ×©× ×©×œ×—×•" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "מעליב" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "מתי דווח" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "דווח על ידי" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "סיבה" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\n דיווח תגובה מספר %(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\n דיווח מדיה מספר %(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "×œ× × ×ž×¦×ו ×“×™×•×•×—×™× ×¡×’×•×¨×™×." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "×“×™×•×•×—×™× ×¡×’×•×¨×™×" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "× ×¤×ª×¨" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "פעולה ×©× × ×§×˜×”" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\n דיווח סגור מספר %(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "×œ× × ×ž×¦×ו ×“×™×•×•×—×™× ×¡×’×•×¨×™×." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:23 +#, python-format +msgid "User: %(username)s" +msgstr "משתמש: %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:39 +msgid "Sorry, no such user found." +msgstr "×œ×¦×¢×¨× ×•, משתמש × ×ª×•×Ÿ ×œ× × ×ž×¦×." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:43 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "× ×“×¨×© ×ימות דו×״ל" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:45 +msgid "" +"Someone has registered an account with this username, but it still has\n" +" to be activated." +msgstr "מישהו ×¨×©× ×—×©×‘×•×Ÿ ×¢× ×©× ×ž×©×ª×ž×© ×–×”, ×ך עליו\n לעבור ×קטיבציה." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:58 +msgid "Return to Users Panel" +msgstr "חזור ×ל לוח משתמשי×" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:60 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "הדיוקן של %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:62 +#, python-format +msgid "BANNED until %(expiration_date)s" +msgstr "×סור עד %(expiration_date)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:66 +msgid "Banned Indefinitely" +msgstr "×סור לצמיתות" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:72 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 +msgid "This user hasn't filled in their profile (yet)." +msgstr "משתמש ×–×” ×œ× ×ž×™×œ× ×“×™×•×§×Ÿ (עדיין)." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 +msgid "Edit profile" +msgstr "ערוך דיוקן" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:90 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 +msgid "Browse collections" +msgstr "דפדוף ב×וספי×" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:97 +#, python-format +msgid "Active Reports on %(username)s" +msgstr "×“×™×•×•×—×™× ×¤×¢×™×œ×™× ×¢×œ %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:104 +msgid "Report ID" +msgstr "מזהה (ID) דיווח" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:105 +msgid "Reported Content" +msgstr "תוכן מדווח" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:106 +msgid "Description of Report" +msgstr "תי×ור של דיווח" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:114 +#, python-format +msgid "Report #%(report_number)s" +msgstr "דיווח מספר %(report_number)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:121 +msgid "Reported Comment" +msgstr "תגובה מדווחת" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:123 +msgid "Reported Media Entry" +msgstr "ערך מדיה מדווח" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:134 +#, python-format +msgid "No active reports filed on %(username)s" +msgstr "×œ× × ×©×œ×—×• ×“×™×•×•×—×™× ×¤×¢×™×œ×™× ×¢×œ %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:141 +#, python-format +msgid "All reports on %(username)s" +msgstr "כל ×”×“×™×•×•×—×™× ×¢×œ %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:146 +#, python-format +msgid "All reports that %(username)s has filed" +msgstr "כל ×”×“×™×•×•×—×™× ×שר %(username)s שלח" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:160 +msgid "Ban User" +msgstr "×סור משתמש" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:165 +msgid "UnBan User" +msgstr "בטל הרחקת משתמש" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:173 +msgid "Privilege" +msgstr "פריבילגיה" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:174 +msgid "User Has Privilege" +msgstr "משתמש מחזיק בפריבילגיה" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:181 +msgid "Yes" +msgstr "כן" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:183 +msgid "No" +msgstr "ל×" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "לוח משתמש" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\n ×›×ן ב×פשרותך לחפש ×ž×©×ª×ž×©×™× ×›×“×™ ×œ× ×§×•×˜ בפעולות ×¢×•× ×©×™×•×ª עליה×.\n " + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "×ž×©×ª×ž×©×™× ×¤×¢×™×œ×™×" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "מזהה" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "מתי הצטרף" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "מספר תגובות שפורסמו" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "×œ× × ×ž×¦×ו משתמשי×." #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "הוסף ×וסף" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "הוספת המדיה שלך" @@ -1184,12 +1570,12 @@ msgstr "הסר" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "××•×¡×¤×™× ×©×œ %(username)s" +msgstr "×”××•×¡×¤×™× ×©×œ %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "××•×¡×¤×™× ×©×œ <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "×”××•×¡×¤×™× ×©×œ <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -1218,7 +1604,7 @@ msgstr "המדיה של <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "â– Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "■עיון במדיה מ×ת <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "■דפדוף במדיה של <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" @@ -1230,11 +1616,11 @@ msgstr "הוסף ×ת תגובה זו" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "תצוגת תגובה" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" -msgstr "התווסף" +msgstr "התווספה" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 @@ -1253,90 +1639,87 @@ msgstr "הוסף ×וסף חדש" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "ביכולתך לעקוב ×›×ן ×חר מצב של מדיה שמצויה בתהליך עיבוד עבור הגלריה שלך." +msgstr "ב×פשרותך לעקוב ×חר מצב של מדיה שמצויה בתהליך עיבוד עבור הגלריה שלך ×›×ן." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" msgstr "10 ההעל×ות המוצלחות שלך" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>שליחת דיווח</h2>" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "דיווח על תגובה זו" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "דיווח על ערך מדיה ×–×”" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format -msgid "%(username)s's profile" -msgstr "הדיוקן של %(username)s" +msgid "" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\n ■פורסמה על ידי <a href=\"%(user_url)s\"\n class=\"comment_authorlink\">%(username)s</a>\n " -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "×œ×¦×¢×¨× ×•, משתמש × ×ª×•×Ÿ ×œ× × ×ž×¦×." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "×ž×œ× ×“×™×•×•×—" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "× ×“×¨×© ×ימות דו×״ל" +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 +msgid "Here's a spot to tell others about yourself." +msgstr "×”× ×” ×ž×§×•× ×œ×•×ž×¨ ל××—×¨×™× ×ודותייך." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 +#, python-format +msgid "View all of %(username)s's media" +msgstr "צפיה בכל המדיה של %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +msgid "" +"This is where your media will appear, but you don't seem to have added " +"anything yet." +msgstr "×›×ן ×–×” ×”×ž×§×•× ×‘×• המדיה שלך תופיע, ××•×œ× ×œ× × ×¨××” שהוספת משהו עדיין." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 +msgid "There doesn't seem to be any media here yet..." +msgstr "×œ× × ×¨××” שיש ×›×ן מדיה כלשהי עדיין..." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 msgid "Almost done! Your account still needs to be activated." -msgstr "כמעת ×¡×™×™×ž× ×•! ×—×©×‘×•× ×š עדיין צריך ×קטיבציה." +msgstr "כמעת ×¡×™×™×ž× ×•! ×—×©×‘×•× ×š עדיין צריך לעבור ×קטיבציה." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 msgid "" "An email should arrive in a few moments with instructions on how to do so." msgstr "דו×״ל צפוי להגיע בעוד מספר ×¨×’×¢×™× ×‘×¦×™×¨×•×£ הור×ות ×‘× ×•×’×¢ לכיצד לעשות כך." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 msgid "In case it doesn't:" msgstr "במידה וזה ל×:" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 msgid "Resend verification email" msgstr "שלח דו×״ל ×ימות" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 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:79 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 #, python-format 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:96 -msgid "Here's a spot to tell others about yourself." -msgstr "×”× ×” ×ž×§×•× ×œ×•×ž×¨ ל××—×¨×™× ×ודותייך." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 -msgid "Edit profile" -msgstr "ערוך דיוקן" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 -msgid "This user hasn't filled in their profile (yet)." -msgstr "משתמש ×–×” ×œ× ×ž×™×œ× ×“×™×•×§×Ÿ (עדיין)." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 -msgid "Browse collections" -msgstr "עיון ב×וספי×" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 -#, python-format -msgid "View all of %(username)s's media" -msgstr "צפיה בכל המדיה של %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 -msgid "" -"This is where your media will appear, but you don't seem to have added " -"anything yet." -msgstr "×›×ן ×–×” ×”×ž×§×•× ×‘×• המדיה שלך תופיע, ××•×œ× ×œ× × ×¨××” שהוספת משהו עדיין." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 -msgid "There doesn't seem to be any media here yet..." -msgstr "×œ× × ×¨××” שיש ×›×ן מדיה כלשהי עדיין..." +msgstr "×× ×ת/×” ×כן ××“× ×–×” ××•×œ× ×יבדת ×ת דו×״ל ×”×ימות שלך, ב×פשרותך <a href=\"%(login_url)s\">להתחבר</a> ולשלוחו מחדש." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" @@ -1344,7 +1727,7 @@ msgstr "(הסר)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" -msgstr "" +msgstr "× ×ספה בתוך" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" @@ -1386,6 +1769,10 @@ msgstr "חדש יותר" msgid "older" msgstr "ישן יותר" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "דווח על מדיה" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "מתויגת ×¢×" @@ -1394,34 +1781,34 @@ msgstr "מתויגת ×¢×" msgid "Could not read the image file." msgstr "×œ× ×”×™×” × ×™×ª×Ÿ ×œ×§×¨×•× ×ת קובץ ×”×ª×ž×•× ×”." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "×ופס!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "×ירעה שגי××”" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "בקשה רעה" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "הבקשה ×שר × ×©×œ×—×” ×ל השרת ×”×™× ×” שגויה, ×× × ×‘×—×Ÿ ×ותה היטב" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "פעולה ×œ× ×ž×•×¨×©×™×ª" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "צר לי דייב, ×× ×™ ×œ× ×™×›×•×œ להתיר לך לעשות ×–×ת!</p><p>× ×™×¡×™×ª לבצע פעולה ש××™× ×š מורשה לעשות. ×”×× × ×™×¡×™×ª למחוק ×ת כל ×”×—×©×‘×•× ×•×ª של ×”×ž×©×ª×ž×©×™× ×©×•×‘?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1460,7 +1847,7 @@ msgstr "תגובה" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "ב×פשרותך להשתמש בתחביר <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> עבור עיצוב." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1487,17 +1874,21 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "ב×פשרותך להשתמש בתחביר\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> עבור עיצוב." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "סיבת דיווח" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "מצטערי×, תגובות ×ž× ×•×˜×¨×œ×•×ª." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "×ופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" @@ -1517,45 +1908,45 @@ msgstr "\"%s\" כבר ×§×™×™× ×‘×וסף \"%s\"" #: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "\"%s\" התווסף ×ל ×”×וסף \"%s\"" +msgstr "\"%s\" התווספה ×ל ×”×וסף \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "מחקת ×ת מדיה זו." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "המדיה ×œ× × ×ž×—×§×” מכיוון ×©×œ× ×¡×™×ž× ×ª ש×תה בטוח." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "בחרת למחוק מדיה של משתמש ×חר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "מחקת ×ת הפריט מן ×וסף ×–×”." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "הפריט ×œ× ×”×•×¡×¨ מכיוון ×©×œ× ×¡×™×ž× ×ª ש×תה בטוח." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "בחרת למחוק פריט מן ×וסף של משתמש ×חר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת ×ת ×”×וסף \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "×”×וסף ×œ× ×”×•×¡×¨ מכיוון ×©×œ× ×¡×™×ž× ×ª ש×תה בטוח." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "בחרת למחוק ×וסף של משתמש ×חר. המשך בזהירות." diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo Binary files differindex 53444ef4..c8480c3e 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index 84801f32..6c68ab33 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -80,77 +80,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titulo" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiquettas" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -193,45 +153,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Contrasigno" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -268,7 +229,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,16 +243,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -341,7 +298,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -363,14 +356,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nomine de usator" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -393,6 +490,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -462,7 +563,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Initiar session" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,115 +716,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -779,50 +884,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -930,7 +995,7 @@ msgstr "Cancellar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1019,8 +1073,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1040,7 +1097,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1064,7 +1121,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1123,30 +1180,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1231,7 +1489,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1258,85 +1516,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profilo de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "" +msgid "%(username)s's profile" +msgstr "Profilo de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1385,6 +1665,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1393,34 +1677,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1518,43 +1806,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo Binary files differindex fb1674f0..15366bcb 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index 83322047..9c022469 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:05+0000\n" -"Last-Translator: tryggvib <tryggvib@fsfi.is>\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/mediagoblin/language/is_IS/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,41 +22,41 @@ msgstr "" "Language: is_IS\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Þvà miður er nýskráning ekki leyfð á þessu svæði." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "Þvà miður eru tilkynningar óvirkar á þessum vef." + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "Þvà miður er auðkenning ekki möguleg á þessu vefsvæði." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Notandanafn eða netfang" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Ógilt notandanafn eða netfang" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Þessi reitur tekur ekki við netföngum." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "à þennan reit verður að slá inn tölvupóstfang." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Þvà miður er nú þegar til notandi með þetta nafn." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Þvà miður þá er annar notandi à kerfinu með þetta netfang skráð." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt." @@ -82,77 +82,37 @@ msgstr "Þú hefur staðfest netfangið þitt!" msgid "Resent your verification email." msgstr "Endursendi staðfestingartölvupóst" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Ef þetta netfang (há- og lágstafir skipta máli) er skráð hjá okkur hefur tölvupóstur verið sendur með leiðbeiningum um hvernig þú getur breytt lykilorðinu þÃnu." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Gat ekki fundið neinn með þetta notandanafn." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Tölvupóstur hefur verið sendur með leiðbeiningum um hvernig þú átt að breyta lykilorðinu þÃnu." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Gat ekki sent tölvupóst um endurstillingu lykilorðs þvà notandanafnið þitt er óvirkt eða þá að þú hefur ekki staðfest netfangið þitt." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "Notendaauðkennið er rangt." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Þú getur núna innskráð þig með nýja lykilorðinu þÃnu." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Þú verður að staðfesta netfangið þitt áður en þú getur endurstillt lykilorðið þitt." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "Þú ert ekki lengur virkur notandi. Vinsamlegast hafðu samband við kerfisstjóra til að endurvirkja aðganginn þinn." - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titill" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Lýsing á þessu efni" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Þú getur notað\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> til að stÃlgera textann." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Efnisorð" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Aðskildu efnisorðin með kommum." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Vefslóðarormur" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Vefslóðarormurinn getur ekki verið tómur" @@ -162,7 +122,7 @@ msgid "" "this." msgstr "Titilhlutinn à vefslóð þessa efnis. Þú þarft vanalega ekki að breyta þessu." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Notkunarleyfi" @@ -195,45 +155,46 @@ msgstr "Stilling á notkunarleyfi" msgid "This will be your default license on upload forms." msgstr "Þetta verður sjálfgefna leyfið þegar þú vilt hlaða upp efni." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Þessi titill getur verið innihaldslaus" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Lýsing á þessu albúmi" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titilhlutinn à vefslóð þessa albúms. Þú þarft vanalega ekki að breyta þessu." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Gamla lykilorðið" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Skráðu gamla lykilorðið þitt til að sanna að þú átt þennan aðgang." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nýtt lykilorð" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Nýtt netfang" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Lykilorð" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Sláðu inn lykilorðið þitt til að sanna að þú eigir þennan aðgang." @@ -270,7 +231,7 @@ msgstr "Aðgangsstillingar vistaðar" msgid "You need to confirm the deletion of your account." msgstr "Þú verður að samþykkja eyðingu á notandaaðganginum þÃnum." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -284,18 +245,14 @@ msgstr "Albúm með þessu vefslóðarormi er nú þegar til fyrir þennan notan msgid "You are editing another user's collection. Proceed with caution." msgstr "Þú ert að breyta albúmi annars notanda. Farðu mjög varlega." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Rangt lykilorð" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Það tókst að breyta lykilorðinu þÃnu" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Netfangið þitt hefur verið staðfest." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Rangt lykilorð" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Get ekki tengt þema... ekkert þema stillt\n" @@ -343,7 +300,43 @@ msgstr "tekst ekki að keyra unoconv, athugaðu annálsskrá" msgid "Video transcoding failed" msgstr "Þverkóðun myndskeiðs mistókst" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "Taka burt réttindi" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Banna notanda" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Senda notandanum skilaboð" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "Eyða efninu" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "Notandi à banni þangað til:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "Af hverju ertu að banna þennan notanda?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "Hvað ætlarðu að gera til að vinna úr tilkynningunni?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "Hvaða réttindi ætlarðu að taka burt?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Viðvörun frá" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "skrifaði athugasemd við færsluna þÃna" @@ -365,14 +358,30 @@ msgstr "Þú verður að gefa upp OAuth tóka (oauth_token)." msgid "No request token found." msgstr "Engin beiðni fannst." +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "Þvà miður er skráin of stór." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "Þvà miður mun upphal á þessari skrá sprengja upphalshámarkið þitt." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Þvà miður hefur þú náð upphalshámarki" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Notandanafn" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -386,6 +395,94 @@ msgstr "Notandanafn eða tölvupóstur" msgid "Stay logged in" msgstr "Muna eftir mér" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Notandanafn eða netfang" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Ef þetta netfang (há- og lágstafir skipta máli) er skráð hjá okkur hefur tölvupóstur verið sendur með leiðbeiningum um hvernig þú getur breytt lykilorðinu þÃnu." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Gat ekki fundið neinn með þetta notandanafn." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Tölvupóstur hefur verið sendur með leiðbeiningum um hvernig þú átt að breyta lykilorðinu þÃnu." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Gat ekki sent tölvupóst um endurstillingu lykilorðs þvà notandanafnið þitt er óvirkt eða þá að þú hefur ekki staðfest netfangið þitt." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "Notendaauðkennið er rangt." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Þú getur núna innskráð þig með nýja lykilorðinu þÃnu." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "Þú ert ekki lengur virkur notandi. Vinsamlegast talaðu við stjóranda til að endurvirkja aðganginn þinn." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Það tókst að breyta lykilorðinu þÃnu" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Skrifaðu inn nýja lykilorðið þitt" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Skrá lykilorð" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Breyti lykilorði fyrir notandann: %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Vista" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Ertu ekki með notendaaðgang?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Búðu til aðgang hérna!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "Breyta lykilorðinu þÃnu." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Endurstilla lykilorð" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Senda leiðbeiningar" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Gleymdirðu lykilorðinu þÃnu?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Staðsetning" @@ -395,6 +492,10 @@ msgstr "Staðsetning" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Skoða á <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "Skráðu þig inn til að búa til aðgang!" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Leyfa" @@ -464,7 +565,7 @@ msgstr "OAuth-biðlararnir þÃnir" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Bæta við" @@ -542,10 +643,10 @@ msgstr "OpenID auðkenni" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Innskrá" @@ -605,9 +706,9 @@ msgstr "Eyða „Persona“ netfangi" msgid "Add a Persona email address" msgstr "Bæta við „Persona“ netfangi" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" -msgstr "Breyta „Persona“ netföngunum þÃnum" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" +msgstr "Persona auðkenni" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" @@ -617,117 +718,121 @@ msgstr "...eða skráðu þig inn með „Persona“!" msgid "Or register with Persona!" msgstr "...eða nýskráðu þig með „Persona“!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "Það tókst ekki að afrita yfir à almennu geymsluna." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "Nothæf keyrsluskrá fannst ekki" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Hámarksskráarstærð: {0} MB" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Skrá" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Þú getur notað\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> fyrir stÃlsnið." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Þú verður að gefa upp skrá." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Jibbà jei! Það tókst að senda inn!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Albúmið \"%s\" var búið til!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "Þú ert à banni." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Mynd af durt à stresskasti" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "Stjórnandi hefur bannað þig" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "þangað til %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "ótilgreint" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "útskrá" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Notandaaðgangur: <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Breyta stillingum notandaaðgangs" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Margmiðlunarvinnsluskiki" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Skrá út" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Senda inn efni" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Búa til nýtt albúm" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Mynd af durt à stresskasti" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Notendastýring" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "Tilkynningastýring" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Nýlegt efni" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Hér getur þú fylgst með margmiðlunarefni sem verið er að vinna á þessu vefsvæði." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Efni à vinnslu" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Ekkert efni à vinnslu" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Það mistókst að fullvinna þessar innsendingar:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Engar bilaðar innsendingar!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "SÃðustu 10 árangursrÃku innsendingarnar" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Ekkert fullunnið efni enn!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "Heimilun" @@ -781,50 +886,6 @@ msgstr "Heimild klár" msgid "Copy and paste this into your client:" msgstr "Afritaðu og lÃmdu þetta à forritið þitt:" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Skrifaðu inn nýja lykilorðið þitt" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Skrá lykilorð" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Endurstilla lykilorð" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Senda leiðbeiningar" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hæ %(username)s,\n\ntil að breyta GNU MediaGoblin lykilorðinu þÃnu opnar þú eftirfarandi vefslóð à \nvafranum þÃnum:\n\n%(verification_url)s\n\nEf þú heldur að það sé einhver vitleysa à gangi husnar þú bara þennan póst og heldur áfram að vera\nánægður durtur!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Ertu ekki með notendaaðgang?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Búðu til aðgang hérna!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Gleymdirðu lykilorðinu þÃnu?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -860,6 +921,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Gefið út undir <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Frumkóti</a> aðgengilegur." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "Notendaskilmálar" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Skoða" @@ -909,13 +974,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Breyti viðhengjum við: %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Viðhengi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Bæta við viðhengi" @@ -932,7 +997,7 @@ msgstr "Hætta við" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -944,17 +1009,6 @@ msgstr "Vista breytingar" msgid "Changing %(username)s's email" msgstr "Breyti netfangi fyrir notandann: %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Vista" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Breyti lykilorði fyrir notandann: %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -982,11 +1036,11 @@ msgstr "Breyti %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Breyti notandaaðgangsstillingum fyrir: %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Eyða aðganginum mÃnum" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Netfang" @@ -1021,8 +1075,11 @@ msgstr "Nýjar athugasemdir" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "Fyrir %(formatted_time)s" @@ -1042,7 +1099,7 @@ msgstr "Efni merkt með: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Sækja" @@ -1066,7 +1123,7 @@ msgstr "Þú getur náð à nýlegan vafra sem \n\tgetur spilað hljóðskrár à #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Upphaflega skráin" @@ -1125,30 +1182,231 @@ msgstr "Skráarsnið" msgid "Object Height" msgstr "Hæð hlutar" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Þvà miður mun þetta myndskeið ekki virka þvÃ\n vafrinn þinn styður ekki HTML5 \n myndbönd." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Þú getur náð à nýlegan vafra sem \n sem getur spilað myndskeiðið á <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "WebM skrá (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Hér getur þú fylgst með margmiðlunarefni sem verið er að vinna á þessu vefsvæði." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Efni à vinnslu" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Ekkert efni à vinnslu" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Það mistókst að fullvinna þessar innsendingar:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Engar bilaðar innsendingar!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "SÃðustu 10 árangursrÃku innsendingarnar" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Ekkert fullunnið efni enn!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "Þvà miður fannst engin slÃk tilkynning." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "Fara aftur à tilkynningastýringu" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "Tilkynning" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "Tilkynnt athugasemd" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\n â– Tilkynnt efni sem <a href=\"%(user_url)s\">%(user_name)s</a> setti inn\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\n EFNI SEM\n <a href=\"%(user_url)s\"> %(user_name)s</a>\n SETTI INN VAR EYTT\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "Leysa" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "Leysa þessa tilkynningu" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "Staða" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "LEYST" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "Þú getur ekki gert þetta gagnvart stjórnanda" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "Tilkynningastýring" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\n Hér getur þú flett upp opnum tilkynningum frá notendum.\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "Virkar innsendar tilkynningar" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "Gerandi" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "Hvenær tilkynnt" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "Tilkynnt af" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Ãstæða" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\n Athugasemdartilkynning #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\n Efnistilkynning #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "Engar opnar tilkynningar fundust." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "Kláraðar tilkynningar" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "Leyst" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "Aðgerð tekin" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\n Kláruð tilkynning #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "Engar kláraðar tilkynningar fundust." + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Notendastýring" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\n Hér getur þú skoðað notendur til að gera refsigaðgerðir gagnvart þeim.\n " + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Virkir notendur" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "Auðkenni" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "Skráði sig" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "Fjöldi athugasemda" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "Engir notendur fundust." + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Búa til albúm" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Sendu inn efni" @@ -1233,7 +1491,7 @@ msgstr "Senda inn þessa athugasemd" msgid "Comment Preview" msgstr "Útlit athugasemdar" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Bætt við" @@ -1260,85 +1518,107 @@ msgstr "Þú getur fylgst með hvernig gengur að vinna með margmiðlunarefnið msgid "Your last 10 successful uploads" msgstr "SÃðustu 10 árangursÃku innsendingarnar þÃnar" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Kenniskrá fyrir: %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Þvà miður fannst notandinn ekki." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Staðfesting á netfangi nauðsynleg" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>Senda inn tilkynningu</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Næstum þvà búið! Notandaaðgangurinn þinn verður að vera staðfestur." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Tölvupóstur ætti að berast til þÃn eftir smástund með leiðbeiningum um hvernig þú átt að gera það." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "Tilkynni þessa athugasemd" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Ef það gerist ekki:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Endursenda staðfestingarpóst" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Einhver hefur búið til aðgang með þessu notandanafni en hefur ekki enn virkjað aðganginn." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "Tilkynni þetta margmiðlunarefni" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format 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 "Ef þú ert þessi aðili en hefur týnt staðfestingarpóstinum getur þú <a href=\"%(login_url)s\">skráð þig inn</a> og endursent hann" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\n â– Höfundur: <a href=\"%(user_url)s\"\n class=\"comment_authorlink\">%(username)s</a>\n " + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "Tilkynna" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "Kenniskrá fyrir: %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Hér er svæði til að segja öðrum frá þér." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Breyta kenniskrá" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Þessi notandi hefur ekki fyllt inn à upplýsingar um sig (ennþá)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Skoða albúm" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Skoða efnið sem %(username)s á" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Þetta er staðurinn þar sem efnið þitt birtist en þú virðist ekki hafa sent neitt inn ennþá." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Það virðist ekki vera neitt efni hérna ennþá..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Staðfesting á netfangi nauðsynleg" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Næstum þvà búið! Notandaaðgangurinn þinn verður að vera staðfestur." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Tölvupóstur ætti að berast til þÃn eftir smástund með leiðbeiningum um hvernig þú átt að gera það." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Ef það gerist ekki:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Endursenda staðfestingarpóst" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Einhver hefur búið til aðgang með þessu notandanafni en hefur ekki enn virkjað aðganginn." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Ef þú ert þessi aðili en hefur týnt staðfestingarpóstinum getur þú <a href=\"%(login_url)s\">skráð þig inn</a> og endursent hann" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(fjarlægja)" @@ -1387,6 +1667,10 @@ msgstr "nýrri" msgid "older" msgstr "eldri" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "Tilkynna efni" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Merkt með" @@ -1395,34 +1679,34 @@ msgstr "Merkt með" msgid "Could not read the image file." msgstr "Gat ekki lesið myndskrána." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "ObbosÃ!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Villa kom upp" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Ekki nógu góð beiðni" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "Beiðnin sem var send til netþjónsins er ógild, vinsamlegast athugaðu hana aftur" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Aðgerð ekki leyfileg" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Fyrirgefðu DavÃð. Ég get ekki leyft þér að gera þetta!</p></p>Þú reyndir að framkvæma aðgerð sem þú hefur ekki leyfi til að gera. Varstu að reyna að eyða öllum notendareikningum aftur?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1490,15 +1774,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Þú getur notað\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> til að stÃlgera textann." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "Ãstæður fyrir tilkynningu" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Þvà miður, athugasemdir eru óvirkar." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "ObbosÃ! Athugasemdin þÃn var innihaldslaus." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Athugasemdin þÃn var skráð!" @@ -1520,43 +1808,43 @@ msgstr "\"%s\" er nú þegar à albúminu \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" sett à albúmið \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Efninu var ekki eytt þar sem þú merktir ekki við að þú værir viss." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Þú ert à þann mund að fara að eyða efni frá öðrum notanda. Farðu mjög varlega." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Þú tókst þetta efni úr albúminu." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Þetta efni var ekki fjarlægt af þvà að þú merktir ekki við að þú værir viss." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Þú ert à þann mund að fara að eyða efni úr albúmi annars notanda. Farðu mjög varlega." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Þessu albúmi var ekki eytt vegna þess að þu merktir ekki við að þú værir viss." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Þú ert à þann mund að fara að eyða albúmi annars notanda. Farðu mjög varlega." diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo Binary files differindex 74176ccf..689a54b1 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index 2e73b622..ca2605ba 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Damtux <sun_lion@live.com>, 2013 # Francesco Apruzzese <cescoap@gmail.com>, 2012 # gdb <gaedeb01@gmail.com>, 2013 # pikappa469 <pikappa469@alice.it>, 2011 # nunni <robi@nunnisoft.ch>, 2011 +# Damtux <sun_lion@live.com>, 2013 # Damtux <sun_lion@live.com>, 2012 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n" "MIME-Version: 1.0\n" @@ -23,43 +25,43 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Spiacente, la registrazione è disabilitata su questa istanza." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "Spiacente, le segnalazioni sono disabilitate in questa istanza." + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" - -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Nome utente o indirizzo email" +msgstr "Mi dispiace, l'autenticazione è disabilitata in questa istanza." -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." -msgstr "" +msgstr "Nome utente o indirizzo email non valido." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." -msgstr "" +msgstr "Questo campo non accetta indirizzi email." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." -msgstr "" +msgstr "Questo campo richiede un indirizzo email." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Spiacente, esiste già un utente con quel nome." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già ." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "La chiave di verifica o l'id utente è sbagliato." #: mediagoblin/auth/views.py:161 msgid "" @@ -83,87 +85,47 @@ msgstr "Hai già verificato il tuo indirizzo email!" msgid "Resent your verification email." msgstr "Rispedisci email di verifica" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Ti è stata inviata un'email con le istruzioni per cambiare la tua password." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo indirizzo email non è stato verificato." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Ora puoi effettuare l'accesso con la nuova password." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descrizione di questo lavoro" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Puoi usare il\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> per la formattazione." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." -msgstr "Separa le tags con la virgola." +msgstr "Separa i tag con la virgola." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" -msgstr "" +msgstr "Titolo" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" -msgstr "" +msgstr "Il titolo non può essere vuoto" #: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." -msgstr "Il titolo è parte dell'indirizzo del file. Nella maggior parte dei casi non c'è bisogno di cambiarlo." +msgstr "Il titolo fa parte dell'indirizzo del file. Nella maggior parte dei casi non c'è bisogno di cambiarlo." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licenza" @@ -182,78 +144,79 @@ msgstr "Questo indirizzo contiene errori" #: mediagoblin/edit/forms.py:65 msgid "Email me when others comment on my media" -msgstr "Inviami messaggi email quando altre persone commentano i miei files multimediali" +msgstr "Inviami messaggi email quando altre persone commentano i miei file multimediali" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "Abilita le notifiche degli eventi nel sito." #: mediagoblin/edit/forms.py:69 msgid "License preference" -msgstr "" +msgstr "Licenza preferita" #: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." -msgstr "" +msgstr "Questa sarà la tua licenza predefinita nei moduli di caricamento dei file." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" -msgstr "" +msgstr "Il titolo non può essere vuoto" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" -msgstr "" +msgstr "Descrizione di questa raccolta" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." -msgstr "" +msgstr "Il titolo fa parte dell'indirizzo di questa raccolta. Nella maggior parte dei casi non c'è bisogno di cambiarlo." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Password vecchia" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario dell'account." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nuova password" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" -msgstr "" +msgstr "Nuovo indirizzo email" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Password" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Inserisci la tua password per dimostrare di essere il proprietario di questo account." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." -msgstr "" +msgstr "Questo utente ha già un elemento con quel titolo." #: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." -msgstr "Stai modificando files multimediali di un altro utente. Procedi con attenzione." +msgstr "Stai modificando file multimediali di un altro utente. Procedi con attenzione." #: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Hai aggiunto l'allegato %s!" #: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." -msgstr "" +msgstr "Puoi modificare solo il tuo profilo." #: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." @@ -269,37 +232,33 @@ msgstr "Impostazioni del profilo salvate" #: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." -msgstr "" +msgstr "Devi confermare l'eliminazione del tuo account." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" -msgstr "" +msgstr "Hai già una raccolta che si chiama \"%s\"!" #: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "Questo utente ha già una raccolta con quel titolo." #: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." -msgstr "" +msgstr "Stai modificando la raccolta di un altro utente. Procedi con cautela." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "Il tuo indirizzo email è stato verificato." + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "Password errata" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" -msgstr "" +msgstr "Non riesco a collegarmi al tema... nessun tema impostato\n" #: mediagoblin/gmg_commands/assetlink.py:73 msgid "No asset directory for this theme\n" @@ -329,7 +288,7 @@ msgid "" "CSRF cookie not present. This is most likely the result of a cookie blocker " "or somesuch.<br/>Make sure to permit the settings of cookies for this " "domain." -msgstr "" +msgstr "Cookie CSRF non presente. Questo è dovuto a un plugin che blocca i cookie o a qualcosa del genere.<br/>Assicurati di permettere le impostazioni dei cookie per questo dominio." #: mediagoblin/media_types/__init__.py:78 #: mediagoblin/media_types/__init__.py:100 @@ -344,7 +303,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "Transcodifica video fallita" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "Togli il privilegio" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Banna l'utente" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Invia un messaggio all'utente" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "Elimina il contenuto" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "L'utente verrà bannato fino al:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "Perché stai bannando questo Utente?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "Quali azioni intraprenderai per risolvere il problema?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "Quali privilegi toglierai?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Avvertimento da parte di" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "ha commentato il tuo post" @@ -360,20 +355,36 @@ msgstr "" #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Devi specificare un oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "Spiacente, il file è troppo grande." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "Spiacente, caricando questo file supereresti il tuo limite di memoria." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Spiacente, hai raggiunto il limite di memoria disponibile." + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nome utente" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -381,12 +392,100 @@ msgstr "Indirizzo email" #: mediagoblin/plugins/basic_auth/forms.py:39 msgid "Username or Email" -msgstr "" +msgstr "Nome utente o indirizzo Email" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" +msgstr "Rimani connesso" + +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Nome utente o indirizzo email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." msgstr "" +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Non ho trovato nessuno con quel nome utente." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Ti è stata inviata un'email con le istruzioni per cambiare la tua password." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo indirizzo email non è stato verificato." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "L'id utente è sbagliato." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Ora puoi effettuare l'accesso con la nuova password." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "Non sei più un utente attivo. Per favore contatta l'amministratore di sistema per riattivare il tuo account." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "La tua password è stata cambiata con successo" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Imposta la nuova password" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Imposta password" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Stai cambiando la password di %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Salva" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Non hai ancora un account?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Creane uno qui!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "Cambia la tua password." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Recupera Password" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Invia istruzioni" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Hai dimenticato la tua password?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Posizione" @@ -396,25 +495,29 @@ msgstr "Posizione" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Visualizza su <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "Iscriviti per creare un account!" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" -msgstr "" +msgstr "Consenti" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Deny" -msgstr "" +msgstr "Nega" #: mediagoblin/plugins/oauth/forms.py:34 msgid "Name" -msgstr "" +msgstr "Nome" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" -msgstr "" +msgstr "Nome del client OAuth" #: mediagoblin/plugins/oauth/forms.py:36 msgid "Description" -msgstr "" +msgstr "Descrizione" #: mediagoblin/plugins/oauth/forms.py:38 msgid "" @@ -424,7 +527,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:40 msgid "Type" -msgstr "" +msgstr "Tipo" #: mediagoblin/plugins/oauth/forms.py:45 msgid "" @@ -438,34 +541,34 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:52 msgid "Redirect URI" -msgstr "" +msgstr "URI di Reindirizzamento" #: mediagoblin/plugins/oauth/forms.py:54 msgid "" "The redirect URI for the applications, this field\n" " is <strong>required</strong> for public clients." -msgstr "" +msgstr "L'URI di reindirizzamento per le applicazioni, questo campo\nè <strong>richiesto</strong> per i client pubblici." #: mediagoblin/plugins/oauth/forms.py:66 msgid "This field is required for public clients" -msgstr "" +msgstr "Questo campo è richiesto per i client pubblici" #: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" -msgstr "" +msgstr "Il client {0} è stato registrato!" #: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 msgid "OAuth client connections" -msgstr "" +msgstr "Connessioni client OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +msgstr "I tuoi client OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Aggiungi" @@ -474,60 +577,60 @@ msgstr "Aggiungi" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Mi dispiace, esiste già un account registrato con quell'OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Mi dispiace, il server OpenID non è stato trovato" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Nessun servizio OpenID è stato trovato per %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Verifica di %s fallita: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Verifica annullata" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Il tuo url OpenID è stato salvato con successo." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Non puoi eliminare il tuo unico URL OpenID se prima non hai impostato una password" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Quell'OpenID non è registrato a questo account." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID è stato rimosso con successo." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Aggiungi un OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Elimina un OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -538,15 +641,15 @@ msgstr "Elimina" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "Gli OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Accedi" @@ -557,274 +660,234 @@ msgstr "Accesso fallito!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Accedi per creare un account!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "O accedi con una password!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "O accedi con OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "O registrati con OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "Mi dispiace, esiste già un account registrato con quell'indirizzo email Persona." #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "L'indirizzo email Persona è stato rimosso con successo." #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Non puoi eliminare il tuo unico indirizzo email Persona se prima non hai impostato una password." #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Quell'indirizzo email Persona non è registrato in questo account." #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Mi dispiace, esiste già un account registrato con quell'indirizzo email Persona." #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Il tuo indirizzo email Persona è stato salvato con successo." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Elimina un indirizzo email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Aggiungi un indirizzo email Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "O accedi con Persona!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "O registrati con Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Dimensione massima del file: {0} mb" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Puoi utilizzare il\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> per la formattazione." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Devi specificare un file." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Evviva! Caricato!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" +msgstr "Raccolta \"%s\" aggiunta!" + +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "Sei Bannato." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "Sei stato bannato" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "fino al %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "indefinitamente" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" -msgstr "" +msgstr "esci" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "" +msgstr "Account di <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Cambia le impostazioni dell'account" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" -msgstr "Pannello di elaborazione files multimediali" +msgstr "Pannello di elaborazione file multimediali" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" -msgstr "" +msgstr "Esci" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" -msgstr "Aggiungi files multimediali" +msgstr "Aggiungi file multimediali" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" -msgstr "" +msgstr "Crea una nuova raccolta" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Pannello di gestione degli utenti" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "Pannello di gestione delle segnalazioni" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" -msgstr "Files multimediali più recenti" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Qui è possibile tenere traccia dello stato dei file multimediali in fase di elaborazione in questa istanza." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Files multimediali in elaborazione" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Nessun file multimediale in elaborazione" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "L'elaborazione di questi files caricati è fallita:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Ultimi 10 caricamenti riusciti" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "" +msgstr "File multimediali più recenti" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Autorizzazione" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Autorizza" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Sei connesso come" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Vuoi autorizzare" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "un'applicazione sconosciuta" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "ad accedere al tuo account?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Le applicazioni che accedono al tuo account possono:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Pubblica nuovi file multimediali a nome mio" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Controlla le tue informazioni (ad es. il profilo, i file multimediali, ecc...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Cambiare le tue informazioni" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Autorizzazione Finita" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Autorizzazione Completata" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Imposta la nuova password" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Imposta password" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Recupera Password" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Invia istruzioni" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Ciao %(username)s,\n\nper cambiare la tua password MediaGoblin apri il seguente URL nel\ntuo browser web:\n\n%(verification_url)s\n\nSe pensi che questo sia un errore, ignora semplicemente questa email e continua ad essere \nun goblin felice!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Non hai ancora un account?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Creane uno qui!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Hai dimenticato la tua password?" +msgstr "Copia e incolla questo nel tuo client:" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -851,7 +914,7 @@ msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri msgid "" "Powered by <a href=\"http://mediagoblin.org/\" title='Version " "%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." -msgstr "" +msgstr "Realizzato con <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, un progetto <a href=\"http://gnu.org/\">GNU</a>." #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 #, python-format @@ -861,6 +924,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Rilasciato con licenza <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Codice sorgente</a> disponibile." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "Termini di Servizio" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Esplora" @@ -873,7 +940,7 @@ msgstr "Ciao, benvenuto in questo sito MediaGoblin!" msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." -msgstr "Questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma per caricare e condividere files multimediali." +msgstr "Questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma per caricare e condividere file multimediali." #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" @@ -890,13 +957,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n>Crea un account in questo sito</a>\noppure" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Installa e configura MediaGoblin nel tuo server</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -910,13 +977,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Stai modificando gli allegati di %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Allegati" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Aggiungi allegato" @@ -933,7 +1000,7 @@ msgstr "Annulla" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -943,27 +1010,16 @@ msgstr "Salva i cambiamenti" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" +msgstr "Stai cambiando l'email di %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" -msgstr "" +msgstr "Vuoi eliminare definitivamente l'utente '%(user_name)s' e tutti i file multimediali/commenti correlati?" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" -msgstr "" +msgstr "Sì, elimina definitivamente il mio account" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48 @@ -983,18 +1039,18 @@ msgstr "Stai modificando %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Stai cambiando le impostazioni dell'account di %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" -msgstr "" +msgstr "Elimina il mio account" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "Email" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" -msgstr "" +msgstr "Stai modificando %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 @@ -1014,23 +1070,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Salve,\n\nVogliamo verificare che tu sia %(username)s. Se è così, allora \nper favore segui il link sottostante per verificare il tuo nuovo indirizzo email.\n\n%(verification_url)s\n\nSe tu non sei %(username)s oppure non hai richiesto un cambio dell'email, puoi ignorare questo messaggio." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nuovi commenti" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" -msgstr "" +msgstr "%(formatted_time)s fa" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Segna tutti come letti" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1038,12 +1097,12 @@ msgstr "" #: mediagoblin/templates/mediagoblin/listings/tag.html:35 #, python-format msgid "Media tagged with: %(tag_name)s" -msgstr "File taggato con: %(tag_name)s" +msgstr "File taggati con: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Scarica" @@ -1067,7 +1126,7 @@ msgstr "Puoi scaricare un browser web moderno,\n\t in grado di leggere questo f #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "File originario" @@ -1077,7 +1136,7 @@ msgstr "File WebM (codec Vorbis)" #: mediagoblin/templates/mediagoblin/media_displays/image.html:36 msgid "Created" -msgstr "" +msgstr "Creato" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 @@ -1092,23 +1151,23 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "File PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" -msgstr "" +msgstr "Prospettiva" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" -msgstr "" +msgstr "Prospetto" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" -msgstr "" +msgstr "Pianta" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" -msgstr "" +msgstr "Lato" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" @@ -1116,52 +1175,253 @@ msgstr "WebGL" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" -msgstr "" +msgstr "Scarica il modello" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" -msgstr "" +msgstr "Formato del File" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" -msgstr "" +msgstr "Altezza Oggetto" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +msgstr "Mi dispiace, questo video non funzionerà perché\n il tuo browser web non supporta i video in\n HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" -msgstr "" +msgstr "Qui <a href=\"http://getfirefox.com\">http://getfirefox.com</a>\npuoi scaricare un browser web moderno, in grado di visualizzare\nquesto video!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" +msgstr "File WebM (VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Qui puoi seguire lo stato dei file multimediali in fase di elaborazione in questa istanza." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "File multimediali in elaborazione" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Nessun file multimediale in elaborazione" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "L'elaborazione di questi file caricati è fallita:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Nessuna elaborazione fallita!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Ultimi 10 caricamenti riusciti" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Finora nessun elemento elaborato!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "Spiacente, segnalazione non trovata." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "Ritorna al Pannello Segnalazioni" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "Segnala" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "Commento segnalato" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\nIL CONTENUTO DI\n<a href=\"%(user_url)s\"> %(user_name)s</a>\nÈ STATO ELIMINATO\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "Risolvi" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "Risolvi Questo Problema" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "Stato" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "RISOLTO" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "Non puoi agire contro un amministratore" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "Colpevole" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "Segnalato Da" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Motivazione" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\nSegnalazione Commento #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\nSegnalazione Elem. Multimediale #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "Segnalazioni Chiuse" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "Azione Intrapresa" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\nSegnalazione Chiusa #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Pannello utente" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\nQui puoi cercare gli utenti per intraprendere azioni punitive nei loro confronti.\n " + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Utenti Attivi" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "ID" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "# di Commenti Pubblicati" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "Nessun utente trovato." + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" -msgstr "" +msgstr "Aggiungi una raccolta" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Aggiungi il tuo file multimediale" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (raccolta di %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "%(collection_title)s di <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:79 @@ -1177,21 +1437,21 @@ msgstr "Vuoi davvero eliminare %(title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" -msgstr "" +msgstr "Eliminare definitivamente %(media_title)s da %(collection_title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 msgid "Remove" -msgstr "" +msgstr "Elimina" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "raccolte di %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "raccolte di <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -1203,24 +1463,24 @@ msgstr "Ciao %(username)s,\n%(comment_author)s ha commentato il tuo post (%(comm #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 #, python-format msgid "%(username)s's media" -msgstr "Files multimediali di %(username)s" +msgstr "File multimediali di %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 #, python-format msgid "" "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " "href=\"%(tag_url)s\">%(tag)s</a>" -msgstr "" +msgstr "File multimediali di <a href=\"%(user_url)s\">%(username)s</a> con tag <a href=\"%(tag_url)s\">%(tag)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" -msgstr "Files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "File multimediali di <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "â– Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "â– Stai guardando i files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "â– Stai guardando i file multimediali di <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" @@ -1232,125 +1492,147 @@ msgstr "Aggiungi questo commento" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Anteprima Commento" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" -msgstr "" +msgstr "Aggiunto" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s†to a collection" -msgstr "" +msgstr "Aggiungi “%(media_title)s†a una raccolta" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" -msgstr "" +msgstr "Aggiungi una nuova raccolta" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "Puoi controllare lo stato dei files multimediali in elaborazione per la tua galleria qui." +msgstr "Qui controlli lo stato dei file multimediali in elaborazione per la tua galleria." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" msgstr "I tuoi ultimi 10 caricamenti riusciti" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "profilo di %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Mi dispiace, utente non trovato." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>Invia una Segnalazione</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "E' necessario verificare l'indirizzo email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "Segnalare questo Commento" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Quasi finito! Il tuo account deve ancora essere attivato." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "Segnalare questo Elemento Multimediale" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "In breve dovresti ricevere un email contenente istruzioni su come fare." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Nel caso non fosse:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Rispedisci email di verifica" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\nâ– Pubblicato da <a href=\"%(user_url)s\"\nclass=\"comment_authorlink\">%(username)s</a>\n " -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Qualcuno ha registrato un account con questo nome utente, ma deve ancora essere attivato." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"%(login_url)s\">accedere</a> e rispedirla." +msgid "%(username)s's profile" +msgstr "Profilo di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Ecco un posto dove raccontare agli altri di te." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Modifica profilo" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Questo utente non ha (ancora) compilato il proprio profilo." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" -msgstr "" +msgstr "Sfoglia le raccolte" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" -msgstr "Visualizza tutti i files multimediali di %(username)s" +msgstr "Visualizza tutti i file multimediali di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "Qui è dove appariranno i tuoi files multimediali, ma sembra che tu non abbia ancora aggiunto niente." +msgstr "I tuoi file multimediali appariranno qui, ma sembra che tu non abbia ancora aggiunto niente." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Sembra che non ci sia ancora nessun file multimediale qui..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "E' necessario verificare l'indirizzo email" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Quasi finito! Il tuo account deve ancora essere attivato." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "In breve dovresti ricevere un email contenente istruzioni su come fare." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Nel caso non fosse:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Rispedisci email di verifica" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Qualcuno ha registrato un account con questo nome utente, ma deve ancora essere attivato." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"%(login_url)s\">accedere</a> e rispedirla." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(elimina)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" -msgstr "" +msgstr "Inserito in" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" -msgstr "" +msgstr "Aggiungi a una raccolta" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 @@ -1388,6 +1670,10 @@ msgstr "più recente" msgid "older" msgstr "più vecchio" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Taggato con" @@ -1396,63 +1682,63 @@ msgstr "Taggato con" msgid "Could not read the image file." msgstr "Impossibile leggere il file immagine." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oops!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" -msgstr "" +msgstr "Si è verificato un errore" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "Richiesta Non Valida" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "La richiesta inviata al server non è valida, per favore ricontrolla" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" -msgstr "" +msgstr "Operazione non consentita" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Scusa Dave, non posso lasciartelo fare!</p><p>Hai cercato di eseguire una funzione non autorizzata. Stavi provando a eliminare di nuovo tutti gli account utente?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "" +msgstr "Mi dispiace! Sembra che non esista una pagina web con questo indirizzo.</p><p>Se ritieni che l'indirizzo sia corretto, forse la pagina che stai cercando è stata spostata o eliminata." #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "anno" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "mese" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "settimana" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "giorno" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "ora" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minuto" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" @@ -1462,7 +1748,7 @@ msgstr "" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Puoi usare il <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> per la formattazione." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1470,94 +1756,98 @@ msgstr "Sono sicuro di volerlo eliminare" #: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "Sono sicuro di voler eliminare questo elemento dalla raccolta" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Raccolta" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" -msgstr "" +msgstr "-- Seleziona --" #: mediagoblin/user_pages/forms.py:42 msgid "Include a note" -msgstr "" +msgstr "Includi una nota" #: mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Puoi usare il\n<a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a> per la formattazione." + +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "Motivazione della Segnalazione" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Mi dispiace, i commenti sono disabilitati." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" #: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." -msgstr "" +msgstr "Per favore controlla i tuoi elementi e riprova." #: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" -msgstr "" +msgstr "Devi selezionare o aggiungere una raccolta" #: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" -msgstr "" +msgstr "\"%s\" è già nella raccolta \"%s\"" #: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "" +msgstr "\"%s\" aggiunto alla raccolta \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Il file non è stato eliminato perchè non hai confermato di essere sicuro." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Stai eliminando un file multimediale di un altro utente. Procedi con attenzione." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." -msgstr "" +msgstr "Hai eliminato l'elemento dalla raccolta." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." -msgstr "" +msgstr "L'elemento non è stato eliminato perchè non hai confermato di essere sicuro." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." -msgstr "" +msgstr "Stai eliminando un elemento dalla raccolta di un altro utente. Procedi con cautela." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "Hai eliminato la raccolta \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "La raccolta non è stata eliminata perchè non hai confermato di essere sicuro." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." -msgstr "" +msgstr "Stai eliminando la raccolta di un altro utente. Procedi con cautela." diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo Binary files differindex 841f0219..8c197dfd 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 88a8ddc8..a88cb020 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§ç™»éŒ²ã¯ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ãã®åå‰ã‚’æŒã¤ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -80,77 +80,37 @@ msgstr "" msgid "Resent your verification email." msgstr "検証メールをå†é€ã—ã¾ã—ãŸã€‚" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "タイトル" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "ã‚¿ã‚°" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "スラグ" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "スラグã¯å¿…è¦ã§ã™ã€‚" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -193,45 +153,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "パスワード" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -268,7 +229,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,16 +243,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -341,7 +298,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -363,14 +356,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "ユーザãƒãƒ¼ãƒ " #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "ã¾ã アカウントをæŒã£ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "ã“ã“ã§ä½œæˆï¼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "パスワードを忘れã¾ã—ãŸã‹ï¼Ÿ" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -393,6 +490,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -462,7 +563,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "è¿½åŠ " @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "ãƒã‚°ã‚¤ãƒ³" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,115 +716,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "ファイル" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "ファイルをæä¾›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "投稿終了ï¼" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -779,50 +884,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "ã¾ã アカウントをæŒã£ã¦ã„ã¾ã›ã‚“ã‹ï¼Ÿ" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "ã“ã“ã§ä½œæˆï¼" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "パスワードを忘れã¾ã—ãŸã‹ï¼Ÿ" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -930,7 +995,7 @@ msgstr "ã‚ャンセル" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "投稿ã™ã‚‹" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "%(media_title)sを編集ä¸" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1019,8 +1073,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1040,7 +1097,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "ダウンãƒãƒ¼ãƒ‰" @@ -1064,7 +1121,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1123,30 +1180,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1231,7 +1489,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1258,85 +1516,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)sã•ã‚“ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ãã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "メールã¯ã€ãã®æ–¹æ³•ã®æŒ‡ç¤ºã§ã„ãã¤ã‹ã®çž¬é–“ã«åˆ°ç€ã—ã¾ã™ã€‚" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "到ç€ã—ãªã„å ´åˆã¯ã€" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "確èªãƒ¡ãƒ¼ãƒ«ã‚’å†é€ä¿¡" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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>ã—ã¦å†é€ã§ãã¾ã™ã€‚" +msgid "%(username)s's profile" +msgstr "%(username)sã•ã‚“ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’編集" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "%(username)sã•ã‚“ã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã‚’ã™ã¹ã¦è¦‹ã‚‹" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "メールã¯ã€ãã®æ–¹æ³•ã®æŒ‡ç¤ºã§ã„ãã¤ã‹ã®çž¬é–“ã«åˆ°ç€ã—ã¾ã™ã€‚" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "到ç€ã—ãªã„å ´åˆã¯ã€" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "確èªãƒ¡ãƒ¼ãƒ«ã‚’å†é€ä¿¡" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1385,6 +1665,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1393,34 +1677,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1518,43 +1806,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo Binary files differindex dec0d936..ce69f3f2 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po index b192f7ab..6f1bd924 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "죄송합니다. ì§€ê¸ˆì€ ê°€ìž… 하실 수 없습니다." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "ì‚¬ìš©ìž ì´ë¦„ ë˜ëŠ” email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "죄송합니다. 해당 ì‚¬ìš©ìž ì´ë¦„ì´ ì´ë¯¸ 존재 합니다." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "죄송합니다. 사용ìžì™€ 해당 ì´ë©”ì¼ì€ ì´ë¯¸ 등ë¡ë˜ì–´ 있습니다." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "ì´ë¯¸ ì¸ì¦ë°›ì€ email 주소를 ê°€ì§€ê³ ìžˆìŠµë‹ˆë‹¤!" msgid "Resent your verification email." msgstr "ì¸ì¦ ë©”ì¼ì„ 다시 ë³´ë‚´ 주세요." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "비밀번호를 변경하는 ë°©ë²•ì— ëŒ€í•œ 설명서가 ë©”ì¼ë¡œ ì „ì†¡ ë˜ì—ˆìŠµë‹ˆë‹¤." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "사용ìžì˜ ì´ë¦„ì´ ì¡´ìž¬í•˜ì§€ 않거나, 사용ìžì˜ email 주소가 ì¸ì¦ë˜ì§€ ì•Šì•„ 비밀번호 복구 ë©”ì¼ì„ 보낼 수 없습니다." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "ì´ì œ 새로운 비밀번호로 ë¡œê·¸ì¸ í•˜ì‹¤ 수 있습니다." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "ì œëª©" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "ì´ ìž‘ì—…ì— ëŒ€í•œ 설명" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "í¬ë©§íŒ…ì„ ì‚¬ìš©í•˜ë ¤ë©´\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> ë§í¬ë¥¼ ì°¸ê³ í•˜ì„¸ìš”." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "태그" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "태그는 , ë¡œ 구분 ë©ë‹ˆë‹¤." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "'슬러그'" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "'슬러그'는 ê³µë°±ì¼ ìˆ˜ 없습니다." @@ -159,7 +119,7 @@ msgid "" "this." msgstr "ì œëª©ì€ ë¯¸ë””ì–´ ì£¼ì†Œì˜ ì¼ë¶€ë¶„ 입니다. ìˆ˜ì •í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "License" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "ì œëª©ì€ ê³µë°±ì¼ ìˆ˜ 없습니다." -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "모ìŒì§‘ì— ëŒ€í•œ 설명" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "ì˜ˆì „ 비밀번호" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "ê³„ì • 확ì¸ì„ 위해, ì´ì „ 비밀 번호를 ìž…ë ¥í•´ 주세요." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "새로운 비밀번호" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "비밀번호" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "ê³„ì • ì„¤ì •ì´ ì €ìž¥ ë˜ì—ˆìŠµë‹ˆë‹¤." msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,18 +242,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 ìœ ì €ì˜ ëª¨ìŒì§‘ì„ ìˆ˜ì • 중 입니다. 주ì˜í•˜ì„¸ìš”." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "ìž˜ëª»ëœ ë¹„ë°€ë²ˆí˜¸" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "ìž˜ëª»ëœ ë¹„ë°€ë²ˆí˜¸" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "í…Œë§ˆì— ì—°ê²°í• ìˆ˜ 없습니다... 테마 ì…‹ì´ ì—†ìŠµë‹ˆë‹¤.\n" @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "비디오 ë³€í™˜ì— ì‹¤íŒ¨ 했습니다." -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "ê²Œì‹œë¬¼ì— ë§ê¸€ì´ ë‹¬ë ¸ìŠµë‹ˆë‹¤." @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "ì‚¬ìš©ìž ì´ë¦„" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "ì‚¬ìš©ìž ì´ë¦„ ë˜ëŠ” email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "비밀번호를 변경하는 ë°©ë²•ì— ëŒ€í•œ 설명서가 ë©”ì¼ë¡œ ì „ì†¡ ë˜ì—ˆìŠµë‹ˆë‹¤." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "사용ìžì˜ ì´ë¦„ì´ ì¡´ìž¬í•˜ì§€ 않거나, 사용ìžì˜ email 주소가 ì¸ì¦ë˜ì§€ ì•Šì•„ 비밀번호 복구 ë©”ì¼ì„ 보낼 수 없습니다." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "ì´ì œ 새로운 비밀번호로 ë¡œê·¸ì¸ í•˜ì‹¤ 수 있습니다." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "새로운 비밀번호를 ì„¤ì • 하세요." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "비밀번호 ì„¤ì •" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "ì•„ì§ ê³„ì •ì´ ì—†ìœ¼ì„¸ìš”?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "ì´ê³³ì—ì„œ 새로 만드세요!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "비밀번호 복구" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "설명서 보내기" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "비밀번호를 잊으셨나요?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "장소" @@ -392,6 +489,10 @@ msgstr "장소" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr " <a href=\"%(osm_url)s\">OpenStreetMap</a>으로 보기" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "허용" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "추가" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "로그ì¸" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,117 +715,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "알수없는 미디어 íŒŒì¼ ìž…ë‹ˆë‹¤." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "파ì¼" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "파ì¼ì„ 등ë¡í•˜ì…”야 합니다." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "ì´í–!! 등ë¡í–ˆìŠµë‹ˆë‹¤!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "\"%s\" 모ìŒì§‘ì´ ì¶”ê°€ë˜ì—ˆìŠµë‹ˆë‹¤!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "ë©”ì¼ì„ 확ì¸í•˜ì„¸ìš”!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "ê³„ì • ì„¤ì • 변경" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "미디어 ìž‘ì—… 패ë„" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "미디어 추가" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "가장 ìµœê·¼ì— ë“±ë¡ëœ 미디어" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "미디어 작업중..." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "ìž‘ì—…ì¤‘ì¸ ë¯¸ë””ì–´ê°€ 없습니다." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "ë‹¤ìŒ ìž‘ì—…ì„ í•˜ëŠ” ì¤‘ì— ì—…ë¡œë“œì— ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤.:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "지난 10ê°œì˜ ì—…ë¡œë“œ 목ë¡" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "새로운 비밀번호를 ì„¤ì • 하세요." - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "비밀번호 ì„¤ì •" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "비밀번호 복구" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "설명서 보내기" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "안녕하세요 %(username)s,\n\nGNU MediaGoblinì˜ ì‚¬ìš©ìž ê³„ì • 비밀번호를 ë°”ê¾¸ì‹œë ¤ë©´, ì¸í„°ë„· ì°½ì„ ì—¬ì‹œê³ ì•„ëž˜ URLì„ í†µí•´ ì ‘ì† í•˜ì„¸ìš”. :\n\n%(verification_url)s\n\n오류ë¼ê³ ìƒê° ëœë‹¤ë©´, ì´ ë©”ì¼ì„ ë¬´ì‹œí•˜ì‹œê³ ê³ ë¸”ë¦°ì„ ì¦ê¸°ì„¸ìš”!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "ì•„ì§ ê³„ì •ì´ ì—†ìœ¼ì„¸ìš”?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "ì´ê³³ì—ì„œ 새로 만드세요!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "비밀번호를 잊으셨나요?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Released under the <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Source code</a> available." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "íƒìƒ‰" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "%(media_title)sì˜ ì²¨ë¶€ ìˆ˜ì • 중..." #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "첨부" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "첨부 추가" @@ -929,7 +994,7 @@ msgstr "취소" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "ì €ìž¥" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "%(media_title)s 편집중..." msgid "Changing %(username)s's account settings" msgstr "%(username)s'ì˜ ê³„ì • ì„¤ì • 변경중..." -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1018,8 +1072,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1039,7 +1096,7 @@ msgstr "미디어는 다ìŒìœ¼ë¡œ 태그 ë˜ì—ˆìŠµë‹ˆë‹¤.: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "다운로드" @@ -1063,7 +1120,7 @@ msgstr "사운드 파ì¼ì„ ìž¬ìƒ í•˜ì‹œë ¤ë©´\n\tì´ê³³ì—ì„œ ìµœì‹ ì˜ ë¸Œë¼ #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "ì›ë³¸ 파ì¼" @@ -1122,30 +1179,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "미디어 작업중..." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "ìž‘ì—…ì¤‘ì¸ ë¯¸ë””ì–´ê°€ 없습니다." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "ë‹¤ìŒ ìž‘ì—…ì„ í•˜ëŠ” ì¤‘ì— ì—…ë¡œë“œì— ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤.:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "지난 10ê°œì˜ ì—…ë¡œë“œ 목ë¡" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "모ìŒì§‘ 추가" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "미디어 등ë¡í•˜ê¸°" @@ -1230,7 +1488,7 @@ msgstr "ë§ê¸€ 추가" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1257,85 +1515,107 @@ msgstr "갤러리ì—ì„œ 미디어 ìž‘ì—…ì„ í•˜ë©´ 해당 ë‚´ìš©ì„ ì¶”ì í• ìˆ msgid "Your last 10 successful uploads" msgstr "지난 10ê°œì˜ ì—…ë¡œë“œ 목ë¡" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)sì˜ ê³„ì • ì •ë³´" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "죄송합니다. 해당 ìœ ì €ë¥¼ 찾지 못했습니다." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "email ì¸ì¦ì´ 필요합니다." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "ì´ë¯¸ 완료했습니다! ì‚¬ìš©ìž ê³„ì •ì€ í™œì„±í™” ë˜ì–´ 있습니다." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "곧 email ì„ í†µí•´ 지침서가 ë„ì°©í• ê²ë‹ˆë‹¤." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "ì´ëŸ°ê²½ìš°ëŠ” ìž‘ë™í•˜ì§€ 않습니다.:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "ì¸ì¦ë©”ì¼ ë‹¤ì‹œ 보내기" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "누군가 해당 ì‚¬ìš©ìž ì´ë¦„으로 등ë¡ì€ 했으나, ì•„ì§ í™œì„±í™” 하지 않았습니다." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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> ì„ í•˜ì‹œê³ ì¸ì¦ ë©”ì¼ì„ 새로 보내주세요." +msgid "%(username)s's profile" +msgstr "%(username)sì˜ ê³„ì • ì •ë³´" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "ë‹¹ì‹ ì— ëŒ€í•´ 소개해 보세요." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "ê³„ì • ì •ë³´ ìˆ˜ì •" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "ì´ ì‚¬ìš©ìžëŠ” ê³„ì • ì •ë³´ë¥¼ ìž…ë ¥í•˜ì§€ 않았습니다." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "%(username)sì˜ ëª¨ë“ ë¯¸ë””ì–´ 보기" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "ì´ê³³ì— 등ë¡í•œ 미디어가 나타나게 ë©ë‹ˆë‹¤. 하지만 ì•„ì§ ì•„ë¬´ëŸ° 미디어를 등ë¡í•˜ì§€ 않으셨네요." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "ì•„ì§ ì–´ë– í•œ ë¯¸ë””ì–´ë„ ì¡´ìž¬í•˜ì§€ 않습니다." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "email ì¸ì¦ì´ 필요합니다." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "ì´ë¯¸ 완료했습니다! ì‚¬ìš©ìž ê³„ì •ì€ í™œì„±í™” ë˜ì–´ 있습니다." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "곧 email ì„ í†µí•´ 지침서가 ë„ì°©í• ê²ë‹ˆë‹¤." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "ì´ëŸ°ê²½ìš°ëŠ” ìž‘ë™í•˜ì§€ 않습니다.:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "ì¸ì¦ë©”ì¼ ë‹¤ì‹œ 보내기" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "누군가 해당 ì‚¬ìš©ìž ì´ë¦„으로 등ë¡ì€ 했으나, ì•„ì§ í™œì„±í™” 하지 않았습니다." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1384,6 +1664,10 @@ msgstr "최근" msgid "older" msgstr "ì´ì „" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "태그 ì •ë³´" @@ -1392,34 +1676,34 @@ msgstr "태그 ì •ë³´" msgid "Could not read the image file." msgstr "ì´ë¯¸ì§€ 파ì¼ì„ ì½ì„ 수 없습니다." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "ì›ìŠ¤!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "오우, ëŒ“ê¸€ì´ ë¹„ì—ˆìŠµë‹ˆë‹¤." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "ëŒ“ê¸€ì´ ë“±ë¡ ë˜ì—ˆìŠµë‹ˆë‹¤!" @@ -1517,43 +1805,43 @@ msgstr "\"%s\" 모ìŒì§‘ì´ ì´ë¯¸ 존재 합니다. \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" 모ìŒì§‘ì„ ì¶”ê°€í–ˆìŠµë‹ˆë‹¤. \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "미디어를 ì‚ì œ 했습니다." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "í™•ì¸ ì²´í¬ë¥¼ 하지 않았습니다. 미디어는 ì‚ì œë˜ì§€ 않았습니다." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "다른 ì‚¬ëžŒì˜ ë¯¸ë””ì–´ë¥¼ ì‚ì œí•˜ë ¤ê³ í•©ë‹ˆë‹¤. 다시 한번 확ì¸í•˜ì„¸ìš”." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "모ìŒì§‘ì— ìžˆëŠ” í•ëª©ì„ ì‚ì œ 했습니다." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "확ì¸ì„ 하지 않았습니다. í•ëª©ì€ ì‚ì œí•˜ì§€ 않았습니다." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "다른 사용ìžì˜ 모ìŒì§‘ì— ìžˆëŠ” í•ëª©ì„ ì‚ì œí•˜ì˜€ìŠµë‹ˆë‹¤. 주ì˜í•˜ì„¸ìš”." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%s\" 모ìŒì§‘ì„ ì‚ì œí•˜ì…¨ìŠµë‹ˆë‹¤." -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "확ì¸ì„ 하지 않았습니다. 모ìŒì§‘ì€ ì‚ì œí•˜ì§€ 않았습니다." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "다른 사용ìžì˜ 모ìŒì§‘ì„ ì‚ì œí•˜ë ¤ê³ í•©ë‹ˆë‹¤. 주ì˜í•˜ì„¸ìš”." diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo Binary files differindex 2b6c247d..4b1246a8 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 7853ec7c..a157b4fd 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Sorry, registratie is uitgeschakeld op deze instantie." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Gebruikersnaam of email-adres" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Sorry, er bestaat al een gebruiker met die naam." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -80,77 +80,37 @@ msgstr "Je hebt je e-mailadres al geverifieerd!" msgid "Resent your verification email." msgstr "Verificatie e-mail opnieuw opgestuurd." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Een e-mail met instructies om je wachtwoord te veranderen is verstuurd." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat je e-mailadres nog niet geverifieerd is." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Je kunt nu inloggen met je nieuwe wachtwoord." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Beschrijving van dit werk" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiket" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Hou labels gescheiden met komma's." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "De slug kan niet leeg zijn" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "Het titelgedeelte van het adres van deze media. Normaal gesproken hoef je deze niet te veranderen." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licentie" @@ -193,45 +153,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Oud wachtwoord" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nieuw wachtwoord" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Wachtwoord" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -268,7 +229,7 @@ msgstr "Accountinstellingen opgeslagen" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Verkeerd wachtwoord" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Verkeerd wachtwoord" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "" @@ -341,7 +298,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -363,14 +356,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Gebruikersnaam" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Gebruikersnaam of email-adres" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Een e-mail met instructies om je wachtwoord te veranderen is verstuurd." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat je e-mailadres nog niet geverifieerd is." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Je kunt nu inloggen met je nieuwe wachtwoord." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Voer je nieuwe wachtwoord in" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Wachtwoord opslaan" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Heeft u nog geen account?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Maak er hier een!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Wachtwoord herstellen" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Stuur instructies" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Wachtwoord vergeten?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locatie" @@ -393,6 +490,10 @@ msgstr "Locatie" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Bekijken op <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -462,7 +563,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Voeg toe" @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Inloggen" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,117 +716,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Bestand" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "U moet een bestand aangeven." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Mooizo! Toegevoegd!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Accountinstellingen aanpassen" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Mediaverwerkingspaneel" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Voeg media toe" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Nieuwste media" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Media te verwerken" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Geen media om te verwerken" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Deze toevoegingen konden niet verwerkt worden:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -779,50 +884,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Voer je nieuwe wachtwoord in" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Wachtwoord opslaan" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Wachtwoord herstellen" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Stuur instructies" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hoi %(username)s,\n\nOm je wachtwoord voor GNU MediaGoblin te veranderen, moet je dit adres in je webbrowser openen:\n\n%(verification_url)s\n\nAls je denkt dat dit niet klopt, kun je deze e-mail gewoon negeren." - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Heeft u nog geen account?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Maak er hier een!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Wachtwoord vergeten?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Uitgegeven onder de <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>-licentie. <a href=\"%(source_link)s\">Broncode</a> available." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Verkennen" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -930,7 +995,7 @@ msgstr "Annuleren" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "Wijzigingen opslaan" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "%(media_title)s aanpassen" msgid "Changing %(username)s's account settings" msgstr "%(username)ss accountinstellingen aanpassen" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1019,8 +1073,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1040,7 +1097,7 @@ msgstr "Media met het label: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1064,7 +1121,7 @@ msgstr "U kunt een moderne web-browser die \n\taudio kan afspelen vinden op <a h #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1123,30 +1180,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Media te verwerken" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Geen media om te verwerken" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Deze toevoegingen konden niet verwerkt worden:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Voeg media toe" @@ -1231,7 +1489,7 @@ msgstr "Voeg dit bericht toe" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1258,85 +1516,107 @@ msgstr "Hier kun je de status zien van de media die verwerkt worden." msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profiel van %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Sorry, die gebruiker kon niet worden gevonden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Emailverificatie is nodig" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Bijna klaar! Je account moet nog geactiveerd worden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Een e-mail zou in een paar ogenblikken aan moeten komen met instructies hiertoe." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Zoniet:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Stuur de verificatie e-mail opnieuw op." +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Iemand heeft een account met deze gebruikersnaam gemaakt, maar hij moet nog geactiveerd worden." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Als u die persoon bent, maar de verificatie e-mail verloren hebt, kunt u <a href=\"%(login_url)s\">inloggen</a> en hem nogmaals verzenden." +msgid "%(username)s's profile" +msgstr "Profiel van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Hier is een plekje om anderen over jezelf te vertellen." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Profiel aanpassen." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Deze gebruiker heeft zijn of haar profiel (nog) niet ingevuld." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Bekijk alle media van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Dit is waar je nieuwe media zal verschijnen, maar het lijkt erop dat je nog niets heb toegevoegd." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Het lijkt erop dat er nog geen media is." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Emailverificatie is nodig" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Bijna klaar! Je account moet nog geactiveerd worden." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Een e-mail zou in een paar ogenblikken aan moeten komen met instructies hiertoe." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Zoniet:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Stuur de verificatie e-mail opnieuw op." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Iemand heeft een account met deze gebruikersnaam gemaakt, maar hij moet nog geactiveerd worden." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Als u die persoon bent, maar de verificatie e-mail verloren hebt, kunt u <a href=\"%(login_url)s\">inloggen</a> en hem nogmaals verzenden." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1385,6 +1665,10 @@ msgstr "nieuwer" msgid "older" msgstr "ouder" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Getagged met" @@ -1393,34 +1677,34 @@ msgstr "Getagged met" msgid "Could not read the image file." msgstr "Kon het afbeeldingsbestand niet lezen." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oeps!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" @@ -1518,43 +1806,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Je staat op het punt de media van iemand anders te verwijderen. Pas op." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo Binary files differindex 4b2e7815..77ef3622 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 261713fb..f974e3e1 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Registrering er slege av. Orsak." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "Rapportering er slege av. Orsak." + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "Autentisering er slege av. Orsak." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Brukarnamn eller epost" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Ugyldig brukarnamn eller passord." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Dette feltet tek ikkje epostadresser." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Dette feltet krev ei epostadresse." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Ein konto med dette brukarnamnet finst allereide." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Ein brukar med den epostadressa finst allereie." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil." @@ -80,77 +80,37 @@ msgstr "Du har allereie verifisiert epostadressa." msgid "Resent your verification email." msgstr "Stadfestingsepost sendt." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Dersom denne epostadressa er registrert, har ein epost med instruksjonar for Ã¥ endra passord vorte sendt til han." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Fann ingen med det brukarnamnet." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Sender epost med instruksjonar for Ã¥ endra passordet ditt." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller ikkje stadfesta." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "Brukar-ID-en er feil." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Du kan no logga inn med det nye passordet ditt." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Du mÃ¥ bekrefta eposten din før du kan tilbakestilla passordet ditt." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Tittel" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Skildring av verk" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formattering." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Merkelappar" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Separer merkelappar med komma." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Nettnamn" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Nettnamnet kan ikkje vera tomt" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "Nettnamnet (adressetittel) for verket di. Trengst ikkje endrast." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Lisens" @@ -183,7 +143,7 @@ msgstr "Send meg epost nÃ¥r andre kjem med innspel pÃ¥ verka mine." #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "SlÃ¥ av/pÃ¥ notifikasjonar om hendingar." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -193,45 +153,46 @@ msgstr "Lisens-val" msgid "This will be your default license on upload forms." msgstr "Dette vil vera standardvalet ditt for lisens." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Tittelen kjan ikkje vera tom" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Forklaringa til denne samlinga" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Gamalt passort" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Skriv inn det gamle passordet ditt for Ã¥ stadfesta at du eig denne kontoen." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nytt passord" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Ny epostadresse" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Passord" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Skriv inn passordet som prov pÃ¥ at dette er din konto." @@ -268,7 +229,7 @@ msgstr "Lagra kontoinstellingar" msgid "You need to confirm the deletion of your account." msgstr "Du mÃ¥ stadfesta slettinga av kontoen din." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "Ei samling med den nettadressa finst allereie for denne brukaren." msgid "You are editing another user's collection. Proceed with caution." msgstr "Du endrar ein annan brukar si samling. TrÃ¥ varsamt." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Feil passord" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Endra passord" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Epostadressa di er bekrefta." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Feil passord" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Cannot link theme... no theme set\n" @@ -341,7 +298,43 @@ msgstr "klarte ikkje køyra unoconv, sjekk logg-fil" msgid "Video transcoding failed" msgstr "Skjedde noko gale med video transkodinga" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "Ta-med-privilegium" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Bannlys brukaren" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Send brukaren ei melding" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "Slett innhaldet" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "Brukaren vil bli bannlyst til:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "Kvifor bannlyser du denne brukaren?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "Kva handling vil du ta for Ã¥ løysa rapporteringa?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "Kva privilegium vil du ta vekk?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Ã…tvaring frÃ¥" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "kom med innspel pÃ¥ innlegget ditt" @@ -363,14 +356,30 @@ msgstr "Treng oauth_token (must provide oath_token)." msgid "No request token found." msgstr "Noko gjekk gale :( (no request token found)." +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "Fila er for stor." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "Opplasting av denne fila vil putta deg over opplastingsgrensa di." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Du har nÃ¥dd opplastingsgrensa di." + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Brukarnamn" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "Brukarnamn eller epost" msgid "Stay logged in" msgstr "Hald meg innlogga" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Brukarnamn eller epost" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Dersom denne epostadressa er registrert, har ein epost med instruksjonar for Ã¥ endra passord vorte sendt til han." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Fann ingen med det brukarnamnet." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Sender epost med instruksjonar for Ã¥ endra passordet ditt." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller ikkje stadfesta." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "Brukar-ID-en er feil." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Du kan no logga inn med det nye passordet ditt." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "Brukaren er ikkje aktiv. Kontakt administrator for Ã¥ aktivera kontoen din att." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Endra passord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Lag nytt passord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Set passord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Endrar passordet til %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Lagra" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Manglar du konto?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Opprett ein!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "Endra passordet ditt." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Gløymd passordet?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Send instruksjonar" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Gløymd passordet?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Stad" @@ -393,6 +490,10 @@ msgstr "Stad" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "SjÃ¥ pÃ¥ <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "Logg inn for Ã¥ oppretta ein konto." + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Godta" @@ -462,7 +563,7 @@ msgstr "Dine OAuth-klientar" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Legg til" @@ -540,10 +641,10 @@ msgstr "OpenID-ar" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Logg inn" @@ -603,9 +704,9 @@ msgstr "Fjern ei Persona-epostadresse" msgid "Add a Persona email address" msgstr "Ny Persona-epostadresse" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" -msgstr "Endra Persona-epostadressa di" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" +msgstr "Personaer" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" @@ -615,117 +716,121 @@ msgstr "Eller logg inn med Persona." msgid "Or register with Persona!" msgstr "Eller registrer med Persona." -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Ugyldig fil for medietypen." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "Klarte ikkje kopiera til «public storage»." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "Fann ingen akseptable filar for prosessering." -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Maks filstorleik: {0} mb" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Du kan bruka\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> til formattering." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Du mÃ¥ velja ei fil." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Johoo! Opplasta!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "La til samlinga «%s»." -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "Du er bannlyst." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Bilete av stressa goblin" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "Du har blitt bannlyst." + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "til %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "for alltid" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Stadfest epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "Logg ut" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Endra kontoinstellingar" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Verkprosesseringspanel" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Logg ut" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Legg til verk" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Lag ny samling" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Bilete av stressa goblin" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Brukaradministrasjon" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "Rapporteringsadministrasjon" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Nyaste verk" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Hald oppsyn med statusen for prosessering av verka dine her." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Verk under prosessesering" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Ingen verk vert prosessert" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Klarte ikkje prosessera desse opplasta filene:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Ingen feila filer." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Dei siste ti opplastningane" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Ingenting prossesert, enno." - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "Godkjenning" @@ -779,50 +884,6 @@ msgstr "Godkjenning ferdig" msgid "Copy and paste this into your client:" msgstr "Kopier og lim inn dette i klienten din:" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Lag nytt passord" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Set passord" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Gløymd passordet?" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Send instruksjonar" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hei %(username)s,\n\nfor Ã¥ endra MediaGoblin-passordet ditt, opna fylgjande URL i ein netlesar:\n\n <%(verification_url)s>\n\nDersom du mistenkjer dette er eit misstak, ignorer eposten og hald fram med Ã¥ vera ein glad goblin!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Manglar du konto?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Opprett ein!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Gløymd passordet?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Kjeldekode</a> er tilgjengeleg." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "BruksvilkÃ¥r" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Utforsk" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Endrar vedlegg for %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Vedlegg" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Legg ved vedlegg" @@ -930,7 +995,7 @@ msgstr "Bryt av" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "Lagra" msgid "Changing %(username)s's email" msgstr "Endrar eposten til %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Lagra" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Endrar passordet til %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "Endrar %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Endrar kontoinnstellingane til %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Slett kontoen min" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Epost" @@ -1019,8 +1073,11 @@ msgstr "Nye innspel" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s sidan" @@ -1040,7 +1097,7 @@ msgstr "Verk merka med: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Last ned" @@ -1064,7 +1121,7 @@ msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjà #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Opphavleg fil" @@ -1123,30 +1180,231 @@ msgstr "Filformat" msgid "Object Height" msgstr "Objekthøgd" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Orsak, denne videoen fungerer ikkje\nfordi netlesaren din ikkje stør\nHTML5 video." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Du kan skaffa deg ein moderne netlesar som kan spela denne videoen hjÃ¥ <a href=http://opera.com>http://opera.com</a> eller <a href=\"http://getfirefox.com\">http://getfirefox.com</a>." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "WebM-fil (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Hald oppsyn med statusen for prosessering av verka dine her." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Verk under prosessesering" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Ingen verk vert prosessert" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Klarte ikkje prosessera desse opplasta filene:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Ingen feila filer." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Dei siste ti opplastningane" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Ingenting prossesert, enno." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "Fann ikkje rapporten." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "Attende til rapporteringspanelet" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "Rapport" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "Rapportert innspel" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\n â– Rapportert verk av <a href=\"%(user_url)s\">%(user_name)s</a>\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\n INNHALD AV\n <a href=\"%(user_url)s\"> %(user_name)s</a>\n ER SLETTA\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "Løys" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "Løys denne rapporten" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "Status" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "LØYST" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "Du kan ikkje handla mot ein administrator" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "Rapporteringspanel" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\nHer kan du sjÃ¥ opne rapportar som brukarane dine har lagt til." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "Aktive rapportar" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "Skulda" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "Rapportert" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "Rapportert av" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Ã…rsak" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\n Innspelsrapport #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\n Verk-rapport #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "Ingen opne rapportar." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "Løyste rapportar" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "Løyst" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "Handling teke" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\nLukka rapport #%(report_id)s" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "Ingen lukka rapportar." + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Brukarpanel" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\nHer kan du slÃ¥ opp brukarar og straffa dei." + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Aktive brukarar" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "ID" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "Vart med" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "Tal pÃ¥ innspel" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "Fann ingen brukarar." + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Legg til ei samling" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Legg til verk" @@ -1231,7 +1489,7 @@ msgstr "Legg til dette innspelet" msgid "Comment Preview" msgstr "Førehandsvisning av innspel" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Lagt til" @@ -1258,85 +1516,107 @@ msgstr "SjÃ¥ status for prosessering av verka dine her." msgid "Your last 10 successful uploads" msgstr "Dine ti siste opplastningar." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)s sin profil" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Fann ingen slik brukar" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Treng stadfesting av epostadressa" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>Rapportér</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Nesten ferdig. Du treng berre aktivera kontoen." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Ein epost med instruksjonar kjem straks." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "Rapporterer dette innspelet" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "I tilfelle det ikkje skjer:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Send ein ny stadfestingsepost" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Dette brukarnamnet finst allereie, men det er ikkje aktivert." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "Rapporterer dette verket" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format 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 "Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for Ã¥ fÃ¥ tilsendt ny epost med stadfestingslenkje." +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\n â– Publisert av <a href=\"%(user_url)s\"\n class=\"comment_authorlink\">%(username)s</a>\n " + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "Rapportér" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "%(username)s sin profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Her kan du fortelja om deg sjølv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Endra profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Brukaren har ikkje fylt ut profilen sin (enno)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "SjÃ¥ gjennom samlingar" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "SjÃ¥ alle %(username)s sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Her kjem verka dine." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Ser ikkje ut til at det finst nokon verk her nett no." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Treng stadfesting av epostadressa" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Nesten ferdig. Du treng berre aktivera kontoen." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Ein epost med instruksjonar kjem straks." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "I tilfelle det ikkje skjer:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Send ein ny stadfestingsepost" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Dette brukarnamnet finst allereie, men det er ikkje aktivert." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for Ã¥ fÃ¥ tilsendt ny epost med stadfestingslenkje." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(fjern)" @@ -1385,6 +1665,10 @@ msgstr "nyare" msgid "older" msgstr "eldre" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "Rapportér verk" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Merka med" @@ -1393,34 +1677,34 @@ msgstr "Merka med" msgid "Could not read the image file." msgstr "Klarte ikkje lesa biletefila." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oops." -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Noko gjekk gale" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Bad Request (noko gjekk gale)" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "The request sent to the server is invalid, please double check it" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Ulovleg operasjon" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Orsak Dave, eg kan ikkje la deg gjera det!<HAL2000></p>\n<p>Du prøvde Ã¥ gjera noko du ikkje har løyve til. Prøvar du Ã¥ sletta alle brukarkonti no igjen?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formattering." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "Ã…rsak for rapportering" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Innspel er avslege" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." @@ -1518,43 +1806,43 @@ msgstr "«%s» er allereie i samling «%s»" msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» lagt til samling «%s»" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Du sletta verket." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje verket." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Du er i ferd med Ã¥ sletta ein annan brukar sine verk. TrÃ¥ varsamt." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Du fjerna fila frÃ¥ samlinga." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Fila var ikkje fjerna fordi du ikkje var sikker." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Du er i ferd med Ã¥ fjerna ei fil frÃ¥ ein annan brukar si samling. TrÃ¥ varsamt." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje samlinga." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Du er i ferd med Ã¥ sletta ein annan brukar si samling. TrÃ¥ varsamt." diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo Binary files differindex 238b025c..98e1ceed 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index cf82c6b5..f2af3cd1 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/mediagoblin/language/pl/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Niestety rejestracja w tym serwisie jest wyÅ‚Ä…czona." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Użytkownik lub adres e-mail" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "Przepraszamy, autoryzacja jest wyÅ‚Ä…czona w tym systemie." -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "NieprawidÅ‚owa nazwa konta albo niewÅ‚aÅ›ciwy adres poczty elektronicznej." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Niniejsze pole nie jest przeznaczone na adres poczty elektronicznej." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Niniejsze pole wymaga podania adresu poczty elektronicznej." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Niestety użytkownik o takiej nazwie już istnieje." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Niestety użytkownik z tym adresem e-mail już istnieje." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "Klucz kontrolny albo identyfikator użytkownika jest nieprawidÅ‚owy." @@ -80,77 +80,37 @@ msgstr "Twój adres e-mail już zostaÅ‚ zweryfikowany!" msgid "Resent your verification email." msgstr "WyÅ›lij ponownie e-mail weryfikujÄ…cy." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "JeÅ›li ten adres poczty elektronicznej istnieje (uwzglÄ™dniajÄ…c wielkość liter!), wysÅ‚ano na niego list z instrukcjÄ…, w jaki sposób możesz zmienić swoje hasÅ‚o." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Nie potrafiÄ™ znaleźć nikogo o tej nazwie użytkownika." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "WysÅ‚ano e-mail z instrukcjami jak zmienić hasÅ‚o." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Nie udaÅ‚o siÄ™ wysÅ‚ać e-maila w celu odzyskania hasÅ‚a, ponieważ twoje konto jest nieaktywne lub twój adres e-mail nie zostaÅ‚ zweryfikowany." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "Identyfikator użytkownika nie jest prawidÅ‚owy." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Teraz możesz siÄ™ zalogować używajÄ…c nowego hasÅ‚a." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Zanim bÄ™dziesz mógÅ‚ ponownie ustawić hasÅ‚o, musisz potwierdzić swój adres poczty elektronicznej." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "TytuÅ‚" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Opis tej pracy" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Możesz formatować tekst za pomocÄ… skÅ‚adni \n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a>." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Znaczniki" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Rozdzielaj znaczniki przecinkami." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Slug nie może być pusty" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "Fragment adresu mediów zawierajÄ…cy tytuÅ‚. Zwykle nie ma potrzeby aby go zmieniać." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencja" @@ -183,7 +143,7 @@ msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "WÅ‚Ä…cz powiadomienia dotyczÄ…ce wydarzeÅ„" #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -193,47 +153,48 @@ msgstr "Ulubiona licencja" msgid "This will be your default license on upload forms." msgstr "To bÄ™dzie twoja domyÅ›lna licencja dla wgrywanych mediów." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "TytuÅ‚ nie może być pusty" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Opis tej kolekcji" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Część adresu zawierajÄ…ca tytuÅ‚. Zwykle nie musisz tego zmieniać." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Stare hasÅ‚o" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Wprowadź swoje stare hasÅ‚o aby udowodnić, że to twoje konto." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nowe hasÅ‚o" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Nowy adres poczty elektronicznej" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "HasÅ‚o" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Wprowadź swoje hasÅ‚o aby potwierdzić, że jesteÅ› wÅ‚aÅ›cicielem konta." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -268,7 +229,7 @@ msgstr "Zapisano ustawienia konta" msgid "You need to confirm the deletion of your account." msgstr "Musisz potwierdzić, że chcesz skasować swoje konto." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "Kolekcja tego użytkownika z takim slugiem już istnieje." msgid "You are editing another user's collection. Proceed with caution." msgstr "Edytujesz kolekcjÄ™ innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "NieprawidÅ‚owe hasÅ‚o" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Twoje hasÅ‚o zostaÅ‚o zmienione" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Twój adres poczty elektronicznej zostaÅ‚ potwierdzony." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "NieprawidÅ‚owe hasÅ‚o" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Nie można podlinkować motywu... nie wybrano motywu\n" @@ -341,19 +298,55 @@ msgstr "nie daÅ‚o siÄ™ uruchomić unoconv, sprawdź log" msgid "Video transcoding failed" msgstr "Konwersja wideo nie powiodÅ‚a siÄ™" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "komentarze do twojego wpisu" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Zaprenumerowano komentarze do %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Nie bÄ™dziesz otrzymywać komentarzy do %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." @@ -361,16 +354,32 @@ msgstr "Musisz podać oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." +msgstr "Nie znaleziono żetonu żądania." + +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Użytkownik" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "Nazwa konta lub adres poczty elektronicznej" msgid "Stay logged in" msgstr "PozostaÅ„ zalogowany" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Użytkownik lub adres e-mail" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "JeÅ›li ten adres poczty elektronicznej istnieje (uwzglÄ™dniajÄ…c wielkość liter!), wysÅ‚ano na niego list z instrukcjÄ…, w jaki sposób możesz zmienić swoje hasÅ‚o." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Nie potrafiÄ™ znaleźć nikogo o tej nazwie użytkownika." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "WysÅ‚ano e-mail z instrukcjami jak zmienić hasÅ‚o." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Nie udaÅ‚o siÄ™ wysÅ‚ać e-maila w celu odzyskania hasÅ‚a, ponieważ twoje konto jest nieaktywne lub twój adres e-mail nie zostaÅ‚ zweryfikowany." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "Identyfikator użytkownika nie jest prawidÅ‚owy." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Teraz możesz siÄ™ zalogować używajÄ…c nowego hasÅ‚a." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Twoje hasÅ‚o zostaÅ‚o zmienione" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Podaj swoje nowe hasÅ‚o" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Podaj hasÅ‚o" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Zmieniam hasÅ‚o użytkownika %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Zachowaj" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Nie masz jeszcze konta?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Utwórz je tutaj!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Odtwórz hasÅ‚o" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "WyÅ›lij instrukcje" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "ZapomniaÅ‚eÅ› hasÅ‚a?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "PoÅ‚ożenie" @@ -393,6 +490,10 @@ msgstr "PoÅ‚ożenie" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Zobacz na <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Zezwól" @@ -462,7 +563,7 @@ msgstr "Twoi klienci OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Dodaj" @@ -471,7 +572,7 @@ msgstr "Dodaj" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Przepraszamy, ale istnieje już konto zarejestrowane z tym OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" @@ -484,12 +585,12 @@ msgstr "Przepraszamy, serwer OpenID nie zostaÅ‚ znaleziony" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Nie znaleziono serwisu OpenID dla %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Potwierdzenie %s nie powiodÅ‚o siÄ™: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" @@ -497,7 +598,7 @@ msgstr "Potwierdzenie anulowane" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Twój OpenID url zostaÅ‚ pomyÅ›lnie zachowany." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 @@ -507,7 +608,7 @@ msgstr "" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Wskazane OpenID nie jest powiÄ…zane z niniejszym kontem." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." @@ -535,15 +636,15 @@ msgstr "UsuÅ„" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Zaloguj siÄ™" @@ -566,7 +667,7 @@ msgstr "Albo zaloguj siÄ™ kontem OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Lub zarejestruj siÄ™ z OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." @@ -574,17 +675,17 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "Konto zwiÄ…zane z Persona zostaÅ‚o pomyÅ›lnie usuniÄ™te." #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Nie możesz usunąć adresu poczty elektronicznej powiÄ…zanego z systemem Persona, gdyż twoje konto zostanie wtedy bez jakiegokolwiek hasÅ‚a." #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Niniejsze konto nie jest powiÄ…zane z adresem poczty elektronicznej w Persona." #: mediagoblin/plugins/persona/views.py:176 msgid "" @@ -593,147 +694,151 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Twój adres poczty elektronicznej powiÄ…zany z Persona zostaÅ‚ zachowany pomyÅ›lnie." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "UsuÅ„ adres poczty elektronicznej powiÄ…zany z kontem Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Dodaj adres poczty elektronicznej powiÄ…zany z kontem Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "Lub zaloguj z kontem Persona!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "Lub zarejestruj z kontem Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "NiewÅ‚aÅ›ciwy plik dla tego rodzaju mediów." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." -msgstr "" +msgstr "Kopiowanie do dysku publicznego nie powiodÅ‚o siÄ™." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Plik" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Musisz podać plik." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Hura! WysÅ‚ano!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekcja \"%s\" zostaÅ‚a dodana!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Grafika zestresowanego goblina" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "wyloguj siÄ™" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "konto <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "ZmieÅ„ ustawienia konta" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Panel przetwarzania mediów" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Wyloguj siÄ™" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Dodaj media" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Utwórz nowÄ… kolekcjÄ™" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Grafika zestresowanego goblina" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Najnowsze media" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Tu możesz Å›ledzić stan przetwarzania mediów na tym serwerze." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Przetwarzane media" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Å»adne media nie sÄ… obecnie przetwarzane" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "NIe udaÅ‚o siÄ™ przesÅ‚ać tych plików:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Brak nieprzetworzonych wpisów!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Ostatnie 10 udanych wysyÅ‚ek" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Na razie nie przetworzono żadnego wpisu!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Uwierzytelnianie" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Uwierzytelnij" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" @@ -741,23 +846,23 @@ msgstr "JesteÅ› zalogowany jako" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Czy chcesz uwierzytelnić" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "nieznana aplikacja" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "na dostÄ™p do twojego konta?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Aplikacje z dostÄ™pem do twojego konta majÄ… prawo do:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Opublikuj nowe media na swoim koncie" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" @@ -765,64 +870,20 @@ msgstr "Zobacz swoje dane (np. profil, media, itp.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "ZmieÅ„ swoje dane" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Uwierzytelnianie zakoÅ„czone." #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Uwierzytelnianie zakoÅ„czone." #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" msgstr "Skopiuj i wklej to do swojego klienta:" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Podaj swoje nowe hasÅ‚o" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Podaj hasÅ‚o" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Odtwórz hasÅ‚o" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "WyÅ›lij instrukcje" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Cześć %(username)s,\n\naby zmienić twoje hasÅ‚o dla GNU MediaGoblin, otwórz nastÄ™pujÄ…cÄ… stronÄ™ w swojej przeglÄ…darce:\n\n%(verification_url)s\n\nJeÅ›li sÄ…dzisz, że to pomyÅ‚ka, po prostu zignoruj tÄ™ wiadomość i bÄ…dź nadal szczęśliwym goblinem!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Nie masz jeszcze konta?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Utwórz je tutaj!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "ZapomniaÅ‚eÅ› hasÅ‚a?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Opublikowane na licencji <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. DostÄ™pny jest <a href=\"%(source_link)s\">kod źródÅ‚owy</a>." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Odkrywaj" @@ -887,7 +952,7 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n>Stwórz konto w serwisie</a>\nalbo" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Edycja zaÅ‚Ä…czników do %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "ZaÅ‚Ä…czniki" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Dodaj zaÅ‚Ä…cznik" @@ -930,7 +995,7 @@ msgstr "Anuluj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "Zapisz zmiany" msgid "Changing %(username)s's email" msgstr "Zmieniam konto poczty elektronicznej dla %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Zachowaj" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Zmieniam hasÅ‚o użytkownika %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "Edytowanie %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Zmiana ustawieÅ„ konta %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "UsuÅ„ moje konto" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Adres poczty elektronicznej" @@ -1019,8 +1073,11 @@ msgstr "Nowe komentarze" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s temu" @@ -1040,7 +1097,7 @@ msgstr "Media ze znacznikami: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Pobierz" @@ -1064,7 +1121,7 @@ msgstr "ProszÄ™ pobrać przeglÄ…darkÄ™, która obsÅ‚uguje \n\tdźwiÄ™k w HTML5, #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Oryginalny plik" @@ -1123,30 +1180,231 @@ msgstr "Format pliku" msgid "Object Height" msgstr "Wysokość obiektu" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Niestety ten materiaÅ‚ nie bÄ™dzie widocznyâŽ, ponieważ twoja przeglÄ…darka nie⎠osbÅ‚uguje formatu HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Możesz pobrać porzÄ…dnÄ… przeglÄ…darkÄ™, która jest w stanie odtworzyć ten materiaÅ‚ filmowy, ze strony <a href=\"http://getfirefox.com/\">⎠http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "Plik WebM (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Tu możesz Å›ledzić stan przetwarzania mediów na tym serwerze." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Przetwarzane media" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Å»adne media nie sÄ… obecnie przetwarzane" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "NIe udaÅ‚o siÄ™ przesÅ‚ać tych plików:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Brak nieprzetworzonych wpisów!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Ostatnie 10 udanych wysyÅ‚ek" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Na razie nie przetworzono żadnego wpisu!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Dodaj kolekcjÄ™" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Dodaj swoje media" @@ -1231,7 +1489,7 @@ msgstr "Dodaj komentarz" msgid "Comment Preview" msgstr "PodglÄ…d komentarza" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Dodano" @@ -1258,85 +1516,107 @@ msgstr "Tutaj możesz Å›ledzić stan mediów przesyÅ‚anych do twojej galerii." msgid "Your last 10 successful uploads" msgstr "Ostatnie 10 twoich udanych wysyÅ‚ek" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profil użytkownika %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Niestety, nie znaleziono takiego użytkownika." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Wymagana weryfikacja adresu e-mail." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Prawie gotowe! Twoje konto oczekuje na aktywacjÄ™." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Za kilka chwil powinieneÅ› otrzymać e-mail z instrukcjami jak to zrobić." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "JeÅ›li nie nadejdzie:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "WyÅ›lij ponownie e-mail weryfikujÄ…cy" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "KtoÅ› zarejestrowaÅ‚ konto o tej nazwie, ale nadal oczekuje ono na aktywacjÄ™." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "JeÅ›li jesteÅ› tÄ… osobÄ…, ale zgubiÅ‚eÅ› swój e-mail weryfikujÄ…cy, to możesz siÄ™ <a href=\"%(login_url)s\">zalogować</a> i wysÅ‚ać go ponownie." +msgid "%(username)s's profile" +msgstr "Profil użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "W tym miejscu można siÄ™ przedstawić innym." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Edytuj profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Ten użytkownik nie wypeÅ‚niÅ‚ (jeszcze) opisu swojego profilu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "PrzeglÄ…daj kolekcje" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Zobacz wszystkie media użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Tu bÄ™dÄ… widoczne twoje media, ale na razie niczego tu jeszcze nie ma." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Tu nie ma jeszcze żadnych mediów..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Wymagana weryfikacja adresu e-mail." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Prawie gotowe! Twoje konto oczekuje na aktywacjÄ™." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Za kilka chwil powinieneÅ› otrzymać e-mail z instrukcjami jak to zrobić." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "JeÅ›li nie nadejdzie:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "WyÅ›lij ponownie e-mail weryfikujÄ…cy" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "KtoÅ› zarejestrowaÅ‚ konto o tej nazwie, ale nadal oczekuje ono na aktywacjÄ™." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "JeÅ›li jesteÅ› tÄ… osobÄ…, ale zgubiÅ‚eÅ› swój e-mail weryfikujÄ…cy, to możesz siÄ™ <a href=\"%(login_url)s\">zalogować</a> i wysÅ‚ać go ponownie." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(usuÅ„)" @@ -1385,6 +1665,10 @@ msgstr "nowsze" msgid "older" msgstr "starsze" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Znaczniki:" @@ -1393,34 +1677,34 @@ msgstr "Znaczniki:" msgid "Could not read the image file." msgstr "Nie udaÅ‚o siÄ™ odczytać pliku grafiki." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "WystÄ…piÅ‚ bÅ‚Ä…d" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "NiewÅ‚aÅ›ciwe żądanie" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "Żądanie wysÅ‚ane do serwera jest nieprawidÅ‚owe, sprawdź je proszÄ™ ponownie" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Operacja niedozwolona" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Misiaczku, nie możesz tego uczynić!</p><p>PróbowaÅ‚eÅ› wykonać dziaÅ‚anie, do którego nie masz uprawnieÅ„. Czy naprawdÄ™ chciaÅ‚eÅ› skasować znowu wszystkie konta?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1459,7 +1743,7 @@ msgstr "Komentarz" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Możesz formatować tekst za pomocÄ… skÅ‚adni <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\"> Markdown</a>." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1486,17 +1770,21 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." +msgstr "Możesz formatować tekst za pomocÄ… skÅ‚adni\n<a ref=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a>." + +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Komentowanie jest wyÅ‚Ä…czone." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Ups, twój komentarz nie zawieraÅ‚ treÅ›ci." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Twój komentarz zostaÅ‚ opublikowany!" @@ -1518,43 +1806,43 @@ msgstr "\"%s\" już obecne w kolekcji \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" dodano do kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Media zostaÅ‚y usuniÄ™te." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Media nie zostaÅ‚y usuniÄ™te ponieważ nie potwierdziÅ‚eÅ›, że jesteÅ› pewien." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Za chwilÄ™ usuniesz media innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Element zostaÅ‚ usuniÄ™ty z kolekcji." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Ten element nie zostaÅ‚ usuniÄ™ty, ponieważ nie zaznaczono, że jesteÅ› pewien." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Zamierzasz usunąć element z kolekcji innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "UsuniÄ™to kolekcjÄ™ \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Ta kolekcja nie zostaÅ‚a usuniÄ™ta, ponieważ nie zaznaczono, że jesteÅ› pewien." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Zamierzasz usunąć kolekcjÄ™ innego użytkownika. Zachowaj ostrożność." diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo Binary files differindex 72cae0d0..830dffa2 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 ca18fd9f..1bf3ef84 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -24,41 +24,41 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Desculpa, o registro está desativado neste momento." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Nome de usuário ou email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nome de usuário ou email inválido." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Este campo não aceita endereços de email." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Este campo requer um endereço de email." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Desculpe, um usuário com este nome já existe." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Desculpe, um usuário com esse email já está cadastrado" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -84,77 +84,37 @@ msgstr "Você já verificou seu email!" msgid "Resent your verification email." msgstr "O email de verificação foi enviado novamente." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Se esse endereço de email (sensÃvel a maiúsculo/minúsculo!) estiver registrado, um email será enviado com instruções para alterar sua senha." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Não foi possÃvel encontrar alguém com esse nome de usuário." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Um email foi enviado com instruções para trocar sua senha." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Não foi possÃvel enviar o email de recuperação de senha, pois seu nome de usuário está inativo ou o email da sua conta não foi confirmado." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Agora você pode entrar usando sua nova senha." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "Você precisa verificar seu email antes de trocar sua senha." - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "TÃtulo" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descrição desse trabalho" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiquetas" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Separe as etiquetas com vÃrgulas." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Arquivo" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "O arquivo não pode estar vazio" @@ -164,7 +124,7 @@ msgid "" "this." msgstr "A parte do tÃtulo do endereço dessa mÃdia. Geralmente você não precisa mudar isso." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licença" @@ -197,45 +157,46 @@ msgstr "Licença preferida" msgid "This will be your default license on upload forms." msgstr "Esta será sua licença padrão nos formulários de envio." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "O tÃtulo não pode ficar vazio" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descrição desta coleção" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "A parte do tÃtulo do endereço dessa coleção. Geralmente você não precisa mudar isso." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Senha antiga" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Digite sua senha antiga para provar que esta conta é sua." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nova senha" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Novo endereço de email" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Senha" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Digite sua senha para provar que esta conta é sua." @@ -272,7 +233,7 @@ msgstr "As mudanças na conta foram salvas" msgid "You need to confirm the deletion of your account." msgstr "Você precisa confirmar a exclusão da sua conta." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -286,18 +247,14 @@ msgstr "Já existe uma coleção com este arquivo para este usuário." msgid "You are editing another user's collection. Proceed with caution." msgstr "Você está editando a coleção de um outro usuário. Prossiga com cuidado." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Senha errada" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Sua senha foi alterada com sucesso." - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "Seu endereço de email foi verificado." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Senha errada" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Não é possÃvel fazer link de tema... nenhum tema definido\n" @@ -345,19 +302,55 @@ msgstr "" msgid "Video transcoding failed" msgstr "Conversão do vÃdeo falhou" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Banir o usuário" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Enviar uma mensagem ao usuário" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "O usuário será banido até:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "Por quê você está banindo esse usuário?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Aviso de" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "comentou na sua publicação" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "Você se inscreveu nos comentários de %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "Você não irá receber notificações sobre comentários em %s." +msgstr "Você não irá receber notificações de comentários em %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." @@ -367,14 +360,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Desculpe, você atingiu seu limite de envios." + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nome de Usuário" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -388,6 +397,94 @@ msgstr "Nome de usuário ou email" msgid "Stay logged in" msgstr "Mantenha-me Conectado" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Nome de usuário ou email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Se esse endereço de email (sensÃvel a maiúsculo/minúsculo!) estiver registrado, um email será enviado com instruções para alterar sua senha." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Não foi possÃvel encontrar alguém com esse nome de usuário." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Um email foi enviado com instruções para trocar sua senha." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Não foi possÃvel enviar o email de recuperação de senha, pois seu nome de usuário está inativo ou o email da sua conta não foi confirmado." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Agora você pode entrar usando sua nova senha." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Sua senha foi alterada com sucesso." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Defina a sua nova senha" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Definir senha" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Alterando a senha de %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Salvar" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Ainda não tem conta?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Crie uma aqui!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Recuperar senha" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Mandar instruções" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Esqueceu sua senha?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Localização" @@ -397,6 +494,10 @@ msgstr "Localização" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Ver no <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Permitir" @@ -466,7 +567,7 @@ msgstr "Seus clientes OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Adicionar" @@ -544,10 +645,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Entrar" @@ -578,7 +679,7 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "O endereço de email Persona foi removido com sucesso." #: mediagoblin/plugins/persona/views.py:144 msgid "" @@ -588,27 +689,27 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Esse endereço de email Persona não está associado a esta conta." #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Desculpe, já existe uma conta associada a este endereço de email Persona." #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Seu endereço de email Persona foi salvo com sucesso." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Excluir um endereço de email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Adicionar um endereço de email Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -619,117 +720,121 @@ msgstr "Ou entre com Persona!" msgid "Or register with Persona!" msgstr "Ou registre com Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Arquivo inválido para esse tipo de mÃdia" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "Falha ao copiar para armazenamento público." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Tamanho máximo de arquivo: {0} mb" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Arquivo" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Você deve fornecer um arquivo." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Eba! Enviado!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Coleção \"%s\" adicionada!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Imagem do goblin se estressando" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "até %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "indefinidamente" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifique seu email!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "sair" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Mudar configurações da conta" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Painel de processamento de mÃdia" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Sair" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Adicionar mÃdia" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Criar nova coleção" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Imagem do goblin se estressando" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Painel de gerenciamento de usuário" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "MÃdia mais recente" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "MÃdia em processo" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Nenhuma mÃdia em processo" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Esses envios não foram processados:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Nenhuma entrada falhou!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Últimos 10 envios bem sucedidos" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Ainda não há entradas processadas!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "Autorização" @@ -783,50 +888,6 @@ msgstr "Autorização ConcluÃda" msgid "Copy and paste this into your client:" msgstr "Copie e cole isto no seu cliente:" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Defina a sua nova senha" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Definir senha" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Recuperar senha" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Mandar instruções" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Olá %(username)s,\n\npara alterar sua senha do GNU MediaGoblin, abra a seguinte URL\nno seu navegador web:\n\n%(verification_url)s\n\nSe você acha que isso é um erro, desconsidere esse email e continue sendo um goblin feliz" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Ainda não tem conta?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Crie uma aqui!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Esqueceu sua senha?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -862,6 +923,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Lançado sob a <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Código fonte</a> disponÃvel." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "Termos de Serviço" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Explorar" @@ -911,13 +976,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editando os anexos de %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Anexos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Adicionar anexo" @@ -934,7 +999,7 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -946,17 +1011,6 @@ msgstr "Salvar mudanças" msgid "Changing %(username)s's email" msgstr "Alterando email de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Salvar" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Alterando a senha de %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -984,11 +1038,11 @@ msgstr "Editando %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Alterando as configurações da conta de %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Deletar minha conta" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Email" @@ -1023,8 +1077,11 @@ msgstr "Novos comentários" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s" @@ -1044,7 +1101,7 @@ msgstr "Etiquetas desta mÃdia: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Baixar" @@ -1068,7 +1125,7 @@ msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio e #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Arquivo original" @@ -1127,30 +1184,231 @@ msgstr "Formato de Arquivo" msgid "Object Height" msgstr "Altura do Objeto" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Desculpe, este vÃdeo não irá reproduzir porque\n seu navegador não suporta vÃdeo\n HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Você pode obter um navegador moderno\n capaz de reproduzir este vÃdeo em <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "Arquivo WebM (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "MÃdia em processo" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Nenhuma mÃdia em processo" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Esses envios não foram processados:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Nenhuma entrada falhou!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Últimos 10 envios bem sucedidos" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Ainda não há entradas processadas!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Motivo" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Painel de usuário" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Usuários Ativos" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "Nenhum usuário encontrado." + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Adicionar uma coleção" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Adicionar sua mÃdia" @@ -1233,9 +1491,9 @@ msgstr "Adicionar este comentário" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Pré-visualização do comentário" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Adicionado há" @@ -1262,85 +1520,107 @@ msgstr "Você pode verificar como a mÃdia esta sendo processada para sua galeri msgid "Your last 10 successful uploads" msgstr "Seus últimos 10 envios bem sucedidos" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Perfil de %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Desculpe, esse usuário não foi encontrado." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Verificação de email necessária" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Quase pronto! Sua conta ainda precisa ser ativada." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Um email deve chegar em instantes com instruções de como fazê-lo." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Caso contrário:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Reenviar email de verificação" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\nâ– Publicado por <a href=\"%(user_url)s\"\nclass=\"comment_authorlink\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Alguém registrou uma conta com esse nome de usuário, mas ainda precisa ser ativada." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Se você é essa pessoa, mas você perdeu seu e-mail de verificação, você pode <a href=\"%(login_url)s\">efetuar login</a> e reenviá-la." +msgid "%(username)s's profile" +msgstr "Perfil de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Aqui é o lugar onde você fala de si para os outros." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Editar perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Esse usuário não preencheu seu perfil (ainda)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Ver coleções" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Ver todas as mÃdias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Aqui é onde sua mÃdia vai aparecer, mas parece que você não adicionou nada ainda." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Parece que ainda não há nenhuma mÃdia por aqui..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Verificação de email necessária" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Quase pronto! Sua conta ainda precisa ser ativada." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Um email deve chegar em instantes com instruções de como fazê-lo." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Caso contrário:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Reenviar email de verificação" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Alguém registrou uma conta com esse nome de usuário, mas ainda precisa ser ativada." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Se você é essa pessoa, mas você perdeu seu e-mail de verificação, você pode <a href=\"%(login_url)s\">efetuar login</a> e reenviá-la." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(apagar)" @@ -1382,13 +1662,17 @@ msgstr "Ir a página:" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 msgid "newer" -msgstr "mais nova" +msgstr "mais recente" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 msgid "older" msgstr "mais antiga" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Etiquetas" @@ -1397,34 +1681,34 @@ msgstr "Etiquetas" msgid "Could not read the image file." msgstr "Não foi possÃvel ler o arquivo de imagem." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oops" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Um erro ocorreu" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Operação não permitida" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Me desculpe Dave, não posso deixar você fazer isso!</p><p>Você tentou executar uma função sem autorização. Por acaso estava novamente tentando deletar todas as contas de usuários?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1492,15 +1776,19 @@ msgid "" " Markdown</a> for formatting." msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação de texto." -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Desculpe, os comentários estão desabilitados." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Ops, seu comentário estava vazio." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Seu comentário foi postado!" @@ -1522,43 +1810,43 @@ msgstr "\"%s\" já está na coleção \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" adicionado à coleção \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Você deletou a mÃdia." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "A mÃdia não foi apagada porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Você vai apagar uma mÃdia de outro usuário. Tenha cuidado." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Você deletou o item da coleção." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "O item não foi apagado porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Você está prestes a remover um item da coleção de um outro usuário. Prossiga com cuidado." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Você deletou a coleção \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "A coleção não foi apagada porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Você está prestes a deletar a coleção de um outro usuário. Prossiga com cuidado." diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo Binary files differindex 32504b9a..d516f5ce 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 00edc228..80d7afb3 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Numele de utilizator sau adresa de e-mail" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nume de utilizator sau adresă de e-mail nevalidă." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Această rubrică nu este pentru adrese de e-mail." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Această rubrică trebuie completată cu o adresă de e-mail." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Ne pare rău, există deja un utilizator cu acelaÈ™i nume." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Există deja un utilizator înregistrat cu această adresă de e-mail." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -80,77 +80,37 @@ msgstr "Adresa ta de e-mail a fost deja verificată!" msgid "Resent your verification email." msgstr "E-mail-ul de verificare a fost retrimis." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Dacă adresa de e-mail este în baza noastră de date, atunci se va trimite imediat un mesaj cu instrucÈ›iuni pentru schimbarea parolei. ÈšineÈ›i cont de litere mari / litere mici la introducerea adresei!" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Nu există nimeni cu acest nume de utilizator." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "S-a trimis un e-mail cu instrucÈ›iuni pentru schimbarea parolei." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "E-mailul pentru recuperarea parolei nu a putut fi trimis deoarece contul tău e inactiv sau adresa ta de e-mail nu a fost verificată." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Acum te poÈ›i autentifica cu noua parolă." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titlu" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Descrierea acestui fiÈ™ier" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "PoÈ›i folosi\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> pentru formatare." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Cuvinte-cheie" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Desparte cuvintele-cheie prin virgulă." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Identificator" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Identificatorul nu poate să lipsească" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "Partea corespunzătoare titlului din adresa acestui fiÈ™ier media. De regulă poate fi lăsată nemodificată." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "LicenÈ›a" @@ -193,45 +153,46 @@ msgstr "LicenÈ›a preferată" msgid "This will be your default license on upload forms." msgstr "Aceasta va fi licenÈ›a implicită pe formularele de upload." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Titlul nu poate să fie gol" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descriere pentru această colecÈ›ie" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Partea din adresa acestei colecÈ›ii care corespunde titlului. De regulă nu e necesar să faci o modificare." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Vechea parolă" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Introdu vechea parolă pentru a demonstra că eÈ™ti titularul acestui cont." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Noua parolă" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Parolă" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -268,7 +229,7 @@ msgstr "Setările pentru acest cont au fost salvate" msgid "You need to confirm the deletion of your account." msgstr "Trebuie să confirmi È™tergerea contului tău." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "O colecÈ›ie cu acelaÈ™i slug există deja pentru acest utilizator." msgid "You are editing another user's collection. Proceed with caution." msgstr "Lucrezi pe colecÈ›ia unui alt utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Parolă incorectă" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Parola a fost schimbată cu succes" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Parolă incorectă" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Tema nu poate fi ataÈ™ată... nu există o temă selectată\n" @@ -341,7 +298,43 @@ msgstr "unoconv nu poate fi executat; verificaÈ›i log-ul" msgid "Video transcoding failed" msgstr "Transcodarea video a eÈ™uat" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "a făcut un comentariu la postarea ta" @@ -363,14 +356,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Nume de utilizator" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "Numele de utilizator sau adresa de e-mail" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Numele de utilizator sau adresa de e-mail" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Dacă adresa de e-mail este în baza noastră de date, atunci se va trimite imediat un mesaj cu instrucÈ›iuni pentru schimbarea parolei. ÈšineÈ›i cont de litere mari / litere mici la introducerea adresei!" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Nu există nimeni cu acest nume de utilizator." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "S-a trimis un e-mail cu instrucÈ›iuni pentru schimbarea parolei." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "E-mailul pentru recuperarea parolei nu a putut fi trimis deoarece contul tău e inactiv sau adresa ta de e-mail nu a fost verificată." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Acum te poÈ›i autentifica cu noua parolă." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Parola a fost schimbată cu succes" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "StabileÈ™te noua parolă" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "StabileÈ™te parola" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Se modifică parola pentru %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Salvează" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Nu ai un cont?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Creează-l aici!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Recuperează parola" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Trimite instrucÈ›iuni" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Ai uitat parola?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locul" @@ -393,6 +490,10 @@ msgstr "Locul" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Vezi pe <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Permite" @@ -462,7 +563,7 @@ msgstr "ClienÈ›ii tăi OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Adaugă" @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Autentificare" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,117 +716,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Formatul fiÈ™ierului nu corespunde cu tipul de media selectat." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "FiÈ™ier" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Trebuie să selectezi un fiÈ™ier." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Ura! Trimis!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "ColecÈ›ia \"%s\" a fost creată!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Imagine cu un goblin stresat" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "IeÈ™ire" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Contul lui <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Modifică setările contului" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Panou de procesare media" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "IeÈ™ire" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Trimite fiÈ™ier" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Creează colecÈ›ie nouă" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Imagine cu un goblin stresat" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Cele mai recente fiÈ™iere" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Aici poÈ›i urmări starea fiÈ™ierelor aflate în curs de procesare pe acest server." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "FiÈ™iere în curs de procesare" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Niciun fiÈ™ier în curs de procesare" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Aceste fiÈ™iere nu au putut fi procesate:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Niciun entry cu erori!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Ultimele 10 upload-uri reuÈ™ite" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Nu există încă niciun entry procesat!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -779,50 +884,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "StabileÈ™te noua parolă" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "StabileÈ™te parola" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Recuperează parola" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Trimite instrucÈ›iuni" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Bună, %(username)s\n\nPentru a schimba parola ta la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s\n\nDacă ai primit acest mesaj din greÈ™eală, ignoră-l È™i fii mai departe un goblin fericit!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Nu ai un cont?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Creează-l aici!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Ai uitat parola?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Publicat sub licenÈ›a <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Codul sursă</a> este disponibil." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Explorează" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editare anexe la %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Anexe" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "AtaÈ™ează" @@ -930,7 +995,7 @@ msgstr "Anulare" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "Salvează modificările" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Salvează" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Se modifică parola pentru %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "Editare %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Se modifică setările contului pentru userul %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Șterge contul meu" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1019,8 +1073,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "în urmă cu %(formatted_time)s" @@ -1040,7 +1097,7 @@ msgstr "FiÈ™ier etichetat cu cuvintele-cheie: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Download" @@ -1064,7 +1121,7 @@ msgstr "PoÈ›i lua un browser modern \n\tcapabil să redea această înregistrare #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "FiÈ™ierul original" @@ -1123,30 +1180,231 @@ msgstr "Formatul fiÈ™ierului" msgid "Object Height" msgstr "ÃŽnălÈ›imea obiectului" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Ne pare rău, dar această înregistrare video nu va funcÈ›iona deoarece browser-ul dvs. nu este compatibil cu HTML5 video." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "PuteÈ›i obÈ›ine un browser Web modern care poate reda această înregistrare de la <a href=\"http://getfirefox.com\">http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Aici poÈ›i urmări starea fiÈ™ierelor aflate în curs de procesare pe acest server." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "FiÈ™iere în curs de procesare" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Niciun fiÈ™ier în curs de procesare" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Aceste fiÈ™iere nu au putut fi procesate:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Niciun entry cu erori!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Ultimele 10 upload-uri reuÈ™ite" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Nu există încă niciun entry procesat!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Creează o colecÈ›ie" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Adaugă fiÈ™ierele tale media" @@ -1231,7 +1489,7 @@ msgstr "Trimite acest comentariu" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Adăugat" @@ -1258,85 +1516,107 @@ msgstr "Aici poÈ›i urmări stadiul procesării fiÈ™ierelor media din galeria ta. msgid "Your last 10 successful uploads" msgstr "Ultimele tale 10 upload-uri reuÈ™ite" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profil %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Ne pare rău, nu am găsit utilizatorul căutat." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Este necesară verificarea adresei de e-mail" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Aproape gata! Mai trebuie doar să activezi contul." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Vei primi în scurt timp un e-mail cu instrucÈ›iuni." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Dacă nu-l primeÈ™ti:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Retrimite mesajul de verificare" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Cineva a înregistrat un cont cu acest nume de utilizator, dar contul nu a fost încă activat." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Dacă tu eÈ™ti persoana respectivă È™i nu mai ai e-mail-ul de verificare, poÈ›i să te <a href=\"%(login_url)s\">autentifici</a> pentru a-l retrimite." +msgid "%(username)s's profile" +msgstr "Profil %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Aici poÈ›i spune altora ceva despre tine." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Editare profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Acest utilizator nu È™i-a completat (încă) profilul." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Vizitează colecÈ›iile" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Vezi toate fiÈ™ierele media ale lui %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Aici vor apărea fiÈ™ierele tale media, dar se pare că încă nu ai trimis nimic." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Nu pare să existe niciun fiÈ™ier media deocamdată..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Este necesară verificarea adresei de e-mail" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Aproape gata! Mai trebuie doar să activezi contul." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Vei primi în scurt timp un e-mail cu instrucÈ›iuni." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Dacă nu-l primeÈ™ti:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Retrimite mesajul de verificare" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Cineva a înregistrat un cont cu acest nume de utilizator, dar contul nu a fost încă activat." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Dacă tu eÈ™ti persoana respectivă È™i nu mai ai e-mail-ul de verificare, poÈ›i să te <a href=\"%(login_url)s\">autentifici</a> pentru a-l retrimite." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(È™terge)" @@ -1385,6 +1665,10 @@ msgstr "mai noi" msgid "older" msgstr "mai vechi" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Etichetat cu cuvintele-cheie" @@ -1393,34 +1677,34 @@ msgstr "Etichetat cu cuvintele-cheie" msgid "Could not read the image file." msgstr "FiÈ™ierul cu imaginea nu a putut fi citit." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Hopa!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "S-a produs o eroare" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "OperaÈ›ia nu este permisă" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "ÃŽmi pare rău, Dave, nu te pot lăsa să faci asta!</p><p>Ai încercat să faci o operaÈ›ie nepermisă. Ai încercat iar să È™tergi toate conturile utilizatorilor?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Comentariile sunt dezactivate." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" @@ -1518,43 +1806,43 @@ msgstr "\"%s\" este deja în colecÈ›ia \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" a fost adăugat la colecÈ›ia \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Ai È™ters acest fiÈ™ier" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "FiÈ™ierul nu a fost È™ters deoarece nu ai confirmat că eÈ™ti sigur." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Urmează să È™tergi fiÈ™ierele media ale unui alt utilizator. Se recomandă prudență." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Ai È™ters acest articol din colecÈ›ie." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Articolul nu a fost È™ters pentru că nu ai confirmat că eÈ™ti sigur(ă)." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Urmează să È™tergi un articol din colecÈ›ia unui alt utilizator. Se recomandă prudență." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Ai È™ters colecÈ›ia \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "ColecÈ›ia nu a fost È™tearsă pentru că nu ai confirmat că eÈ™ti sigur(ă)." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Urmează să È™tergi colecÈ›ia unui alt utilizator. Se recomandă prudență." diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo Binary files differindex 8c537cc3..d2c5c02f 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 a1c0e1d8..9cd7b221 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-02 09:28-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" +"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/mediagoblin/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,41 +21,41 @@ 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/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Извините, на Ñтом Ñайте региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð°." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной почты" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "Извините, Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð½Ð° Ñтом Ñайте отключена." -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Ðеправильное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной почты." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Ðто поле не Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑа Ñлектронной почты." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Ðто поле — Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑа Ñлектронной почты." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Извините, пользователь Ñ Ñтим именем уже зарегиÑтрирован." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Сожалеем, но на Ñтот Ð°Ð´Ñ€ÐµÑ Ñлектронной почты уже зарегиÑтрирована Ð´Ñ€ÑƒÐ³Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -81,77 +81,37 @@ msgstr "Ð’Ñ‹ уже потвердили Ñвой Ð°Ð´Ñ€ÐµÑ ÑлектроннРmsgid "Resent your verification email." msgstr "Отправить заново Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° подтверждение по е-мÑйл." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "ЕÑли Ñ Ñтим адреÑом Ñлектронной почты (Ñравниваемым чувÑтвительно к региÑтру Ñимволов!) еÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, то на него отправлено Ñообщение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñми о том, как Ñменить пароль." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Ðе найдено никого Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем пользователÑ." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Вам отправлено Ñлектронное пиÑьмо Ñ Ð¸Ð½ÑтрукциÑми по Ñмене паролÑ." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Мы не можем отправить Ñообщение Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ, потому что ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ неактивна, либо указанный в ней Ð°Ð´Ñ€ÐµÑ Ñлектронной почты не был подтверждён." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ неверно." - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Теперь вы можете войти, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð°Ñˆ новый пароль." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Ðазвание" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "ОпиÑание Ñтого произведениÑ" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Ð”Ð»Ñ Ñ€Ð°Ð·Ð¼ÐµÑ‚ÐºÐ¸ можете иÑпользовать Ñзык\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a>." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Метки" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "(через запÑтую)" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "ÐžÑ‚Ð»Ð¸Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ адреÑа" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "ÐžÑ‚Ð»Ð¸Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ адреÑа необходима" @@ -161,7 +121,7 @@ msgid "" "this." msgstr "ЧаÑÑ‚ÑŒ адреÑа Ñтого файла, Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð½Ð°Ñ Ð¾Ñ‚ его названиÑ. Её обычно не требуетÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "ЛицензиÑ" @@ -194,45 +154,46 @@ msgstr "ÐŸÑ€ÐµÐ´Ð¿Ð¾Ñ‡Ð¸Ñ‚Ð°ÐµÐ¼Ð°Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ" msgid "This will be your default license on upload forms." msgstr "Она будет лицензией по умолчанию Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… загрузок" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Ðазвание не может быть пуÑтым" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "ОпиÑание Ñтой коллекции" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "ÐžÑ‚Ð»Ð¸Ñ‡Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ адреÑа Ñтой коллекции, оÑÐ½Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° названии. Обычно не нужно её изменÑÑ‚ÑŒ." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Старый пароль" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Введите Ñвой Ñтарый пароль в качеÑтве доказательÑтва, что Ñто ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Ðовый пароль" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "Ðовый Ð°Ð´Ñ€ÐµÑ Ñлектронной почты" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Пароль" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "Введите Ñвой пароль в качеÑтве доказательÑтва, что Ñто ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ." @@ -269,7 +230,7 @@ msgstr "ÐаÑтройки учётной запиÑи запиÑаны" msgid "You need to confirm the deletion of your account." msgstr "Вам нужно подтвердить, что вы хотите удалить Ñвою учётную запиÑÑŒ." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -283,18 +244,14 @@ msgstr "У Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ ÐºÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ñ msgid "You are editing another user's collection. Proceed with caution." msgstr "Ð’Ñ‹ редактируете коллекцию другого пользователÑ. Будьте оÑторожны." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "Ваш Ð°Ð´Ñ€ÐµÑ Ñлектронной почты удоÑтоверен." + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "Ðеправильный пароль" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Ваш пароль Ñменён уÑпешно" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Ðевозможно привÑзать тему… не выбрано ÑущеÑтвующей темы\n" @@ -342,7 +299,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "Перекодировка видео не удалаÑÑŒ" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Забанить Ñтого пользователÑ" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Предупреждение от" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "оÑтавил комментарий к вашему файлу" @@ -364,14 +357,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -385,6 +394,94 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑ Ñлектронной почты" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "ЕÑли Ñ Ñтим адреÑом Ñлектронной почты (Ñравниваемым чувÑтвительно к региÑтру Ñимволов!) еÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ, то на него отправлено Ñообщение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñми о том, как Ñменить пароль." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Ðе найдено никого Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем пользователÑ." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Вам отправлено Ñлектронное пиÑьмо Ñ Ð¸Ð½ÑтрукциÑми по Ñмене паролÑ." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Мы не можем отправить Ñообщение Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ, потому что ваша ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ неактивна, либо указанный в ней Ð°Ð´Ñ€ÐµÑ Ñлектронной почты не был подтверждён." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾ неверно." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Теперь вы можете войти, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð²Ð°Ñˆ новый пароль." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Ваш пароль Ñменён уÑпешно" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Введите Ñвой новый пароль" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "УÑтановить пароль" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Сохранить" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Ðет аккаунта?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Создайте здеÑÑŒ!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Отправить инÑтрукцию" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Забыли Ñвой пароль?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Ðа карте" @@ -394,6 +491,10 @@ msgstr "Ðа карте" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "ПоÑмотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Разрешить" @@ -463,7 +564,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Добавить" @@ -541,10 +642,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Войти" @@ -590,7 +691,7 @@ msgstr "" #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Сожалеем, но у Ð½Ð°Ñ ÑƒÐ¶Ðµ еÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ñ Ñтим email-адреÑом Persona ." #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." @@ -604,8 +705,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -616,117 +717,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Ðеправильный формат файла." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Файл" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Ð’Ñ‹ должны загрузить файл." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Ура! Файл загружен!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "ÐšÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ñ Â«%s» добавлена!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Изображение нервничающего гоблина" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Подтвердите ваш Ð°Ð´Ñ€ÐµÑ Ñлектронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "завершение ÑеанÑа" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Изменить наÑтройки учётной запиÑи" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Панель обработки файлов" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Завершение ÑеанÑа" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Добавить файлы" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Создать новую коллекцию" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Изображение нервничающего гоблина" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Самые новые файлы" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "ЗдеÑÑŒ вы можете Ñледить за ÑоÑтоÑнием обработки файлов Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñайта." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Обработка файлов в процеÑÑе" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Ðету файлов Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Обработка Ñтих файлов вызвала ошибку:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "ÐеудавшихÑÑ Ð·Ð°Ð´Ð°Ñ‡ нет!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "ПоÑледние 10 удавшихÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ðº" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Выполненных задач пока нет!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -754,11 +859,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñ Ð´Ð¾Ñтупом к вашей учётной запиÑи могут:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "загружать файлы от вашего имени" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" @@ -780,50 +885,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Введите Ñвой новый пароль" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "УÑтановить пароль" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Отправить инÑтрукцию" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Привет, %(username)s,\n\nчтобы Ñменить Ñвой пароль от GNU MediaGoblin, откройте\nÑледующий URL вашим вебâ€Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð¾Ð¼:\n\n%(verification_url)s\n\nЕÑли вы думаете, что Ñто какаÑâ€Ñ‚о ошибка, то игнорируйте\nÑто Ñообщение и продолжайте быть ÑчаÑтливым гоблином!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Ðет аккаунта?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Создайте здеÑÑŒ!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Забыли Ñвой пароль?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -859,6 +920,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Он опубликован на уÑловиÑÑ… <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. ДоÑтупны <a href=\"%(source_link)s\">иÑходные текÑÑ‚Ñ‹</a>." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "УÑÐ»Ð¾Ð²Ð¸Ñ Ð¸ÑпользованиÑ" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Смотреть" @@ -908,13 +973,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Добавление ÑопутÑтвующего файла Ð´Ð»Ñ %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "СопутÑтвующие файлы" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Добавить ÑопутÑтвующий файл" @@ -931,7 +996,7 @@ msgstr "Отмена" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -943,17 +1008,6 @@ msgstr "Сохранить изменениÑ" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Сохранить" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ %(username)s" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -981,11 +1035,11 @@ msgstr "Редактирование %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "ÐаÑтройка учётной запиÑи %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Удалить мою учётную запиÑÑŒ" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "Е-майл " @@ -1020,8 +1074,11 @@ msgstr "Ðовые комментарии" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s назад" @@ -1041,7 +1098,7 @@ msgstr "Файлы Ñ Ð¼ÐµÑ‚ÐºÐ¾Ð¹: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Скачать" @@ -1065,7 +1122,7 @@ msgstr "Ð’Ñ‹ можете Ñкачать Ñовременный браузер, #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "ИÑходный файл" @@ -1124,30 +1181,359 @@ msgstr "Формат файла" msgid "Object Height" msgstr "Ð’Ñ‹Ñота объекта" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Сожалеем, Ñтот ролик не проиграетÑÑ, âŽ\nпотому что ваш браузер не поддерживает âŽ\nвидео в ÑоответÑтвии Ñо Ñтандартом HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Ð’Ñ‹ можете Ñкачать Ñовременный браузер, ÑпоÑобный воÑпроизводить Ñто видео, Ñ <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "WebM файл (VP8/Vorbis)" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "ЗдеÑÑŒ вы можете Ñледить за ÑоÑтоÑнием обработки файлов Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñайта." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Обработка файлов в процеÑÑе" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Ðету файлов Ð´Ð»Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Обработка Ñтих файлов вызвала ошибку:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "ÐеудавшихÑÑ Ð·Ð°Ð´Ð°Ñ‡ нет!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "ПоÑледние 10 удавшихÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ðº" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Выполненных задач пока нет!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +#: mediagoblin/templates/mediagoblin/moderation/user.html:128 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:23 +#, python-format +msgid "User: %(username)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:39 +msgid "Sorry, no such user found." +msgstr "Извините, но такой пользователь не найден." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:43 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Ðужно подтверждение почтового адреÑа" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:45 +msgid "" +"Someone has registered an account with this username, but it still has\n" +" to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:58 +msgid "Return to Users Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:60 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "Профиль Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %(username)s" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:62 +#, python-format +msgid "BANNED until %(expiration_date)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:66 +msgid "Banned Indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:72 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 +msgid "This user hasn't filled in their profile (yet)." +msgstr "Ðтот пользователь не заполнил Ñвой профайл (пока)." + +#: mediagoblin/templates/mediagoblin/moderation/user.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 +msgid "Edit profile" +msgstr "Редактировать профиль" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:90 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 +msgid "Browse collections" +msgstr "Смотреть коллекции" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:97 +#, python-format +msgid "Active Reports on %(username)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:104 +msgid "Report ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:105 +msgid "Reported Content" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:106 +msgid "Description of Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:114 +#, python-format +msgid "Report #%(report_number)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:121 +msgid "Reported Comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:123 +msgid "Reported Media Entry" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:134 +#, python-format +msgid "No active reports filed on %(username)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:141 +#, python-format +msgid "All reports on %(username)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:146 +#, python-format +msgid "All reports that %(username)s has filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:160 +msgid "Ban User" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:165 +msgid "UnBan User" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:173 +msgid "Privilege" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:174 +msgid "User Has Privilege" +msgstr "ЕÑÑ‚ÑŒ у пользователÑ" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:181 +msgid "Yes" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user.html:183 +msgid "No" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Добавление коллекции" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Добавление ваших файлов" @@ -1232,7 +1618,7 @@ msgstr "Добавить Ñтот комментарий" msgid "Comment Preview" msgstr "Предварительный проÑмотр комментариÑ" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Добавлен" @@ -1259,85 +1645,82 @@ msgstr "Ð’Ñ‹ можете Ñледить за ÑтатуÑом обработкРmsgid "Your last 10 successful uploads" msgstr "Ваши поÑледние 10 удавшихÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¾Ðº" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format -msgid "%(username)s's profile" -msgstr "Профиль Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %(username)s" +msgid "" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Извините, но такой пользователь не найден." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Ðужно подтверждение почтового адреÑа" +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 +msgid "Here's a spot to tell others about yourself." +msgstr "ЗдеÑÑŒ вы можете раÑÑказать о Ñебе." + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 +#, python-format +msgid "View all of %(username)s's media" +msgstr "Смотреть вÑе файлы %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +msgid "" +"This is where your media will appear, but you don't seem to have added " +"anything yet." +msgstr "Ваши файлы поÑвÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ, когда вы их добавите." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 +msgid "There doesn't seem to be any media here yet..." +msgstr "Пока что тут файлов нет…" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 msgid "Almost done! Your account still needs to be activated." msgstr "Почти закончили! Теперь надо активировать ваш аккаунт." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 msgid "" "An email should arrive in a few moments with instructions on how to do so." msgstr "Через пару мгновений на Ð°Ð´Ñ€ÐµÑ Ð²Ð°ÑˆÐµÐ¹ Ñлектронной почты должно прийти Ñообщение Ñ Ð´Ð°Ð»ÑŒÐ½ÐµÐ¹ÑˆÐ¸Ð¼Ð¸ инÑтрукциÑми." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 msgid "In case it doesn't:" msgstr "РеÑли нет, то:" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 msgid "Resend verification email" msgstr "Повторно отправить Ñообщение Ð´Ð»Ñ Ð¿Ð¾Ð´Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð°Ð´Ñ€ÐµÑа Ñлектронной почты" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 msgid "" "Someone has registered an account with this username, but it still has to be" " activated." msgstr "Ктоâ€Ñ‚о Ñоздал аккаунт Ñ Ñтим именем, но его еще надо активировать." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 #, python-format 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:96 -msgid "Here's a spot to tell others about yourself." -msgstr "ЗдеÑÑŒ вы можете раÑÑказать о Ñебе." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 -msgid "Edit profile" -msgstr "Редактировать профиль" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 -msgid "This user hasn't filled in their profile (yet)." -msgstr "Ðтот пользователь не заполнил Ñвой профайл (пока)." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 -msgid "Browse collections" -msgstr "Смотреть коллекции" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 -#, python-format -msgid "View all of %(username)s's media" -msgstr "Смотреть вÑе файлы %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 -msgid "" -"This is where your media will appear, but you don't seem to have added " -"anything yet." -msgstr "Ваши файлы поÑвÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ, когда вы их добавите." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 -msgid "There doesn't seem to be any media here yet..." -msgstr "Пока что тут файлов нет…" - #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(иÑключить)" @@ -1386,6 +1769,10 @@ msgstr "более новые" msgid "older" msgstr "более Ñтарые" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Метки" @@ -1394,39 +1781,39 @@ msgstr "Метки" msgid "Could not read the image file." msgstr "Ðе удалоÑÑŒ прочитать файл Ñ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÐ¼." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Ой!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Произошла ошибка" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "Ðеверный запроÑ" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ позволÑетÑÑ" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "" +msgstr "Похоже, по Ñтому адреÑу нет Ñтраницы. Сожалеем!</p><p>Возможно, Ñтраница, которую вы ищете, была удалена или переехала." #: mediagoblin/tools/timesince.py:62 msgid "year" @@ -1489,15 +1876,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Сожалеем: возможноÑÑ‚ÑŒ ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуÑÑ‚." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" @@ -1519,43 +1910,43 @@ msgstr "«%s» — уже в коллекции «%s»" msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» добавлено в коллекцию «%s»" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Ð’Ñ‹ удалили файл." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Файл не удалён, так как вы не подтвердили Ñвою уверенноÑÑ‚ÑŒ галочкой." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Ð’Ñ‹ на пороге ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° другого пользователÑ. Будьте оÑторожны." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Ð’Ñ‹ иÑключили файл из коллекции." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Файл не иÑключён из коллекции, так как вы не подтвердили Ñвоё намерение отметкой." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Ð’Ñ‹ на пороге иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° из коллекции другого пользователÑ. Будьте оÑторожны." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Ð’Ñ‹ удалили коллекцию «%s»" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "ÐšÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ñ Ð½Ðµ удалена, так как вы не подтвердили Ñвоё намерение отметкой." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Ð’Ñ‹ на пороге ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð»ÐµÐºÑ†Ð¸Ð¸ другого пользователÑ. Будьте оÑторожны." diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo Binary files differindex de023128..cf5070f0 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index fb5088c8..b401851f 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/mediagoblin/language/sk/)\n" "MIME-Version: 1.0\n" @@ -24,43 +24,43 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "PrepáÄ, registrácia na danej inÅ¡tancii nie je povolená." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "PoužÃvateľské meno alebo e-mailová adresa" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "PrepáÄ, autentifikácia je vypnutá pre túto inÅ¡tanciu." -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Nesprávne použÃvateľské meno alebo e-mailová adresa." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Toto pole neakceptuje e-mailové adresy." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Toto pole vyžaduje e-mailovú adresu." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "PrepáÄ, rovnaké použÃvateľské meno už existuje." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "PrepáÄ, rovnaká e-mailová adresa už bola použitá na vytvorenie úÄtu." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "VerifikaÄný kÄ¾ÃºÄ alebo použÃvateľské ID nie je správne." #: mediagoblin/auth/views.py:161 msgid "" @@ -84,77 +84,37 @@ msgstr "Už máš overenú e-mailovú adresu!" msgid "Resent your verification email." msgstr "Opätovne zaslaÅ¥ overovacà e-mail." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Pokiaľ daná e-mailová adresa (citlivá na veľkosÅ¥ pÃsma!) je registrovaná, e-mail z inÅ¡trukciami pre zmenu tvojho hesla bol zaslaný." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "Nemožno nájsÅ¥ nikoho z daným použÃvateľským menom." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "E-mailová správa z inÅ¡trukciami na zmenu tvojho hesla bola zaslaná." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Nebolo možné zaslaÅ¥ e-mail na opätovné zÃskanie zabudnutého hesla, nakoľko tvoje použÃvateľské meno je neaktÃvne, prÃpadne e-mailová adresa nebola úspeÅ¡ne overená." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Už môžeÅ¡ použiÅ¥ nové heslo pri prihlasovanÃ." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titulok" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Popis výtvoru" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "MôžeÅ¡ využiÅ¥\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> pre formátovanie prÃspevku." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Å tÃtky" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Oddeľ Å¡tÃtky pomocou Äiarky." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Unikátna ÄasÅ¥ adresy" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Unikátna ÄasÅ¥ adresy nesmie byÅ¥ prázdna" @@ -164,7 +124,7 @@ msgid "" "this." msgstr "Titulná ÄasÅ¥ adresy daného média. Zmena poľa nepovinná." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencia" @@ -187,7 +147,7 @@ msgstr "ZaÅ¡li mi e-mail keÄ ostatnà okomentujú môj výtvor" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "PovoliÅ¥ notifikácie ohľadom udalostà na stránke." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -197,47 +157,48 @@ msgstr "Preferencia licencie" msgid "This will be your default license on upload forms." msgstr "Nasledovná licencia bude použitá ako východzia pre vÅ¡etky tvoje výtvory." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Titulok nesmie byÅ¥ prázdny." -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Popis danej kolekcie" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titulná ÄasÅ¥ adresy danej kolekcie. Zmena poľa nepovinná." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Staré heslo" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Vlož svoje staré heslo na dôkaz toho, že vlastnÃÅ¡ daný úÄet." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Nové heslo" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" -msgstr "" +msgstr "Nová e-mailová adresa" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Heslo" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Vlož svoje heslo pre overenie pravosti úÄtu." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -272,7 +233,7 @@ msgstr "Nastavenia úÄtu uložené" msgid "You need to confirm the deletion of your account." msgstr "PotrebujeÅ¡ potvrdiÅ¥ odstránenie svojho úÄtu." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -286,18 +247,14 @@ msgstr "Kolekcia s týmto Å¡tÃtkom už máš." msgid "You are editing another user's collection. Proceed with caution." msgstr "UpravujeÅ¡ kolekciu iného použÃvateľa. Pristupuj zodpovedne. " -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "Tvoja e-mailová adresa bola verifikovaná." + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "Nesprávne heslo" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Tvoje heslo bolo úspeÅ¡ne zmenené" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Nemožno pripojiÅ¥ tému... téma nenastavená\n" @@ -345,36 +302,88 @@ msgstr "beh unoconv zlyhal, preskúmajte log záznam" msgid "Video transcoding failed" msgstr "Konvertovanie videa zlyhalo" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "okmentoval tvoj prÃspevok" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "ÚspeÅ¡ný zápis odberu komentárov pre %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "NebudeÅ¡ dostávaÅ¥ notifikácie ohľadom komentárov pre %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "NutnosÅ¥ poskytnúť OAuth token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." +msgstr "Požadovaný token nenájdený." + +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "PoužÃvateľské meno" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -386,8 +395,96 @@ msgstr "Použivateľské meno alebo e-mail" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" +msgstr "ZostaÅ¥ prihlásený" + +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "PoužÃvateľské meno alebo e-mailová adresa" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Pokiaľ daná e-mailová adresa (citlivá na veľkosÅ¥ pÃsma!) je registrovaná, e-mail z inÅ¡trukciami pre zmenu tvojho hesla bol zaslaný." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "Nemožno nájsÅ¥ nikoho z daným použÃvateľským menom." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "E-mailová správa z inÅ¡trukciami na zmenu tvojho hesla bola zaslaná." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Nebolo možné zaslaÅ¥ e-mail na opätovné zÃskanie zabudnutého hesla, nakoľko tvoje použÃvateľské meno je neaktÃvne, prÃpadne e-mailová adresa nebola úspeÅ¡ne overená." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "PoužÃvateľské ID nie je správne." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Už môžeÅ¡ použiÅ¥ nové heslo pri prihlasovanÃ." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Tvoje heslo bolo úspeÅ¡ne zmenené" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Nastav svoje nové heslo" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Nastav heslo" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "MenÃm heslo použÃvateľa %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "UložiÅ¥" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "EÅ¡te stále nemáš úÄet?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Vytvor si jeden tu!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." msgstr "" +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "ObnoviÅ¥ heslo" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "ZaslaÅ¥ inÅ¡trukcie" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Zabudnuté heslo?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Poloha" @@ -397,6 +494,10 @@ msgstr "Poloha" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "ZobraziÅ¥ na <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "PovoliÅ¥" @@ -466,7 +567,7 @@ msgstr "Tvoji autorizovanà OAuth klienti" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "PridaÅ¥" @@ -475,60 +576,60 @@ msgstr "PridaÅ¥" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "PrepáÄ, úÄet pre dané OpenID už existuje." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "PrepáÄ, OpenID server nebol nájdený" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Nenájdená žiadna OpenID služba pre %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Verifikácia %s zlyhala: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Verifikácia zruÅ¡ená" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "URL k tvojmu OpenID úpeÅ¡ne zaznamenaný." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "NesmieÅ¡ odstániÅ¥ svoj jediný OpenID URL, pokým nemáš nastavené heslo" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "OpenID nie je registrované k tomuto úÄtu." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID úspeÅ¡ne odstránené." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "PridaÅ¥ OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "OdstrániÅ¥ OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -539,15 +640,15 @@ msgstr "OdstrániÅ¥" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "PrihlásiÅ¥ sa" @@ -558,274 +659,234 @@ msgstr "Prihlásenie zlyhalo!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Prihlás sa pre vytvorenie úÄtu!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Alebo sa prihlás z heslom!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Alebo sa prihlás z OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Alebo sa registruj z OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "PrepáÄ, úÄet na daný Persona e-mail už existuje." #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "E-mailová adresa Persona úspeÅ¡ne odstránená." #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "NesmieÅ¡ odstrániÅ¥ svoj jediný Persona e-mail, pokým nie je nastavené heslo." #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Persona e-mail nie je registrovaný k tomuto úÄtu." #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "PrepáÄ, úÄet z danou Persona e-mailovou adresou už existuje." #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Tvoj Persona e-mail úspeÅ¡ne uložený." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "OdstrániÅ¥ Persona e-mail" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "PridaÅ¥ Persona e-mail" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "Alebo sa prihlás z Persona!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "Alebo sa registruj z Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Nesprávny typ súboru pre dané médium." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." -msgstr "" +msgstr "KopÃrovanie na verejný úložný priestor zlyhalo." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" +msgstr "Prijateľný spracúvavaný súbor nenájdený" + +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Súbor" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "MusÃÅ¡ poskytnúť súbor." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Skvelé! Pridané!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekcia \"%s\" pridaná!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Obrázok hysterického goblina" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Over si e-mailovú adresu!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "odhlásiÅ¥ sa" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "ÚÄet použÃvateľa <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "ZmeniÅ¥ nastavenia úÄtu" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Sekcia spracovania výtvorov" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "OdhlásiÅ¥ sa" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "PridaÅ¥ výtvor" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "VytvoriÅ¥ novú kolekciu" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Obrázok hysterického goblina" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Aktuálne výtvory" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Tu môžeÅ¡ sledovaÅ¥ stav médià spracovávaných na danej inÅ¡tancii." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Výtvory sa spracúvajú" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Žiadne výtvory v procese spracovania" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Nasledovné nahratia nepreÅ¡li spracovanÃm:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Žiadne zlyhané položky!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "Posledných 10 úspeÅ¡ných nahratÃ" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Zatiaľ žiadne spracované položky!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Autorizácia" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "AutorizovaÅ¥" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Si prihlásený/á ako" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "ChceÅ¡ sa autorizovaÅ¥" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "v neznámej aplikácii" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "pre prÃstup k svojmu úÄtu?" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Aplikácie z prÃstupom k tvojmu úÄtu môžu:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "ZaslaÅ¥ nové výtvory ako ty" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "PrezrieÅ¥ vlastné info (napr. profil, výtvory atÄ.)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "ZmeniÅ¥ tvoje údaje" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Autorizácia dokonÄená" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Autorizácia kompletná" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Nastav svoje nové heslo" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Nastav heslo" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "ObnoviÅ¥ heslo" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "ZaslaÅ¥ inÅ¡trukcie" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Ahoj %(username)s,\n\npre zmenu svojho hesla k GNU MediaGoblin úÄtu, otvor nasledujúci odkaz vo svojom prehliadaÄi:\n\n%(verification_url)s\n\nPokiaľ si myslÃÅ¡, že doÅ¡lo k omylu, tak jednoducho ignoruj túto správu a buÄ Å¡Å¥astným goblinom!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "EÅ¡te stále nemáš úÄet?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Vytvor si jeden tu!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Zabudnuté heslo?" +msgstr "Toto kopÃruj a vlož do svojho klienta:" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -862,6 +923,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Uvoľnené pod <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Zdrojový kód</a> plne dostupný." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "PreskúmaÅ¥" @@ -891,13 +956,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n >VytvoriÅ¥ úÄet na tejto stránke</a>\n alebo" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">ZaložiÅ¥ MediaGoblin na vlastnom serveri</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -911,13 +976,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Úprava prÃloh pre %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "PrÃlohy" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "PridaÅ¥ prÃlohu" @@ -934,7 +999,7 @@ msgstr "ZruÅ¡iÅ¥" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -944,18 +1009,7 @@ msgstr "UložiÅ¥ zmeny" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "UložiÅ¥" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "MenÃm heslo použÃvateľa %(username)s" +msgstr "Zmena e-mailu použÃvateľa %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format @@ -984,13 +1038,13 @@ msgstr "Úprava %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "MenÃm nastavenia úÄtu použÃvateľa %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "OdstrániÅ¥ môj úÄet" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "E-mail" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1015,23 +1069,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Ahoj,\n\nChceli sme sa uisiÅ¥, že práve ty si %(username)s. Pokiaľ je tak, nasleduj\nprosÃm odkaz nižšie pre verifikáciu svojej novej e-mailovej adresy.\n\n%(verification_url)s\n\nPokiaľ nie si %(username)s alebo nebola zmena e-mailu žiadaná tebou,\npokojne túto správu ignoruj." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Nové komentáre" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "pred %(formatted_time)s " #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "OznaÄiÅ¥ ako preÄÃtané" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1044,7 +1101,7 @@ msgstr "Výtvory oznaÄené ako: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "StiahnuÅ¥" @@ -1068,7 +1125,7 @@ msgstr "MôžeÅ¡ zÃskaÅ¥ moderný prehliadaÄ, ktorý\n\ttento zvuk hravo prehr #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Originálny súbor" @@ -1127,30 +1184,231 @@ msgstr "Súborový formát" msgid "Object Height" msgstr "Výška objektu" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "PrepáÄ, tento video súbor nepôjde prehraÅ¥, \n\tnakoľko tvoj prehliadaÄ nepodporuje HTML5 \n\tvideo." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "MôžeÅ¡ zÃskaÅ¥ moderný prehliadaÄ, ktorý\n\ttento video súbor hravo prehrá na <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" +msgstr "WebM súbor (VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Tu môžeÅ¡ sledovaÅ¥ stav médià spracovávaných na danej inÅ¡tancii." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Výtvory sa spracúvajú" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Žiadne výtvory v procese spracovania" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Nasledovné nahratia nepreÅ¡li spracovanÃm:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Žiadne zlyhané položky!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "Posledných 10 úspeÅ¡ných nahratÃ" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Zatiaľ žiadne spracované položky!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "PridaÅ¥ kolekciu" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Pridaj svoj výtvor" @@ -1233,9 +1491,9 @@ msgstr "PridaÅ¥ tento komentár" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Náhľad komentára" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Pridané" @@ -1262,85 +1520,107 @@ msgstr "Tu môžeÅ¡ sledovaÅ¥ priebeh spracovania výtvorov pre svoju galériu." msgid "Your last 10 successful uploads" msgstr "Tvojich 10 posledných úspeÅ¡ných nahratÃ" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profil, ktorý vlastnà %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "PrepáÄ, daný použÃvateľ nenájdený." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Nutné overenie e-mailovej adresy" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Takmer hotovo! EÅ¡te je potrebné aktivovaÅ¥ tvoj úÄet." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "E-mail z inÅ¡trukciami ako na to by ti mal doraziÅ¥ každú chvÃľu." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "V prÃpade, že nie:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Opätovne zaslaÅ¥ overovacà e-mail." +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "ÚÄet s týmto použÃvateľským menom je už registrovaný, avÅ¡ak eÅ¡te stále neaktÃvny." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Pokiaľ si to ty, ale už nemáš uloženú kópiu overovacej správy, tak sa môžeÅ¡ <a href=\"%(login_url)s\">prihlásiÅ¥</a> a preposlaÅ¥ si ju." +msgid "%(username)s's profile" +msgstr "Profil, ktorý vlastnà %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Na tomto mieste môžeÅ¡ povedaÅ¥ o sebe ostatným." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "UpraviÅ¥ profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "DotyÄný použÃvateľ (zatiaľ) nevyplnil svoj profil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "PrehliadaÅ¥ kolekcie" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "ZobraziÅ¥ vÅ¡etky výtvory, ktoré vlastnà %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "VÅ¡etky tvoje výtvory sa objavia práve tu, zatiaľ vÅ¡ak nemáš niÄ pridané." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Pravdepodobne sa tu nenachádzajú žiadne výtvory..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Nutné overenie e-mailovej adresy" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Takmer hotovo! EÅ¡te je potrebné aktivovaÅ¥ tvoj úÄet." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "E-mail z inÅ¡trukciami ako na to by ti mal doraziÅ¥ každú chvÃľu." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "V prÃpade, že nie:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Opätovne zaslaÅ¥ overovacà e-mail." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "ÚÄet s týmto použÃvateľským menom je už registrovaný, avÅ¡ak eÅ¡te stále neaktÃvny." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Pokiaľ si to ty, ale už nemáš uloženú kópiu overovacej správy, tak sa môžeÅ¡ <a href=\"%(login_url)s\">prihlásiÅ¥</a> a preposlaÅ¥ si ju." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(odstrániÅ¥)" @@ -1389,6 +1669,10 @@ msgstr "novÅ¡ie" msgid "older" msgstr "starÅ¡ie" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "OznaÄené ako" @@ -1397,34 +1681,34 @@ msgstr "OznaÄené ako" msgid "Could not read the image file." msgstr "Nemožno preÄÃtaÅ¥ súbor obrázka." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Hopla!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Vyskytla sa chyba" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "Zlá požiadavka" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "Požiadavka zaslaná na server nie správna, prosÃm opätovne ju skontroluj" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Nepovolená operácia" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "PrepÃ¡Ä ÄŒloveÄe, toto nesmieÅ¡!</p><p>Práve si chcel vykonaÅ¥ funkciu, na ktorú nemáš oprávnenie. Opäť si sa pokúšal odstrániÅ¥ vÅ¡etky použÃvateľské úÄty?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1463,7 +1747,7 @@ msgstr "Komentár" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "SmieÅ¡ použÃvaÅ¥ <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Makrdown</a> pre formátovanie textu." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1490,17 +1774,21 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." +msgstr "SmieÅ¡ použiÅ¥\n<a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a> pre formátovanie textu." + +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "PrepáÄ, komentovanie je vypnuté." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Hopla, tvoj komentár bol prázdny." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol pridaný!" @@ -1522,43 +1810,43 @@ msgstr "\"%s\" sa už nachádza v kolekcii \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s pridané do kolekcie \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Chystáš sa odstrániÅ¥ výtvory niekoho iného. Pristupuj zodpovedne. " -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "Položka bola z kolekcie odstránená." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Položka nebola odstránená, nakoľko polÃÄko potvrdenia nebolo oznaÄné." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Chystáš sa odstrániÅ¥ položku z kolekcie iného použÃvateľa. Pristupuj zodpovedne. " -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Kolekcia \"%s\" bola úspeÅ¡ne odstránená." -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Kolekcia nebola odstránená, nakoľko polÃÄko potrvdenia nebolo oznaÄené." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Chystáš sa odstrániÅ¥ kolekciu iného použÃvateľa. Pristupuj zodpovedne. " diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo Binary files differindex 113553fb..41edf626 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 1ad70dc0..6c40d958 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ 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/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Oprostite, prijava za ta izvod ni omogoÄena." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Oprostite, uporabnik s tem imenom že obstaja." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "" msgid "Resent your verification email." msgstr "Ponovno poÅ¡iljanje potrditvene e-poÅ¡te." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Naslov" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Oznake" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Oznaka" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Oznaka ne sme biti prazna" @@ -159,7 +119,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Geslo" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,16 +242,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "UporabniÅ¡ko ime" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Å e nimate raÄuna?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Ustvarite si ga." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -392,6 +489,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Prijava" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,115 +715,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napaÄna datoteka." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Datoteka" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Podati morate datoteko." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Juhej! Poslano." -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Podokno obdelovanja vsebine" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Dodaj vsebino" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Vsebina v obdelavi" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "V obdelavi ni nobene vsebine" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Teh vsebin ni bilo moÄ obdelati:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Å e nimate raÄuna?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Ustvarite si ga." - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -929,7 +994,7 @@ msgstr "PrekliÄi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "Shrani spremembe" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "Urejanje %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1018,8 +1072,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1039,7 +1096,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1063,7 +1120,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1122,30 +1179,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Vsebina v obdelavi" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "V obdelavi ni nobene vsebine" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Teh vsebin ni bilo moÄ obdelati:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1230,7 +1488,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1257,85 +1515,107 @@ msgstr "Tu lahko spremljate stanje vsebin, ki so v obdelavi za vaÅ¡o galerijo." msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profil – %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Oprostite, tega uporabnika ni bilo moÄ najti." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Potrebna je potrditev prek e-poÅ¡te" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Skoraj ste zakljuÄili. Svoj raÄun morate le Å¡e aktivirati." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "V kratkem bi morali prejeti e-poÅ¡to z navodili, kako to storiti." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "ÄŒe je ne prejmete:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Ponovno poÅ¡lji potrditveno e-poÅ¡to" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Nekdo je s tem uporabniÅ¡kim imenom že registriral raÄun, vendar mora biti Å¡e aktiviran." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "ÄŒe ste ta oseba vi, a ste izgubili potrditveno e-poÅ¡to, se lahko <a href=\"%(login_url)s\">prijavite</a> in jo ponovno poÅ¡ljete." +msgid "%(username)s's profile" +msgstr "Profil – %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Na tem mestu lahko drugim poveste nekaj o sebi." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Uredi profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Ta uporabnik Å¡e ni izpolnil svojega profila." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Prikaži vso vsebino uporabnika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Tu bo prikazana vaÅ¡a vsebina, a trenutno Å¡e niste dodali niÄ." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Videti je, da tu Å¡e ni nobene vsebine ..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Potrebna je potrditev prek e-poÅ¡te" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Skoraj ste zakljuÄili. Svoj raÄun morate le Å¡e aktivirati." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "V kratkem bi morali prejeti e-poÅ¡to z navodili, kako to storiti." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "ÄŒe je ne prejmete:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Ponovno poÅ¡lji potrditveno e-poÅ¡to" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Nekdo je s tem uporabniÅ¡kim imenom že registriral raÄun, vendar mora biti Å¡e aktiviran." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "ÄŒe ste ta oseba vi, a ste izgubili potrditveno e-poÅ¡to, se lahko <a href=\"%(login_url)s\">prijavite</a> in jo ponovno poÅ¡ljete." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1384,6 +1664,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1392,34 +1676,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Opa!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1517,43 +1805,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo Binary files differindex d7fc5203..7d76c92c 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index f20af6cf..10fc1cb3 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -20,43 +20,43 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." -msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar." +msgstr "Na ndjeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "Na ndjeni, në këtë instancë raportimi është i çaktivizuar" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "Na ndjeni, mirëfilltësimi është i çaktivizuar për këtë instancë." -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Emër përdoruesi ose email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "Emër përdoruesi ose adresë email e pavlefshme." -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "Kjo fushë nuk është për adresa email." -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "Kjo fushë lyp një adresë email." -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Na ndjeni, ka tashmë një përdorues me këtë adresë email." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "Kyçi i verifikimit ose id-ja e përdoruesit është e pasaktë." #: mediagoblin/auth/views.py:161 msgid "" @@ -80,77 +80,37 @@ msgstr "Thuajse e keni verifikuar adresën tuaj email!" msgid "Resent your verification email." msgstr "Ridërgoni email-in tuaj të verifikimit." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "Nëse ajo adresë email (siç është shkruajtur!) është e regjistruar, është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj." - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "S'u gjet dot dikush me atë emër përdoruesi." - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Email-i i ricaktimit të fjalëkalimit nuk u dërgua dot, ngaqë emri juaj i përdoruesit nuk është aktivizuar ose adresa email e llogarisë suaj nuk është verifikuar." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Tani mun të hyni duke përdorur fjalëkalimin tuaj të ri." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titull" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Përshkrim i kësaj pune" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "Mund të përdorni\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a> për formatim." -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiketa" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Ndajini etiketat me presje." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Identifikues" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Identifikuesi s'mund të jetë i zbrazët" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "Titulli i adresës së kësaj medie. Zakonisht nuk keni nevojë ta ndryshoni këtë." -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Leje" @@ -183,7 +143,7 @@ msgstr "Dërgomë email kur të tjerët komentojnë te media ime" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "Aktivizoni njoftime të brendshme për veprimtari." #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -193,47 +153,48 @@ msgstr "Parapëlqime licence" msgid "This will be your default license on upload forms." msgstr "Kjo do të jetë licenca juaj parazgjedhje për forma ngarkimesh." -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "Titulli s'mund të jetë i zbrazët" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Përshkrim i këtij koleksioni" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Pjesa titull e adresës së këtij koleksioni. Zakonisht nuk keni pse e ndryshoni këtë." -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Fjalëkalimi i vjetër" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari e zotëroni ju." -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Fjalëkalimi i ri" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" -msgstr "" +msgstr "Adresë email e re" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Fjalëkalim" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "Jepni fjalëkalimin tuaj që të provohet se jeni i zoti i kësaj llogarie." #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." @@ -268,7 +229,7 @@ msgstr "Rregullimet e llogarisë u ruajtën" msgid "You need to confirm the deletion of your account." msgstr "Lypset të ripohoni fshirjen e llogarisë suaj." -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues." msgid "You are editing another user's collection. Proceed with caution." msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë." -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "Adresa juaj email u verifikua." + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "Fjalëkalim i gabuar" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Nuk krijohet dot lidhje për te tema... nuk ka temë të caktuar\n" @@ -309,17 +266,17 @@ msgstr "Sidoqoftë, u gjet simlidhje e vjetër drejtorie lidhjesh; u hoq.\n" #: mediagoblin/gmg_commands/assetlink.py:112 #, python-format msgid "Could not link \"%s\": %s exists and is not a symlink\n" -msgstr "" +msgstr "Nuk krijoi dot lidhje për te \"%s\": %s ekziston dhe nuk është një simlidhje\n" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format msgid "Skipping \"%s\"; already set up.\n" -msgstr "" +msgstr "Po anashkalohet \"%s\"; e rregulluar tashmë.\n" #: mediagoblin/gmg_commands/assetlink.py:124 #, python-format msgid "Old link found for \"%s\"; removing.\n" -msgstr "" +msgstr "U gjet lidhje e vjetër për \"%s\"; po hiqet.\n" #: mediagoblin/meddleware/csrf.py:134 msgid "" @@ -335,42 +292,94 @@ msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :(" #: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" -msgstr "" +msgstr "unoconv nuk po arrin të xhirohet, kontrolloni kartelën e regjistrimeve" #: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Ndërkodimi i videos dështoi" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "Hiqini privilegjet" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "Dëbojeni përdoruesin" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "Dërgojini përdoruesit një mesazh" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "Fshije lëndën" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "Përdoruesi do të dëbohet deri më:" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "Pse po e dëboni këtë Përdorues?" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "Çfarë veprimesh do të ndërmerrni që të zgjidhni këtë raportim?" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "Cilat privilegje do të hiqni?" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "Sinjalizim prej" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "komentoi te postimi juaj" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "U pajtua te komentet në %s!" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "Nuk do të merrni njoftime për komente te %s." #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "Duhet dhënë një oauth_token." #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." -msgstr "" +msgstr "S'u gjet token kërkese." + +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "Na ndjeni, madhësia e kartelës është shumë e madhe." + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "Na ndjeni, ngarkimi i kësaj kartele do t'ju kalonte tej kufirit tuaj për ngarkime." + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "Na ndjeni, keni arritur kufirin tuaj për ngarkimet." #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Emër përdoruesi" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -378,11 +387,99 @@ msgstr "Adresë email" #: mediagoblin/plugins/basic_auth/forms.py:39 msgid "Username or Email" -msgstr "" +msgstr "Emër përdoruesi ose Email" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "Rri i futur" + +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Emër përdoruesi ose email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Nëse ajo adresë email (siç është shkruajtur!) është e regjistruar, është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj." + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "S'u gjet dot dikush me atë emër përdoruesi." + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Është dërguar një email me udhëzime se si të ndryshoni fjalëkalimin tuaj." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Email-i i ricaktimit të fjalëkalimit nuk u dërgua dot, ngaqë emri juaj i përdoruesit nuk është aktivizuar ose adresa email e llogarisë suaj nuk është verifikuar." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "Id-ja e përdoruesit është e pasaktë." + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Tani mun të hyni duke përdorur fjalëkalimin tuaj të ri." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "Nuk jeni më një përdorues aktiv. Ju lutemi, lidhuni me përgjegjësin e sistemit që të aktivizoni llogarinë tuaj." + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Fjalëkalimi juaj u ndryshua me sukses" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "Caktoni fjalëkalimin tuaj të ri" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "Caktoni fjalëkalim" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "Ndryshim i fjalëkalimit për %(username)s" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Ruaje" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Nuk keni ende një llogari?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Krijoni një këtu!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "Ndryshoni fjalëkalimin tuaj." + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Rimerrni fjalëkalimin" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Dërgo udhëzime" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Harruat fjalëkalimin tuaj?" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -393,6 +490,10 @@ msgstr "Vend" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "Shiheni te <a href=\"%(osm_url)s\">OpenStreetMap</a>" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "Për të krijuar një llogari, hyni!" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "Lejoje" @@ -462,7 +563,7 @@ msgstr "Klientët tuaj OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Shtoni" @@ -471,60 +572,60 @@ msgstr "Shtoni" #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "Na ndjeni, ka tashmë një llogari të regjistruar për atë OpenID." #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "Na ndjeni, nuk u gjet dot shërbyesi i OpenID-ve" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "Nuk u gjet shërbim OpenID për %s" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "Verifikimi i %s dështoi: %s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "Verifikimi u anulua" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "Url-ja e OpenID-së suaj u ruajt me sukses." #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "Nuk mundeni të fshini URL-në e të vetmes OpenID tuajës, veç në paçi të caktuar një fjalëkalim" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "Kjo OpenID nuk është e regjistruar për këtë llogari." #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID u hoq me sukses." #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "Shtoni një OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "Fshini një OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Hyni" @@ -554,274 +655,234 @@ msgstr "Hyrja dështoi!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "Hyni, që të krijoni një llogari!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "Ose bëni hyrjen me një fjalëkalim!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "Ose bëni hyrjen me OpenID!" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "Ose regjistrohuni me OpenID!" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "Na ndjeni, ka tashmë një llogari të regjistruar për këtë email Persona-je." #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "Adresa email e Persona-s u hoq me sukses." #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "Nuk mund të fshini adresën tuaj të vetme email Persona-je pa caktuar fjalëkalimin tuaj." #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "Ajo adresë email-i Persona-je nuk është e regjistruar për këtë llogari." #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "Na ndjeni, ka tashmë të regjistruar një llogari me atë adresë email Persona-je." #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "Adresa email e Persona-s suaj u ruajt me sukses." #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "Fshini një adresë email Persona" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "Shtoni një adresë email Persona" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "Ose bëni hyrjen me Persona!" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "Ose regjistrohuni me Persona!" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." -msgstr "" +msgstr "Kopjimi te një depozitim publik dështoi." -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" -msgstr "" +msgstr "Nuk u gjet një kartelë e pranueshme përpunimi" + +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "Madhësi maksimum kartele: {0} mb" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Kartelë" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "Për formatim teksti mund të përdorni\n <a href=\"http://daringfireball.net/projects/markdown/basics\">\n Markdown</a>." + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Duhet të jepni një kartelë." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Yhaaaaaa! U parashtrua!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "U shtua koleksioni \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "Jeni Dëbuar." + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "Figurë e gungaçi duke bërë shtriqje" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "Jeni dëbuar" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "deri më %(until_when)s" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "pafundësisht" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "dilni" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Llogaria e <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Ndryshoni rregullime llogarie" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Paneli i përpunimit të medias" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Dilni" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Shtoni media" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Krijoni koleksion të ri" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "Figurë e gungaçi duke bërë shtriqje" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "Paneli i administrimit të përdoruesve" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "Paneli i administrimit të raporteve" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Mediat më të reja" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "Këtu mund të ndiqni gjendjen e medias që po përpunohet në këtë instancë." - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Media në përpunim" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Pa media në përpunim" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "Nuk arritën të kryheshin këto ngarkime:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "Pa zëra të dështuar!" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "10 ngarkimet e fundit të suksesshme" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "Ende pa zëra të përpunuar!" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "Autorizim" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "Autorizo" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "Keni hyrë si" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "Doni të autorizoni" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "një zbatim të panjohur" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr " të hyjë dhe përdorë llogarinë tuaj? " #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "Zbatimet me hyrje në llogarinë tuaj munden të:" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "Postojnë media të re si ju" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "Të shohin të dhëna tuajat (p.sh profilin, media, etj...)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "Të ndryshojnë të dhënat tuaja personale" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "Autorizimi Përfundoi" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "Autorizim i Plotësuar" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "Caktoni fjalëkalimin tuaj të ri" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "Caktoni fjalëkalim" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Rimerrni fjalëkalimin" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Dërgo udhëzime" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Njatjeta %(username)s,\n\nqë të ndryshoni fjalëkalimin tuaj për GNU MediaGoblin, hapeni URL-në vijuese në \nshfletuesin tuaj web:\n\n%(verification_url)s\n\nNëse mendoni se këtu ka gabim, thjesht shpërfilleni këtë email dhe vazhdoni të jeni\nnjë djallush i lumtur!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Nuk keni ende një llogari?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Krijoni një këtu!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Harruat fjalëkalimin tuaj?" +msgstr "Këtë kopjojeni dhe ngjiteni te klienti juaj:" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "Hedhur në qarkullim sipas <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL-së</a>. <a href=\"%(source_link)s\">Kodi burim</a> është i passhëm." +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "Kushtet e Shërbimit" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Eksploroni" @@ -887,13 +952,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n >Krijoni një llogari te ky site</a>\n ose" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Instaloni dhe përgatisni MediaGoblin-in në shërbyesin tuaj</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "Po përpunohen bashkangjitjet për %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "Bashkangjitje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "Shtoni bashkangjitje" @@ -930,7 +995,7 @@ msgstr "Anuloje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -940,18 +1005,7 @@ msgstr "Ruaji ndryshimet" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" +msgstr "Ndryshim i email-it për %(username)s" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format @@ -980,13 +1034,13 @@ msgstr "Po përpunohet %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Po ndryshohen rregullimet e llogarisë %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Fshije llogarinë time" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "Email" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1011,23 +1065,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "Njatjeta,\n\nDonim të verifikonim që jeni %(username)s. Nëse është kështu, atëherë, \nju lutemi, ndiqni lidhjen më poshtë që të verifikohet adresa juaj email e re.\n\n%(verification_url)s\n\nNëse nuk jeni %(username)s ose nuk kërkuat ndryshim email-i, mund\nta shpërfillni këtë email." #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "Komente të reja" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" -msgstr "" +msgstr "%(formatted_time)s më parë" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "Shënoji të tëra si të lexuara" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1040,7 +1097,7 @@ msgstr "Media e etiketuar me:: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Shkarkojeni" @@ -1064,7 +1121,7 @@ msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Kartela origjinale" @@ -1074,7 +1131,7 @@ msgstr "Kartelë WebM (kodek Vorbis)" #: mediagoblin/templates/mediagoblin/media_displays/image.html:36 msgid "Created" -msgstr "" +msgstr "U krijua" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 @@ -1089,7 +1146,7 @@ msgstr "Figurë për %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "Kartelë PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Perspective" @@ -1123,30 +1180,231 @@ msgstr "Format Kartele" msgid "Object Height" msgstr "Lartësi Objekti" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "Na ndjeni, kjo video nuk do të punojë ngaqë\n shfletuesi juaj web nuk mbulon videot\n HTML5." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "Mund të merrni një shfletues web modern që \n është në gjendje ta shfaqë këtë video, te <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "Kartelë WebM (VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "Këtu mund të ndiqni gjendjen e medias që po përpunohet në këtë instancë." + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Media në përpunim" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Pa media në përpunim" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "Nuk arritën të kryheshin këto ngarkime:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "Pa zëra të dështuar!" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "10 ngarkimet e fundit të suksesshme" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "Ende pa zëra të përpunuar!" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "Na ndjeni, nuk u gjet raport i tillë." + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "Kthehuni te Paneli i Raportimeve" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "Raport" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "Koment i raportuar" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\n â– Media e raportuar nga <a href=\"%(user_url)s\">%(user_name)s</a>\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\n LËNDË NGA\n <a href=\"%(user_url)s\"> %(user_name)s</a>\n ËSHTË FSHIRË\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "Zgjidheni" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "Zgjidheni Këtë Raport" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "Gjendje" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "ZGJIDHUR" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "Nuk mund të ndërmerrni veprim kundër një përgjegjësi" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "Panel raportimesh" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\n Këtu mund të kërkoni nëpër raportet që janë depozituar nga përdoruesit.\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "Raportime Aktive të Depozituar" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "Shkelës" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "Raportuar Më" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "Raportuar Nga" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "Arsye" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\n Raport Komenti #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\n Raportim Media #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "S'u gjetën raportime të hapur." + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "Raportime të Mbyllur" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "Zgjidhur" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "Veprimi i Ndërmarrë" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\n Raportim i Mbyllur #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "S'u gjetën raportime të mbyllur." + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "Panel përdoruesi" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\n Këtu mund të kërkoni për përdorues, me qëllim marrjen e masave ndëshkuese për ta.\n " + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "Përdorues Aktivë" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "ID" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "Ardhur Më" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "# i Komenteve të Postuara" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "S'u gjetën përdorues." #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "Shtoni një koleksion" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "Shtoni media tuajën" @@ -1229,11 +1487,11 @@ msgstr "Shtoje këtë koment" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "Paraparje Komenti" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" -msgstr "" +msgstr "U shtua" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 @@ -1258,85 +1516,107 @@ msgstr "Gjendjen e medias që po përpunohet për galerinë tuaj mund ta ndiqni msgid "Your last 10 successful uploads" msgstr "10 ngarkimet tuaja më të suksesshme" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "Profili i %(username)s" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Na ndjeni, nuk u gjet përdorues i tillë." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "Lypset verifikimi i email-it" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Pothuajse mbaruam! Llogaria juaj ende lyp aktivizimin." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Brenda pak çastesh duhet t'ju mbërrijë një email me udhëzime se si të krhyet kjo." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Në rast se jo:" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>Depozitoni një Raportim</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Ridërgo email-in e verifikimit" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "Po raportohet ky Koment" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "Dikush ka regjistruar një llogari me këtë emër përdoruesi, por ajo duhet aktivizuar." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "Po raportohet ky Zë Media" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format 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 "Nëse jeni ju ai person, por keni humbur email-in tuaj të verifikimit, mund të <a href=\"%(login_url)s\">hyni</a> dhe ta ridërgoni." +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\n â– Botuar nga <a href=\"%(user_url)s\"\n class=\"comment_authorlink\">%(username)s</a>\n " + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "Raportim Kartele" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "Profili i %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Ja një vend t'i tregoni botës mbi veten." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Përpunoni profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Ky përdorues nuk e ka plotësuar (ende) profilin e vet." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "Shfletoni koleksionet" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Shihni krejt mediat nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Media juaj do të shfaqet këtu, por nuk duket të keni shtuar gjë ende." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Nuk duket ende të ketë ndonjë media këtu..." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "Lypset verifikimi i email-it" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Pothuajse mbaruam! Llogaria juaj ende lyp aktivizimin." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Brenda pak çastesh duhet t'ju mbërrijë një email me udhëzime se si të krhyet kjo." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Në rast se jo:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Ridërgo email-in e verifikimit" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "Dikush ka regjistruar një llogari me këtë emër përdoruesi, por ajo duhet aktivizuar." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Nëse jeni ju ai person, por keni humbur email-in tuaj të verifikimit, mund të <a href=\"%(login_url)s\">hyni</a> dhe ta ridërgoni." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(hiqe)" @@ -1385,6 +1665,10 @@ msgstr "më të reja" msgid "older" msgstr "më të vjetra" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "Raportoni media" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "Etiketuar me" @@ -1393,34 +1677,34 @@ msgstr "Etiketuar me" msgid "Could not read the image file." msgstr "Nuk lexoi dot kartelën e figurës." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Oooh!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "Ndodhi një gabim" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "Kërkesë e Gabuar" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "Kërkesa e dërguar te shërbyesi është e mangët, ju lutemi, rikontrollojeni" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "Veprim i palejuar" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Më ndjeni or trim, nuk ju lë dot ta bëni këtë!</p><p>Provuat të kryeni një funksion që nuk lejohet. Keni provuar prapë të fshini krejt llogaritë e përdoruesve?" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1429,27 +1713,27 @@ msgstr "Nuk duket se ka ndonjë faqe në këtë adresë. Na ndjeni!</p><p>Nëse #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "vit" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "muaj" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "javë" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "ditë" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "orë" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minutë" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" @@ -1459,7 +1743,7 @@ msgstr "Koment" msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "Mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> për formatime." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1486,17 +1770,21 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Mund të përdorni\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> për formatime." + +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "Arsye për Raportim" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Na ndjeni, komentimi është i çaktivizuar." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Hmmm, komenti juaj qe i zbrazët." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" @@ -1518,43 +1806,43 @@ msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\"" msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" u shtua te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "E fshitë median." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Media nuk u fshi ngaqë nuk i vutë shenjë pohimit se jeni i sigurt." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Ju ndan një hap nga fshirja e medias të një tjetër përdoruesi. Hapni sytë." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "E fshitë objektin prej koleksionit." -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "Objekti nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë." -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Ju ndan një hap nga fshirja e një objekti prej koleksionit të një përdoruesi tjetër. Hapni sytë." -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%s\"" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Koleksioni nuk u fshi ngaqë, nuk pohuat se jeni të sigurt për këtë." -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Ju ndan një hap nga fshirja e koleksionit të një përdoruesi tjetër. Hapni sytë." diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo Binary files differindex b7cd984e..23613532 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 1cb6b7ae..890c44ed 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,41 +18,41 @@ 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/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -78,77 +78,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -158,7 +118,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -191,45 +151,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -266,7 +227,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -280,16 +241,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -339,7 +296,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -361,14 +354,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -382,6 +391,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -391,6 +488,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -460,7 +561,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -538,10 +639,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -601,8 +702,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -613,115 +714,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -777,50 +882,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -856,6 +917,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -905,13 +970,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -928,7 +993,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -940,17 +1005,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -978,11 +1032,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1017,8 +1071,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1038,7 +1095,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1062,7 +1119,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1121,30 +1178,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1229,7 +1487,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1256,85 +1514,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1383,6 +1663,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1391,34 +1675,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1486,15 +1770,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1516,43 +1804,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo Binary files differindex 3fec1005..99bd7466 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 ac9302be..e89849b6 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,41 +20,41 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Vi beklagar, registreringen är avtängd pÃ¥ den här instansen." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Det finns redan en användare med den e-postadressen." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -80,77 +80,37 @@ msgstr "Du har redan verifierat din e-postadress!" msgid "Resent your verification email." msgstr "Skickade ett nytt verifierings-email." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "Kunde inte skicka e-postÃ¥terställning av lösenord eftersom ditt användarnamn är inaktivt eller kontots e-postadress har inte verifierats." - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "Beskrivning av verket" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Taggar" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "Sökvägsnamn" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "Sökvägsnamnet kan inte vara tomt" @@ -160,7 +120,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -193,45 +153,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Tidigare lösenord" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Lösenord" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -268,7 +229,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -282,18 +243,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Fel lösenord" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Fel lösenord" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "" @@ -341,7 +298,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -363,14 +356,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Användarnamn" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -384,6 +393,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "Kunde inte skicka e-postÃ¥terställning av lösenord eftersom ditt användarnamn är inaktivt eller kontots e-postadress har inte verifierats." + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Har du inget konto än?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Skapa ett här!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "Ã…terställ lösenord" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "Skicka instruktioner" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Glömt ditt lösenord?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -393,6 +490,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -462,7 +563,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -540,10 +641,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "Logga in" @@ -603,8 +704,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -615,117 +716,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Du mÃ¥ste ange en fil" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Tjohoo! Upladdat!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Mediabehandlingspanel" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Lägg till media" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "Senast medier" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "Media under behandling" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "Ingen media under behandling" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "De här behandlingarna misslyckades:" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -779,50 +884,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "Ã…terställ lösenord" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "Skicka instruktioner" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "Hej %(username)s,\n\nför att ändra ditt GNU MediaGoblin-lösenord, öppna följande länk i\ndin webbläsare:\n\n%(verification_url)s\n\nOm du misstänker att du fÃ¥tt detta epostmeddelanade av misstag, ignorera det och fortsätt vara ett glatt troll!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Har du inget konto än?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Skapa ett här!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Glömt ditt lösenord?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -858,6 +919,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "Utforska" @@ -907,13 +972,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -930,7 +995,7 @@ msgstr "Avbryt" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -942,17 +1007,6 @@ msgstr "Spara ändringar" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -980,11 +1034,11 @@ msgstr "Redigerar %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1019,8 +1073,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1040,7 +1097,7 @@ msgstr "Media taggat med: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1064,7 +1121,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1123,30 +1180,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "Media under behandling" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "Ingen media under behandling" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "De här behandlingarna misslyckades:" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1231,7 +1489,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1258,85 +1516,107 @@ msgstr "Här kan du se status för mediabehandling av bilder i ditt galleri." msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)ss profil" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Ledsen, hittar ingen sÃ¥dan användare." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "E-postadressverifiering krävs." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Nästan klar! Ditt konto behöver bara aktiveras." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Ett e-postmeddelande med instruktioner kommer att hamna hos dig inom kort." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "Om det inte skulle göra det:" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "Skicka ett nytt e-postmeddelande" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "NÃ¥gon har redan registrerat ett konto med det här användarnamnet men det har inte aktiverats." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "Om det är du som är den personen och har förlorat ditt e-postmeddelande med detaljer om hur du verifierar ditt konto sÃ¥ kan du <a href=\"%(login_url)s\">logga in</a> och begära ett nytt." +msgid "%(username)s's profile" +msgstr "%(username)ss profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "Här kan du berätta för andra om dig själv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Redigera profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "Den här användaren har inte fyllt i sin profilsida ännu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "Se all media frÃ¥n %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "Här kommer din media att dyka upp, du verkar inte ha lagt till nÃ¥gonting ännu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Det verkar inte finnas nÃ¥gon media här ännu." +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "E-postadressverifiering krävs." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Nästan klar! Ditt konto behöver bara aktiveras." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Ett e-postmeddelande med instruktioner kommer att hamna hos dig inom kort." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "Om det inte skulle göra det:" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "Skicka ett nytt e-postmeddelande" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "NÃ¥gon har redan registrerat ett konto med det här användarnamnet men det har inte aktiverats." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "Om det är du som är den personen och har förlorat ditt e-postmeddelande med detaljer om hur du verifierar ditt konto sÃ¥ kan du <a href=\"%(login_url)s\">logga in</a> och begära ett nytt." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1385,6 +1665,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1393,34 +1677,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Ojoj!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1488,15 +1772,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1518,43 +1806,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Du tänker radera en annan användares media. Var försiktig." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo Binary files differindex 791028e4..7de66f2d 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po index 682d12f9..257f53a7 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "శీరà±à°·à°¿à°•" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -159,7 +119,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "సంకేతపదం" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,16 +242,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "వాడà±à°•à°°à°¿ పేరà±" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "మీకౠఇంకా ఖాతా లేదా?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "మీ సంకేతపదానà±à°¨à°¿ మరà±à°šà°¿à°ªà±‹à°¯à°¾à°°à°¾?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -392,6 +489,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,115 +715,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "మీకౠఇంకా ఖాతా లేదా?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "మీ సంకేతపదానà±à°¨à°¿ మరà±à°šà°¿à°ªà±‹à°¯à°¾à°°à°¾?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -929,7 +994,7 @@ msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "మారà±à°ªà±à°²à°¨à± à°à°¦à±à°°à°ªà°°à°šà±" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1018,8 +1072,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1039,7 +1096,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1063,7 +1120,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1122,30 +1179,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1230,7 +1488,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1257,85 +1515,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1384,6 +1664,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1392,34 +1676,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1517,43 +1805,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo Binary files differindex 589333e7..dbbd07c8 100644 --- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po index 0084cf03..1e480f30 100644 --- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mediagoblin/language/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -19,41 +19,41 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "Ãœzgünüz, bu durumda kayıt devre dışıdır." -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "Kullanıcı adı ya da e-posta" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "Maalesef, bu isimde bir kullanıcı mevcut." -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "Ãœzgünüz, bu e-posta adresine sahip bir kullanıcı zaten var." -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -79,77 +79,37 @@ msgstr "Zaten e-posta adresinizi doÄŸruladınız!" msgid "Resent your verification email." msgstr "DoÄŸrulama e-postasını tekrar yolla." -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "Parolanızı nasıl deÄŸiÅŸtireceÄŸinizle ilgili adımları anlatan bir e-posta gönderildi." - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "Åžimdi yeni parolanızı giriÅŸ için kullanabilirsiniz." - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "BaÅŸlık" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "Etiketler" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "Etikerleri virgül ile ayırın." -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -159,7 +119,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -192,45 +152,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "Eski parola" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "Yeni parola" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "Parola" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -267,7 +228,7 @@ msgstr "Hesap ayarları kaydedildi" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -281,18 +242,14 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "Yanlış parola" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "Parolanız baÅŸarılı bir ÅŸekilde deÄŸiÅŸtirildi" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "Yanlış parola" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "" @@ -340,7 +297,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -362,14 +355,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "Kullanıcı adı" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -383,6 +392,94 @@ msgstr "Kullanıcı adı veya E-posta" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "Kullanıcı adı ya da e-posta" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "Parolanızı nasıl deÄŸiÅŸtireceÄŸinizle ilgili adımları anlatan bir e-posta gönderildi." + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "Åžimdi yeni parolanızı giriÅŸ için kullanabilirsiniz." + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "Parolanız baÅŸarılı bir ÅŸekilde deÄŸiÅŸtirildi" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "Kaydet" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "Hala hesabınız yok mu?" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "Åžimdi oluÅŸturun!" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "Parolanı mı unuttun?" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -392,6 +489,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -461,7 +562,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Ekle" @@ -539,10 +640,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "GiriÅŸ" @@ -602,8 +703,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -614,115 +715,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "Bu medya türü için geçersiz dosya türü." -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "Dosya" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "Bir dosya saÄŸlamanız gerekir." -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "Hoooop! Gönderildi!" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "E-postanızı doÄŸrulayın!" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "çıkış" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "Hesap ayarlarını deÄŸiÅŸtir" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "Medya iÅŸlem paneli" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "Çıkış" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "Medya ekle" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -778,50 +883,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "Hala hesabınız yok mu?" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "Åžimdi oluÅŸturun!" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "Parolanı mı unuttun?" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -857,6 +918,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "KeÅŸfet" @@ -906,13 +971,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -929,7 +994,7 @@ msgstr "Ä°ptal" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -941,17 +1006,6 @@ msgstr "DeÄŸiÅŸiklikleri kaydet" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "Kaydet" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -979,11 +1033,11 @@ msgstr "%(media_title)s düzenleme" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "Hesabımı sil" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1018,8 +1072,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s önce" @@ -1039,7 +1096,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "Ä°ndir" @@ -1063,7 +1120,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "Özgün dosya" @@ -1122,30 +1179,231 @@ msgstr "Dosya Biçimi" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1230,7 +1488,7 @@ msgstr "Bu yorumu ekle" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "Eklendi" @@ -1257,85 +1515,107 @@ msgstr "Burada galerinizdeki iÅŸlenmekte olan medyanın durumunu takip edebilirs msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)s profili" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "Ãœzgünüz, böyle bir kullanıcı bulunamadı." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "E-posta doÄŸrulaması gerekli" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "Neredeyse bitti! Hesabınızı etkinleÅŸtirmeniz gerekiyor." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "Bunun nasıl yapılacağı ile ilgili talimatlar, birkaç dakika içinde size e-posta ulaÅŸacak." - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "DoÄŸrulama e-postası tekrar yolla" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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 "DoÄŸrulama e-postasını kaybettiyseniz, <a href=\"%(login_url)s\">giriÅŸ</a> yapabilir ve yeniden yollayabilirsiniz." +msgid "%(username)s's profile" +msgstr "%(username)s profili" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "Profil düzenle" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "%(username)s tüm medyasını göster" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "E-posta doÄŸrulaması gerekli" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "Neredeyse bitti! Hesabınızı etkinleÅŸtirmeniz gerekiyor." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "Bunun nasıl yapılacağı ile ilgili talimatlar, birkaç dakika içinde size e-posta ulaÅŸacak." + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "DoÄŸrulama e-postası tekrar yolla" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "DoÄŸrulama e-postasını kaybettiyseniz, <a href=\"%(login_url)s\">giriÅŸ</a> yapabilir ve yeniden yollayabilirsiniz." + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(kaldır)" @@ -1384,6 +1664,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1392,34 +1676,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "Amaninnn boo!" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1487,15 +1771,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "Maalesef, yorum devre dışı." -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "Amaninnn boo, yorumunuz boÅŸtu." -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "Yorumunuz gönderildi!" @@ -1517,43 +1805,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "Medyayı sildiniz." -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Medya silinmedi çünkü emin olduÄŸunuzu onaylamadınız." -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "BaÅŸka bir kullanıcının medyasını silerken dikkatli davranın." -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo Binary files differindex 282a8095..4fd46427 100644 --- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po index bfbdcd64..b0893bca 100644 --- a/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n" "MIME-Version: 1.0\n" @@ -18,41 +18,41 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -78,77 +78,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -158,7 +118,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -191,45 +151,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -266,7 +227,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -280,16 +241,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -339,7 +296,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -361,14 +354,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -382,6 +391,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -391,6 +488,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -460,7 +561,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -538,10 +639,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -601,8 +702,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -613,115 +714,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -777,50 +882,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -856,6 +917,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -905,13 +970,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -928,7 +993,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -940,17 +1005,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -978,11 +1032,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1017,8 +1071,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1038,7 +1095,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1062,7 +1119,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1121,30 +1178,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1229,7 +1487,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1256,85 +1514,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1383,6 +1663,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1391,34 +1675,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1486,15 +1770,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1516,43 +1804,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo Binary files differindex dfd0a5af..df4f0c64 100644 --- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po index 3c94d3f5..fcfc2445 100644 --- a/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mediagoblin/language/vi_VN/)\n" "MIME-Version: 1.0\n" @@ -18,41 +18,41 @@ msgstr "" "Language: vi_VN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -78,77 +78,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -158,7 +118,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -191,45 +151,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -266,7 +227,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -280,16 +241,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -339,7 +296,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -361,14 +354,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -382,6 +391,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -391,6 +488,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -460,7 +561,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -538,10 +639,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -601,8 +702,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -613,115 +714,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -777,50 +882,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -856,6 +917,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -905,13 +970,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -928,7 +993,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -940,17 +1005,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -978,11 +1032,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1017,8 +1071,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1038,7 +1095,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1062,7 +1119,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1121,30 +1178,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1229,7 +1487,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1256,85 +1514,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1383,6 +1663,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1391,34 +1675,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1486,15 +1770,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1516,43 +1804,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo Binary files differindex 7c1bcda8..b76272e5 100644 --- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po index b5122636..812b2c50 100644 --- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mediagoblin/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -23,41 +23,41 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "抱æ‰ï¼Œæœ¬ç«™å·²æš‚åœæ³¨å†Œã€‚" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "用户å或电å邮件" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "æ— æ•ˆç”¨æˆ·å或电å邮件地å€ã€‚" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "æ¤å—段ä¸èƒ½å¡«å†™ç”µå邮件地å€ã€‚" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "æ¤å—段需填写电å邮件地å€ã€‚" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "抱æ‰ï¼Œè¯¥ç”¨æˆ·åå·²å˜åœ¨ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "抱æ‰ï¼Œå·²æœ‰ç”¨æˆ·ç”¨è¯¥ç”µå邮件注册。" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -83,77 +83,37 @@ msgstr "您已ç»è®¤è¯è¿‡ç”µå邮件地å€äº†ï¼" msgid "Resent your verification email." msgstr "é‡å‘认è¯é‚®ä»¶ã€‚" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "若该邮件地å€ï¼ˆåŒºåˆ†å¤§å°å†™ï¼‰å·²è¢«æ³¨å†Œï¼Œåˆ™å¯†ç 修改说明已通过电å邮件é€è¾¾ã€‚" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "找ä¸åˆ°æœ‰è¯¥ç”¨æˆ·å的人。" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "密ç 修改说明已通过电å邮件é€è¾¾ã€‚" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "æ— æ³•å‘é€å¯†ç æ‰¾å›žé‚®ä»¶ï¼Œå› ä¸ºæ‚¨çš„ç”¨æˆ·å未激活或者您账户的电å邮件地å€æœªè®¤è¯ã€‚" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "您现在å¯ä»¥ç”¨æ–°çš„密ç æ¥ç™»å½•äº†ï¼" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "æ ‡é¢˜" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "该作å“çš„æè¿°" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "您å¯ä»¥ç”¨ <a href=\"http://wowubuntu.com/markdown/\">Markdown</a> æ¥æŽ’版。" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "æ ‡ç¾" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "用逗å·åˆ†éš”æ ‡ç¾ã€‚" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "简称" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "简称ä¸èƒ½ä¸ºç©º" @@ -163,7 +123,7 @@ msgid "" "this." msgstr "该媒体网å€çš„æ ‡é¢˜éƒ¨ä»½ã€‚é€šå¸¸ä¸éœ€è¦ä¿®æ”¹ã€‚" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "许å¯è¯" @@ -196,45 +156,46 @@ msgstr "许å¯è¯å好" msgid "This will be your default license on upload forms." msgstr "è¿™å°†æ˜¯æ‚¨ä¸Šä¼ ç•Œé¢çš„默认许å¯è¯ã€‚" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "æ ‡é¢˜ä¸èƒ½æ˜¯ç©ºçš„" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "这个åˆé›†çš„æè¿°" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "æ¤åˆé›†ç½‘å€çš„æ ‡é¢˜éƒ¨ä»½ï¼Œé€šå¸¸ä¸éœ€è¦ä¿®æ”¹ã€‚" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "旧的密ç " -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "输入您的旧密ç æ¥è¯æ˜Žæ‚¨æ‹¥æœ‰è¿™ä¸ªè´¦æˆ·ã€‚" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "新密ç " -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "密ç " -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -271,7 +232,7 @@ msgstr "账户设置已ä¿å˜" msgid "You need to confirm the deletion of your account." msgstr "您需è¦ç¡®è®¤åˆ 除您的账户。" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -285,18 +246,14 @@ msgstr "该用户已ç»æœ‰ä½¿ç”¨è¯¥ç®€ç§°çš„åˆé›†äº†ã€‚" msgid "You are editing another user's collection. Proceed with caution." msgstr "您æ£åœ¨ä¿®æ”¹åˆ«äººçš„åˆé›†ï¼Œè¯·å°å¿ƒæ“作。" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "密ç 错误" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "您的密ç å·²æˆåŠŸä¿®æ”¹" - -#: mediagoblin/edit/views.py:413 +#: mediagoblin/edit/views.py:373 msgid "Your email address has been verified." msgstr "" +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" +msgstr "密ç 错误" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "æ— æ³•é“¾æŽ¥åˆ°ä¸»é¢˜â€¦â€¦æœªè®¾ç½®ä¸»é¢˜\n" @@ -344,7 +301,43 @@ msgstr "æ— æ³•è¿è¡Œ unoconv，请检查日志" msgid "Video transcoding failed" msgstr "视频转ç 失败" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "åœ¨æ‚¨çš„å†…å®¹å¼ è´´è¯„è®º" @@ -366,14 +359,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "用户å" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -387,6 +396,94 @@ msgstr "用户å或电å邮件" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "用户å或电å邮件" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "若该邮件地å€ï¼ˆåŒºåˆ†å¤§å°å†™ï¼‰å·²è¢«æ³¨å†Œï¼Œåˆ™å¯†ç 修改说明已通过电å邮件é€è¾¾ã€‚" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "找ä¸åˆ°æœ‰è¯¥ç”¨æˆ·å的人。" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "密ç 修改说明已通过电å邮件é€è¾¾ã€‚" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "æ— æ³•å‘é€å¯†ç æ‰¾å›žé‚®ä»¶ï¼Œå› ä¸ºæ‚¨çš„ç”¨æˆ·å未激活或者您账户的电å邮件地å€æœªè®¤è¯ã€‚" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "您现在å¯ä»¥ç”¨æ–°çš„密ç æ¥ç™»å½•äº†ï¼" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "您的密ç å·²æˆåŠŸä¿®æ”¹" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "设置您的新密ç " + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "设置新密ç " + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "修改 %(username)s 的密ç " + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "ä¿å˜" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "还没有账户å—？" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "在这里建立一个å§ï¼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "找回密ç " + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "å‘é€æ‰¾å›žå¯†ç 说明" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "忘了密ç å—？" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "ä½ç½®" @@ -396,6 +493,10 @@ msgstr "ä½ç½®" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上观看" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "å…许" @@ -465,7 +566,7 @@ msgstr "您的 OAuth client" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "å¢žåŠ " @@ -543,10 +644,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "登录" @@ -606,8 +707,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -618,117 +719,121 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "æ供文件的媒体类型错误。" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "文件" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "您必须æ供一个文件" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "啊哈ï¼å·²æ交ï¼" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "åˆé›†â€œ%sâ€å·²æ–°å¢žï¼" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "满脸问å·çš„哥布林" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "确认您的电å邮件ï¼" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的账户" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "更改账户设置" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "媒体处ç†é¢æ¿" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "新增媒体" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "新增åˆé›†" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "满脸问å·çš„哥布林" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "最新的媒体" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "æ¤å¤„您å¯ä»¥è¿½è¸ªæœ¬ç«™ç‚¹å¤„ç†åª’体的状æ€ã€‚" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "媒体处ç†ä¸" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "没有æ£åœ¨å¤„ç†ä¸çš„媒体" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "æ— æ³•å¤„ç†è¿™äº›ä¸Šä¼ 内容：" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "没有失败的纪录ï¼" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "最近 10 次æˆåŠŸä¸Šä¼ 的纪录" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "现在还没有处ç†çš„纪录ï¼" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" msgstr "" @@ -782,50 +887,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "设置您的新密ç " - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "设置新密ç " - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "找回密ç " - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "å‘é€æ‰¾å›žå¯†ç 说明" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "%(username)s 您好：\n\nè¦ä¿®æ”¹ GNU MediaGoblin 的密ç ，请在您的æµè§ˆå™¨ä¸æ‰“开下é¢çš„网å€ï¼š\n\n%(verification_url)s\n\n如果您认为这个是个误会，请忽略æ¤å°ä¿¡ä»¶ï¼Œç»§ç»å½“个快ä¹çš„哥布林ï¼" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "还没有账户å—？" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "在这里建立一个å§ï¼" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "忘了密ç å—？" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -861,6 +922,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a> 授æƒå‘布。备有<a href=\"%(source_link)s\">æºä»£ç </a>。" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "探索" @@ -910,13 +975,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "编辑 %(media_title)s 的附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "新增附件" @@ -933,7 +998,7 @@ msgstr "å–消" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -945,17 +1010,6 @@ msgstr "ä¿å˜æ›´æ”¹" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "ä¿å˜" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "修改 %(username)s 的密ç " - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -983,11 +1037,11 @@ msgstr "编辑 %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "æ£åœ¨æ”¹å˜ %(username)s 的账户设置" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "åˆ é™¤æˆ‘çš„å¸æˆ·" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1022,8 +1076,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)så‰" @@ -1043,7 +1100,7 @@ msgstr "æ¤åª’ä½“è¢«æ ‡è®°ä¸ºï¼š%(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "下载" @@ -1067,7 +1124,7 @@ msgstr "您å¯ä»¥åœ¨ <a href=\"http://getfirefox.com\">http://getfirefox.com</a> #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "æºæ–‡ä»¶" @@ -1126,30 +1183,231 @@ msgstr "æ–‡ä»¶æ ¼å¼" msgid "Object Height" msgstr "物体高度" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "抱æ‰ï¼Œæ¤è§†é¢‘æ— æ³•æ’æ”¾ï¼Œå› ä¸ºæ‚¨çš„æµè§ˆå™¨ä¸æ”¯æŒ HTML5 视频。" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "您å¯ä»¥åœ¨ <a href=\"http://getfirefox.com\">http://getfirefox.com</a> å–å¾—å¯ä»¥æ’放æ¤è§†é¢‘çš„æµè§ˆå™¨ï¼" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "æ¤å¤„您å¯ä»¥è¿½è¸ªæœ¬ç«™ç‚¹å¤„ç†åª’体的状æ€ã€‚" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "媒体处ç†ä¸" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "没有æ£åœ¨å¤„ç†ä¸çš„媒体" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "æ— æ³•å¤„ç†è¿™äº›ä¸Šä¼ 内容：" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "没有失败的纪录ï¼" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "最近 10 次æˆåŠŸä¸Šä¼ 的纪录" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "现在还没有处ç†çš„纪录ï¼" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "新增åˆé›†" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "åŠ å…¥æ‚¨çš„åª’ä½“" @@ -1234,7 +1492,7 @@ msgstr "å¢žåŠ è¯„è®º" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "å·²å¢žåŠ " @@ -1261,85 +1519,107 @@ msgstr "您å¯ä»¥åœ¨è¿™é‡Œè¿½è¸ªæ‚¨çš„艺廊ä¸åª’体处ç†çš„状æ€ã€‚" msgid "Your last 10 successful uploads" msgstr "您的最近 10 次æˆåŠŸä¸Šä¼ 的纪录" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)s 的个人资料" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "抱æ‰ï¼Œæ‰¾ä¸åˆ°è¯¥ç”¨æˆ·ã€‚" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "需è¦è®¤è¯ç”µå邮件地å€" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "快完æˆäº†ï¼ä½†æ‚¨éœ€è¦æ¿€æ´»æ‚¨çš„账户。" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "账户激活说明将在ç¨åŽé€è¾¾ã€‚" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "如果ä»ç„¶æ— 法认è¯ï¼Œæ‚¨å¯ä»¥ï¼š" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "é‡å‘认è¯é‚®ä»¶" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "有人用注册了该账户，但是该账户需è¦è¢«å¯ç”¨ã€‚" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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>然åŽé‡å‘一次。" +msgid "%(username)s's profile" +msgstr "%(username)s 的个人资料" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "这个地方能让您å‘他人介ç»è‡ªå·±ã€‚" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "编辑个人资料" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "这个用户（还）没有填写个人资料。" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "æµè§ˆåˆé›†" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "查看 %(username)s 的全部媒体" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "æ¤å¤„æ˜¯æ‚¨çš„åª’ä½“ä¼šå‡ºçŽ°çš„åœ°æ–¹ï¼Œä½†æ˜¯ä¼¼ä¹Žè¿˜æ²¡æœ‰åŠ å…¥ä»»ä½•ä¸œè¥¿ã€‚" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "那里好åƒè¿˜æ²¡æœ‰ä»»ä½•çš„媒体……" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "需è¦è®¤è¯ç”µå邮件地å€" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "快完æˆäº†ï¼ä½†æ‚¨éœ€è¦æ¿€æ´»æ‚¨çš„账户。" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "账户激活说明将在ç¨åŽé€è¾¾ã€‚" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "如果ä»ç„¶æ— 法认è¯ï¼Œæ‚¨å¯ä»¥ï¼š" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "é‡å‘认è¯é‚®ä»¶" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "有人用注册了该账户，但是该账户需è¦è¢«å¯ç”¨ã€‚" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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/utils/collection_gallery.html:49 msgid "(remove)" msgstr "（移除）" @@ -1388,6 +1668,10 @@ msgstr "æ›´æ–°çš„" msgid "older" msgstr "更旧的" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "æ ‡ç¾" @@ -1396,34 +1680,34 @@ msgstr "æ ‡ç¾" msgid "Could not read the image file." msgstr "æ— æ³•è¯»å–图片文件。" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "糟糕ï¼" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "å‘生错误" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "æ“作ä¸å…许" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "对ä¸èµ·è€å…„，我ä¸èƒ½è®©ä½ è¿™æ ·åšï¼</p><p>您æ£åœ¨è¯•ç€æ“作ä¸å…许您使用的功能。您难é“æƒ³æ‰“ç®—åˆ é™¤æ‰€æœ‰ç”¨æˆ·è´¦æˆ·å—？" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1491,15 +1775,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "抱æ‰ï¼Œä¸å¼€æ”¾è¯„论。" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "啊，您的评论是空的。" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "您的评论已ç»å¼ 贴完æˆï¼" @@ -1521,43 +1809,43 @@ msgstr "“%sâ€å·²ç»åœ¨â€œ%sâ€åˆé›†" msgid "\"%s\" added to collection \"%s\"" msgstr "“%sâ€åŠ 入“%sâ€åˆé›†" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "您已ç»åˆ 除æ¤åª’体。" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由于您没有勾选确认，该媒体没有被移除。" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "您æ£åœ¨åˆ 除别人的媒体，请å°å¿ƒæ“作。" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "您已ç»ä»Žè¯¥åˆé›†ä¸åˆ 除该项目。" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "由于您没有勾选确认，该项目没有被移除。" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您æ£åœ¨ä»Žåˆ«äººçš„åˆé›†ä¸åˆ 除项目，请å°å¿ƒæ“作。" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已ç»åˆ 除“%sâ€åˆé›†ã€‚" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由于您没有勾选确认，该åˆé›†æ²¡æœ‰è¢«ç§»é™¤ã€‚" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您æ£åœ¨åˆ 除别人的åˆé›†ï¼Œè¯·å°å¿ƒæ“作。" diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo Binary files differindex 888052fb..3dabd00b 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index 51759424..60587db3 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -18,41 +18,41 @@ msgstr "" "Language: zh_TW.Big5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 -#: mediagoblin/plugins/persona/views.py:77 -msgid "Sorry, authentication is disabled on this instance." +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." msgstr "" @@ -78,77 +78,37 @@ msgstr "" msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "" @@ -158,7 +118,7 @@ msgid "" "this." msgstr "" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" @@ -191,45 +151,46 @@ msgstr "" msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" msgstr "" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." msgstr "" @@ -266,7 +227,7 @@ msgstr "" msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -280,16 +241,12 @@ msgstr "" msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 -msgid "Wrong password" -msgstr "" - -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." msgstr "" -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 +msgid "Wrong password" msgstr "" #: mediagoblin/gmg_commands/assetlink.py:60 @@ -339,7 +296,43 @@ msgstr "" msgid "Video transcoding failed" msgstr "" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" msgstr "" @@ -361,14 +354,30 @@ msgstr "" msgid "No request token found." msgstr "" +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "" + #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -382,6 +391,94 @@ msgstr "" msgid "Stay logged in" msgstr "" +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -391,6 +488,10 @@ msgstr "" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "" @@ -460,7 +561,7 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" @@ -538,10 +639,10 @@ msgstr "" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "" @@ -601,8 +702,8 @@ msgstr "" msgid "Add a Persona email address" msgstr "" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" msgstr "" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 @@ -613,115 +714,119 @@ msgstr "" msgid "Or register with Persona!" msgstr "" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." msgstr "" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" msgstr "" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "" + +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:32 -msgid "Most recent media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" msgstr "" -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" +#: mediagoblin/templates/mediagoblin/root.html:32 +msgid "Most recent media" msgstr "" #: mediagoblin/templates/mediagoblin/api/authorize.html:21 @@ -777,50 +882,6 @@ msgstr "" msgid "Copy and paste this into your client:" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" @@ -856,6 +917,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "" @@ -905,13 +970,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "" @@ -928,7 +993,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -940,17 +1005,6 @@ msgstr "" msgid "Changing %(username)s's email" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "" - #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -978,11 +1032,11 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" msgstr "" @@ -1017,8 +1071,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "" @@ -1038,7 +1095,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "" @@ -1062,7 +1119,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "" @@ -1121,30 +1178,231 @@ msgstr "" msgid "Object Height" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" msgstr "" +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "" + #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "" @@ -1229,7 +1487,7 @@ msgstr "" msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "" @@ -1256,85 +1514,107 @@ msgstr "" msgid "Your last 10 successful uploads" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 +#, python-format msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 #, python-format -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." +msgid "%(username)s's profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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 "" + #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -1383,6 +1663,10 @@ msgstr "" msgid "older" msgstr "" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "" @@ -1391,34 +1675,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" msgstr "" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" msgstr "" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1486,15 +1770,19 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" msgstr "" @@ -1516,43 +1804,43 @@ msgstr "" msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo Binary files differindex 5e8ec911..35beea63 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 586f3766..67b41aba 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" -"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-09-04 16:02-0500\n" -"PO-Revision-Date: 2013-09-04 21:03+0000\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2013-12-03 13:23-0600\n" +"PO-Revision-Date: 2013-12-03 19:23+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -23,43 +23,43 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/decorators.py:252 +#: mediagoblin/decorators.py:300 mediagoblin/plugins/openid/views.py:202 msgid "Sorry, registration is disabled on this instance." -msgstr "抱æ‰ï¼Œæœ¬ç«™å·²ç¶“æš«åœè¨»å†Šã€‚" +msgstr "抱æ‰ï¼Œæœ¬ç«™å·²ç¶“關閉註冊功能。" -#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/decorators.py:315 +msgid "Sorry, reporting is disabled on this instance." +msgstr "抱æ‰ï¼Œæœ¬ç«™å·²ç¶“é—œé–‰å›žå ±åŠŸèƒ½ã€‚" + +#: mediagoblin/decorators.py:358 mediagoblin/plugins/ldap/views.py:55 #: mediagoblin/plugins/persona/views.py:77 msgid "Sorry, authentication is disabled on this instance." -msgstr "" +msgstr "抱æ‰ï¼Œæœ¬ç«™å·²ç¶“關閉èªè¨¼ã€‚" -#: mediagoblin/auth/forms.py:25 -msgid "Username or email" -msgstr "使用者å稱或 email" - -#: mediagoblin/auth/tools.py:41 +#: mediagoblin/auth/tools.py:43 msgid "Invalid User name or email address." msgstr "無效的使用者å稱或 email ä½ç½®ã€‚" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:44 msgid "This field does not take email addresses." msgstr "本欄ä½ä¸æŽ¥å— email ä½ç½®ã€‚" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:45 msgid "This field requires an email address." msgstr "本欄ä½éœ€è¦ email ä½ç½®ã€‚" -#: mediagoblin/auth/tools.py:146 +#: mediagoblin/auth/tools.py:116 msgid "Sorry, a user with that name already exists." msgstr "抱æ‰ï¼Œé€™å€‹ä½¿ç”¨è€…å稱已經å˜åœ¨ã€‚" -#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402 msgid "Sorry, a user with that email address already exists." msgstr "抱æ‰ï¼Œæ¤ email ä½ç½®å·²ç¶“被註冊了。" -#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 -#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358 +#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110 msgid "The verification key or user id is incorrect." -msgstr "" +msgstr "èªè¨¼é‡‘鑰或使用者 ID ä¸æ£ç¢ºã€‚" #: mediagoblin/auth/views.py:161 msgid "" @@ -83,77 +83,37 @@ msgstr "您的電å郵件已經確èªäº†ï¼" msgid "Resent your verification email." msgstr "é‡é€èªè‰ä¿¡ã€‚" -#: mediagoblin/auth/views.py:237 -msgid "" -"If that email address (case sensitive!) is registered an email has been sent" -" with instructions on how to change your password." -msgstr "如果那 email ä½ç½® (請注æ„大å°å¯«) 已經註冊，寫有修改密碼æ¥é©Ÿçš„ email 已經é€å‡ºã€‚" - -#: mediagoblin/auth/views.py:248 -msgid "Couldn't find someone with that username." -msgstr "找ä¸åˆ°ç›¸é—œçš„使用者å稱。" - -#: mediagoblin/auth/views.py:251 -msgid "" -"An email has been sent with instructions on how to change your password." -msgstr "修改密碼的指示已經由電å郵件寄é€åˆ°æ‚¨çš„信箱。" - -#: mediagoblin/auth/views.py:258 -msgid "" -"Could not send password recovery email as your username is inactive or your " -"account's email address has not been verified." -msgstr "無法傳é€å¯†ç¢¼å›žå¾©ä¿¡ä»¶ï¼Œå› 為您的使用者å稱已失效或是帳號尚未èªè‰ã€‚" - -#: mediagoblin/auth/views.py:306 -msgid "The user id is incorrect." -msgstr "" - -#: mediagoblin/auth/views.py:323 -msgid "You can now log in using your new password." -msgstr "您ç¾åœ¨å¯ä»¥ç”¨æ–°çš„密碼登入了ï¼" - -#: mediagoblin/auth/views.py:334 -msgid "You need to verify your email before you can reset your password." -msgstr "" - -#: mediagoblin/auth/views.py:340 -msgid "" -"You are no longer an active user. Please contact the system admin to " -"reactivate your account." -msgstr "" - -#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86 -#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 +#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87 +#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61 #: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "標題" -#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40 msgid "Description of this work" msgstr "這個作å“çš„æè¿°" #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54 -#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 +#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." -msgstr "您å¯ä»¥ç”¨ <a href=\"http://markdown.tw\">Markdown</a> 來排版。" +msgstr "您å¯ä»¥ä½¿ç”¨\n<a href=\"http://markdown.tw\">\nMarkdown</a> 來排版。" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45 msgid "Tags" msgstr "標籤" -#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47 msgid "Separate tags by commas." msgstr "用逗號分隔標籤。" -#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95 msgid "Slug" msgstr "簡稱" -#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96 msgid "The slug can't be empty" msgstr "簡稱ä¸èƒ½ç‚ºç©ºç™½" @@ -163,7 +123,7 @@ msgid "" "this." msgstr "æ¤åª’體網å€çš„標題部份。通常ä¸éœ€è¦ä¿®æ”¹ã€‚" -#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "授權" @@ -182,11 +142,11 @@ msgstr "本網å€å‡ºéŒ¯äº†" #: mediagoblin/edit/forms.py:65 msgid "Email me when others comment on my media" -msgstr "當有人å°æˆ‘的媒體留言時寄信給我" +msgstr "當有人å°æˆ‘的媒體評論時寄信給我" #: mediagoblin/edit/forms.py:67 msgid "Enable insite notifications about events." -msgstr "" +msgstr "啟用活動的站內通知。" #: mediagoblin/edit/forms.py:69 msgid "License preference" @@ -196,51 +156,52 @@ msgstr "授權å好" msgid "This will be your default license on upload forms." msgstr "在上傳é é¢ï¼Œé€™å°‡æœƒæ˜¯æ‚¨é è¨çš„授權模å¼ã€‚" -#: mediagoblin/edit/forms.py:87 +#: mediagoblin/edit/forms.py:88 msgid "The title can't be empty" msgstr "標題ä¸èƒ½æ˜¯ç©ºçš„" -#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "這個è’è—çš„æè¿°" -#: mediagoblin/edit/forms.py:96 +#: mediagoblin/edit/forms.py:97 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "æ¤è’è—網å€çš„標題部份，通常ä¸éœ€è¦ä¿®æ”¹ã€‚" -#: mediagoblin/edit/forms.py:103 +#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68 msgid "Old password" msgstr "舊的密碼" -#: mediagoblin/edit/forms.py:105 +#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70 msgid "Enter your old password to prove you own this account." msgstr "輸入您的舊密碼來è‰æ˜Žæ‚¨æ“有這個帳號。" -#: mediagoblin/edit/forms.py:108 +#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73 msgid "New password" msgstr "新密碼" -#: mediagoblin/edit/forms.py:116 +#: mediagoblin/edit/forms.py:117 msgid "New email address" -msgstr "" +msgstr "æ–°çš„ email ä½å€" -#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28 #: mediagoblin/plugins/basic_auth/forms.py:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/plugins/ldap/forms.py:39 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64 #: mediagoblin/tests/test_util.py:110 msgid "Password" msgstr "密碼" -#: mediagoblin/edit/forms.py:122 +#: mediagoblin/edit/forms.py:123 msgid "Enter your password to prove you own this account." -msgstr "" +msgstr "輸入您的密碼來è‰æ˜Žæ‚¨æ“有這個帳號。" #: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." -msgstr "這個簡稱已經被其他人用了" +msgstr "é€™å€‹ä½¿ç”¨è€…å·²ç¶“æœ‰ä½¿ç”¨è©²ç°¡ç¨±çš„é …ç›®äº†ã€‚" #: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." @@ -271,7 +232,7 @@ msgstr "帳號è¨å®šå·²å„²å˜" msgid "You need to confirm the deletion of your account." msgstr "æ‚¨å¿…é ˆè¦ç¢ºèªæ˜¯å¦åˆªé™¤æ‚¨çš„帳號。" -#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:132 #: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" @@ -285,18 +246,14 @@ msgstr "這個使用者已經有使用該簡稱的è’è—了。" msgid "You are editing another user's collection. Proceed with caution." msgstr "您æ£åœ¨ä¿®æ”¹åˆ¥äººçš„è’è—，請å°å¿ƒæ“作。" -#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 +#: mediagoblin/edit/views.py:373 +msgid "Your email address has been verified." +msgstr "您的 email ä½å€å·²èªè¨¼ã€‚" + +#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:370 -msgid "Your password was changed successfully" -msgstr "您的密碼已經æˆåŠŸä¿®æ”¹" - -#: mediagoblin/edit/views.py:413 -msgid "Your email address has been verified." -msgstr "" - #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "無法連çµä½ˆæ™¯â€¦æ²’有æ¤ä½ˆæ™¯\n" @@ -344,36 +301,88 @@ msgstr "unoconv 無法執行，請檢查紀錄檔" msgid "Video transcoding failed" msgstr "å½±åƒè½‰ç¢¼å¤±æ•—" -#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +#: mediagoblin/moderation/forms.py:21 +msgid "Take away privilege" +msgstr "移除權é™" + +#: mediagoblin/moderation/forms.py:22 +msgid "Ban the user" +msgstr "å°éŽ–該使用者" + +#: mediagoblin/moderation/forms.py:23 +msgid "Send the user a message" +msgstr "寄訊æ¯åˆ°è©²ä½¿ç”¨è€…" + +#: mediagoblin/moderation/forms.py:24 +msgid "Delete the content" +msgstr "刪除內容" + +#: mediagoblin/moderation/forms.py:53 mediagoblin/moderation/forms.py:118 +msgid "User will be banned until:" +msgstr "該使用者將被å°éŽ–，直到：" + +#: mediagoblin/moderation/forms.py:57 +msgid "Why are you banning this User?" +msgstr "為什麼您è¦å°éŽ–該使用者？" + +#: mediagoblin/moderation/forms.py:109 +msgid "What action will you take to resolve the report?" +msgstr "è«‹å•æ‚¨è¦å¦‚何處ç†é€™é …å›žå ±ï¼Ÿ" + +#: mediagoblin/moderation/forms.py:115 +msgid "What privileges will you take away?" +msgstr "您è¦å–走他哪些權é™ï¼Ÿ" + +#: mediagoblin/moderation/tools.py:91 +msgid "Warning from" +msgstr "è¦å‘Šï¼Œä¾†è‡ª" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60 msgid "commented on your post" -msgstr "在您的內容張貼留言" +msgstr "在您的內容張貼評論" #: mediagoblin/notifications/views.py:35 #, python-format msgid "Subscribed to comments on %s!" -msgstr "" +msgstr "已訂閱 %s çš„è©•è«–ï¼" #: mediagoblin/notifications/views.py:48 #, python-format msgid "You will not receive notifications for comments on %s." -msgstr "" +msgstr "您將ä¸æœƒæ”¶åˆ° %s 的評論通知。" #: mediagoblin/oauth/views.py:239 msgid "Must provide an oauth_token." -msgstr "" +msgstr "å¿…é ˆæä¾› oauth_token。" #: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 msgid "No request token found." -msgstr "" +msgstr "找ä¸åˆ°è«‹æ±‚çš„ token。" + +#: mediagoblin/plugins/api/views.py:75 mediagoblin/plugins/piwigo/views.py:155 +#: mediagoblin/submit/views.py:78 +msgid "Sorry, the file size is too big." +msgstr "抱æ‰ï¼Œæª”案太大了。" + +#: mediagoblin/plugins/api/views.py:78 mediagoblin/plugins/piwigo/views.py:158 +#: mediagoblin/submit/views.py:81 +msgid "Sorry, uploading this file will put you over your upload limit." +msgstr "抱æ‰ï¼Œä¸Šå‚³è©²æª”案將會超éŽæ‚¨çš„上傳é™åˆ¶ã€‚" + +#: mediagoblin/plugins/api/views.py:82 mediagoblin/plugins/piwigo/views.py:162 +#: mediagoblin/submit/views.py:87 +msgid "Sorry, you have reached your upload limit." +msgstr "抱æ‰ï¼Œæ‚¨å·²ç¶“碰到了您的上傳é™åˆ¶ã€‚" #: mediagoblin/plugins/basic_auth/forms.py:24 -#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27 #: mediagoblin/plugins/persona/forms.py:24 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76 msgid "Username" msgstr "使用者å稱" #: mediagoblin/plugins/basic_auth/forms.py:32 -#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31 #: mediagoblin/plugins/persona/forms.py:28 #: mediagoblin/plugins/persona/forms.py:39 msgid "Email address" @@ -385,7 +394,95 @@ msgstr "使用者å稱或 email" #: mediagoblin/plugins/basic_auth/forms.py:46 msgid "Stay logged in" -msgstr "" +msgstr "ä¿æŒç™»å…¥" + +#: mediagoblin/plugins/basic_auth/forms.py:51 +msgid "Username or email" +msgstr "使用者å稱或 email" + +#: mediagoblin/plugins/basic_auth/views.py:54 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "如果那 email ä½ç½® (請注æ„大å°å¯«) 已經註冊，寫有修改密碼æ¥é©Ÿçš„ email 已經é€å‡ºã€‚" + +#: mediagoblin/plugins/basic_auth/views.py:65 +msgid "Couldn't find someone with that username." +msgstr "找ä¸åˆ°ç›¸é—œçš„使用者å稱。" + +#: mediagoblin/plugins/basic_auth/views.py:68 +msgid "" +"An email has been sent with instructions on how to change your password." +msgstr "修改密碼的指示已經由電å郵件寄é€åˆ°æ‚¨çš„信箱。" + +#: mediagoblin/plugins/basic_auth/views.py:75 +msgid "" +"Could not send password recovery email as your username is inactive or your " +"account's email address has not been verified." +msgstr "無法傳é€å¯†ç¢¼å›žå¾©ä¿¡ä»¶ï¼Œå› 為您的使用者å稱已失效或是帳號尚未èªè‰ã€‚" + +#: mediagoblin/plugins/basic_auth/views.py:123 +msgid "The user id is incorrect." +msgstr "使用者 ID ä¸æ£ç¢º" + +#: mediagoblin/plugins/basic_auth/views.py:139 +msgid "You can now log in using your new password." +msgstr "您ç¾åœ¨å¯ä»¥ç”¨æ–°çš„密碼登入了ï¼" + +#: mediagoblin/plugins/basic_auth/views.py:163 +msgid "" +"You are no longer an active user. Please contact the system admin to " +"reactivate your account." +msgstr "您ç¾åœ¨ä¸æ˜¯æ´»å‹•ä¸çš„使用者，請è¯çµ¡ç³»çµ±ç®¡ç†å“¡ä»¥é‡æ–°å•Ÿç”¨æ‚¨çš„帳號。" + +#: mediagoblin/plugins/basic_auth/views.py:215 +msgid "Your password was changed successfully" +msgstr "您的密碼已經æˆåŠŸä¿®æ”¹" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36 +msgid "Set your new password" +msgstr "è¨å®šæ‚¨çš„新密碼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39 +msgid "Set password" +msgstr "è¨å®šæ–°å¯†ç¢¼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38 +#, python-format +msgid "Changing %(username)s's password" +msgstr "更改 %(username)s 的密碼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 +msgid "Save" +msgstr "儲å˜" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22 +msgid "Don't have an account yet?" +msgstr "還沒有帳號嗎？" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24 +msgid "Create one here!" +msgstr "在這裡建立一個å§ï¼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22 +msgid "Change your password." +msgstr "更改您的密碼。" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23 +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31 +msgid "Recover password" +msgstr "找回密碼" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34 +msgid "Send instructions" +msgstr "é€å‡ºæŒ‡ç¤º" + +#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22 +msgid "Forgot your password?" +msgstr "忘了密碼嗎？" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -396,6 +493,10 @@ msgstr "ä½ç½®" msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上觀看" +#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22 +msgid "Sign in to create an account!" +msgstr "登入以建立帳號ï¼" + #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" msgstr "å…許" @@ -465,7 +566,7 @@ msgstr "您的 OAuth 用戶程å¼" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/submit/start.html:39 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "å¢žåŠ " @@ -474,60 +575,60 @@ msgstr "å¢žåŠ " #: mediagoblin/plugins/openid/views.py:268 #: mediagoblin/plugins/openid/views.py:297 msgid "Sorry, an account is already registered to that OpenID." -msgstr "" +msgstr "抱æ‰ï¼Œæœ‰å¸³è™Ÿå·²ç¶“登記了您輸入的 OpenID。" #: mediagoblin/plugins/openid/forms.py:38 msgid "OpenID" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/views.py:48 msgid "Sorry, the OpenID server could not be found" -msgstr "" +msgstr "抱æ‰ï¼Œæ‰¾ä¸åˆ° OpenID 伺æœå™¨" #: mediagoblin/plugins/openid/views.py:61 #, python-format msgid "No OpenID service was found for %s" -msgstr "" +msgstr "找ä¸åˆ° %s çš„ OpenID æœå‹™" #: mediagoblin/plugins/openid/views.py:106 #, python-format msgid "Verification of %s failed: %s" -msgstr "" +msgstr "%s çš„èªè¨¼å¤±æ•—：%s" #: mediagoblin/plugins/openid/views.py:117 msgid "Verification cancelled" -msgstr "" +msgstr "èªè¨¼å·²å–消" #: mediagoblin/plugins/openid/views.py:314 msgid "Your OpenID url was saved successfully." -msgstr "" +msgstr "您的 OpenID url å·²æˆåŠŸå„²å˜ã€‚" #: mediagoblin/plugins/openid/views.py:338 #: mediagoblin/plugins/openid/views.py:393 msgid "You can't delete your only OpenID URL unless you have a password set" -msgstr "" +msgstr "除éžæ‚¨è¨å®šäº†å¸³è™Ÿçš„密碼，您無法刪除帳號下唯一的 OpenID URL" #: mediagoblin/plugins/openid/views.py:343 #: mediagoblin/plugins/openid/views.py:402 msgid "That OpenID is not registered to this account." -msgstr "" +msgstr "OpenID 尚未登記到æ¤å¸³è™Ÿ" #: mediagoblin/plugins/openid/views.py:385 msgid "OpenID was successfully removed." -msgstr "" +msgstr "OpenID å·²æˆåŠŸç§»é™¤ã€‚" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:31 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:34 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:23 msgid "Add an OpenID" -msgstr "" +msgstr "新增 OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:34 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:23 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:31 msgid "Delete an OpenID" -msgstr "" +msgstr "刪除 OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/delete.html:39 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:39 @@ -538,15 +639,15 @@ msgstr "刪除" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 msgid "OpenID's" -msgstr "" +msgstr "OpenID" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57 -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:106 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:58 +#: mediagoblin/templates/mediagoblin/auth/login.html:47 msgid "Log in" msgstr "登入" @@ -557,274 +658,234 @@ msgstr "登入失敗ï¼" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 msgid "Log in to create an account!" -msgstr "" +msgstr "登入以創建一個帳號ï¼" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 msgid "Or login with a password!" -msgstr "" +msgstr "或是使用密碼登入ï¼" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 msgid "Or login with OpenID!" -msgstr "" +msgstr "或是使用 OpenID 登入ï¼" #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 msgid "Or register with OpenID!" -msgstr "" +msgstr "或是使用 OpenID 註冊ï¼" #: mediagoblin/plugins/persona/__init__.py:90 msgid "Sorry, an account is already registered to that Persona email." -msgstr "" +msgstr "抱æ‰ï¼Œæœ‰å¸³è™Ÿå·²ç¶“登記了您輸入的 Persona email。" #: mediagoblin/plugins/persona/views.py:138 msgid "The Persona email address was successfully removed." -msgstr "" +msgstr "Persona email ä½å€å·²æˆåŠŸç§»é™¤ã€‚" #: mediagoblin/plugins/persona/views.py:144 msgid "" "You can't delete your only Persona email address unless you have a password " "set." -msgstr "" +msgstr "除éžæ‚¨è¨å®šäº†å¸³è™Ÿçš„密碼，您無法刪除帳號下唯一的 Persona email ä½å€ã€‚" #: mediagoblin/plugins/persona/views.py:149 msgid "That Persona email address is not registered to this account." -msgstr "" +msgstr "該 Persona email ä½å€å°šæœªç™»è¨˜åˆ°æ¤å¸³è™Ÿã€‚" #: mediagoblin/plugins/persona/views.py:176 msgid "" "Sorry, an account is already registered with that Persona email address." -msgstr "" +msgstr "抱æ‰ï¼Œæœ‰å¸³è™Ÿå·²ç¶“登記了您輸入的 Persona email ä½å€ã€‚" #: mediagoblin/plugins/persona/views.py:192 msgid "Your Persona email address was saved successfully." -msgstr "" +msgstr "您的 Persona email ä½å€å·²æˆåŠŸå„²å˜" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 msgid "Delete a Persona email address" -msgstr "" +msgstr "刪除 Persona email ä½å€" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 msgid "Add a Persona email address" -msgstr "" +msgstr "新增 Persona email ä½å€" -#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22 -msgid "Edit your Persona email addresses" -msgstr "" +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21 +msgid "Persona's" +msgstr "Persona çš„" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22 msgid "Or login with Persona!" -msgstr "" +msgstr "或是使用 Persona 登入ï¼" #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 msgid "Or register with Persona!" -msgstr "" +msgstr "或是使用 Persona 註冊ï¼" -#: mediagoblin/processing/__init__.py:413 +#: mediagoblin/processing/__init__.py:420 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別ï¼" -#: mediagoblin/processing/__init__.py:420 +#: mediagoblin/processing/__init__.py:427 msgid "Copying to public storage failed." -msgstr "" +msgstr "複製到公有å˜å„²å¤±æ•—。" -#: mediagoblin/processing/__init__.py:428 +#: mediagoblin/processing/__init__.py:435 msgid "An acceptable processing file was not found" -msgstr "" +msgstr "找ä¸åˆ°å¯æ”¶å—的待處ç†æª”案" + +#: mediagoblin/submit/forms.py:30 +msgid "Max file size: {0} mb" +msgstr "最大檔案大å°ï¼š{0} mb" -#: mediagoblin/submit/forms.py:26 +#: mediagoblin/submit/forms.py:34 msgid "File" msgstr "檔案" -#: mediagoblin/submit/views.py:52 +#: mediagoblin/submit/forms.py:41 +msgid "" +"You can use\n" +" <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" +" Markdown</a> for formatting." +msgstr "您å¯ä»¥ä½¿ç”¨\n<a href=\"http://markdown.tw\">\nMarkdown</a> 來排版。" + +#: mediagoblin/submit/views.py:55 msgid "You must provide a file." msgstr "æ‚¨å¿…é ˆæ供一個檔案" -#: mediagoblin/submit/views.py:101 +#: mediagoblin/submit/views.py:69 msgid "Woohoo! Submitted!" msgstr "啊哈ï¼PO 上去啦ï¼" -#: mediagoblin/submit/views.py:154 +#: mediagoblin/submit/views.py:138 #, python-format msgid "Collection \"%s\" added!" msgstr "è’è—「%sã€æ–°å¢žå®Œæˆï¼" -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/banned.html:20 +msgid "You are Banned." +msgstr "您被å°éŽ–了。" + +#: mediagoblin/templates/mediagoblin/banned.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "壓力很大的哥布林示æ„圖" + +#: mediagoblin/templates/mediagoblin/banned.html:26 +msgid "You have been banned" +msgstr "您被" + +#: mediagoblin/templates/mediagoblin/banned.html:28 +#, python-format +msgid "until %(until_when)s" +msgstr "å°éŽ–了，會在 %(until_when)s 解除" + +#: mediagoblin/templates/mediagoblin/banned.html:30 +msgid "indefinitely" +msgstr "永久å°éŽ–了" + +#: mediagoblin/templates/mediagoblin/base.html:81 msgid "Verify your email!" msgstr "確èªæ‚¨çš„é›»å郵件" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/base.html:88 +#: mediagoblin/templates/mediagoblin/base.html:96 msgid "log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:105 +#: mediagoblin/templates/mediagoblin/base.html:115 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的帳號" -#: mediagoblin/templates/mediagoblin/base.html:112 +#: mediagoblin/templates/mediagoblin/base.html:122 msgid "Change account settings" msgstr "更改帳號è¨å®š" -#: mediagoblin/templates/mediagoblin/base.html:116 -#: mediagoblin/templates/mediagoblin/base.html:137 -#: mediagoblin/templates/mediagoblin/admin/panel.html:21 -#: mediagoblin/templates/mediagoblin/admin/panel.html:26 +#: mediagoblin/templates/mediagoblin/base.html:126 +#: mediagoblin/templates/mediagoblin/base.html:147 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" msgstr "媒體處ç†é¢æ¿" -#: mediagoblin/templates/mediagoblin/base.html:125 +#: mediagoblin/templates/mediagoblin/base.html:135 msgid "Log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:128 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +#: mediagoblin/templates/mediagoblin/base.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:112 msgid "Add media" msgstr "新增媒體" -#: mediagoblin/templates/mediagoblin/base.html:131 +#: mediagoblin/templates/mediagoblin/base.html:141 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "新增新的è’è—" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "滿臉å•è™Ÿçš„哥布林" +#: mediagoblin/templates/mediagoblin/base.html:151 +msgid "User management panel" +msgstr "使用者管ç†é¢æ¿" + +#: mediagoblin/templates/mediagoblin/base.html:155 +msgid "Report management panel" +msgstr "å›žå ±ç®¡ç†é¢æ¿" #: mediagoblin/templates/mediagoblin/root.html:32 msgid "Most recent media" msgstr "最新的媒體" -#: mediagoblin/templates/mediagoblin/admin/panel.html:29 -msgid "" -"Here you can track the state of media being processed on this instance." -msgstr "æ¤è™•æ‚¨å¯ä»¥è¿½è¹¤æœ¬ç«™å°è™•ç†åª’體的狀態。" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:32 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 -msgid "Media in-processing" -msgstr "媒體處ç†ä¸" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:58 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 -msgid "No media in-processing" -msgstr "沒有æ£åœ¨è™•ç†ä¸çš„媒體" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:61 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 -msgid "These uploads failed to process:" -msgstr "無法處ç†é€™äº›ä¸Šå‚³å…§å®¹ï¼š" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:90 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 -msgid "No failed entries!" -msgstr "沒有失敗的紀錄ï¼" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:92 -msgid "Last 10 successful uploads" -msgstr "最近 10 次æˆåŠŸä¸Šå‚³çš„紀錄" - -#: mediagoblin/templates/mediagoblin/admin/panel.html:112 -#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 -msgid "No processed entries, yet!" -msgstr "ç¾åœ¨é‚„沒有處ç†çš„紀錄ï¼" - #: mediagoblin/templates/mediagoblin/api/authorize.html:21 msgid "Authorization" -msgstr "" +msgstr "èªè¨¼" #: mediagoblin/templates/mediagoblin/api/authorize.html:26 #: mediagoblin/templates/mediagoblin/api/authorize.html:53 msgid "Authorize" -msgstr "" +msgstr "èªè¨¼" #: mediagoblin/templates/mediagoblin/api/authorize.html:29 msgid "You are logged in as" -msgstr "" +msgstr "您已經登入為" #: mediagoblin/templates/mediagoblin/api/authorize.html:33 msgid "Do you want to authorize " -msgstr "" +msgstr "您åŒæ„" #: mediagoblin/templates/mediagoblin/api/authorize.html:37 msgid "an unknown application" -msgstr "" +msgstr "一個未知的應用程å¼" #: mediagoblin/templates/mediagoblin/api/authorize.html:39 msgid " to access your account? " -msgstr "" +msgstr "å˜å–您的帳號嗎？" #: mediagoblin/templates/mediagoblin/api/authorize.html:41 msgid "Applications with access to your account can: " -msgstr "" +msgstr "該程å¼å°‡å¯é€éŽæ‚¨çš„帳號進行以下動作：" #: mediagoblin/templates/mediagoblin/api/authorize.html:43 msgid "Post new media as you" -msgstr "" +msgstr "以您的å義張貼新媒體" #: mediagoblin/templates/mediagoblin/api/authorize.html:44 msgid "See your information (e.g profile, media, etc...)" -msgstr "" +msgstr "檢視您的資訊 (如個人資料ã€åª’體…ç‰)" #: mediagoblin/templates/mediagoblin/api/authorize.html:45 msgid "Change your information" -msgstr "" +msgstr "變更您的個人資料" #: mediagoblin/templates/mediagoblin/api/oob.html:21 msgid "Authorization Finished" -msgstr "" +msgstr "èªè¨¼å®Œæˆ" #: mediagoblin/templates/mediagoblin/api/oob.html:26 msgid "Authorization Complete" -msgstr "" +msgstr "èªè¨¼å®Œæˆ" #: mediagoblin/templates/mediagoblin/api/oob.html:28 msgid "Copy and paste this into your client:" -msgstr "" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 -msgid "Set your new password" -msgstr "è¨å®šæ‚¨çš„新密碼" - -#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 -msgid "Set password" -msgstr "è¨å®šæ–°å¯†ç¢¼" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 -msgid "Recover password" -msgstr "找回密碼" - -#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34 -msgid "Send instructions" -msgstr "é€å‡ºæŒ‡ç¤º" - -#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19 -#, python-format -msgid "" -"Hi %(username)s,\n" -"\n" -"to change your GNU MediaGoblin password, open the following URL in \n" -"your web browser:\n" -"\n" -"%(verification_url)s\n" -"\n" -"If you think this is an error, just ignore this email and continue being\n" -"a happy goblin!" -msgstr "%(username)s 您好：\n\nè¦ä¿®æ”¹ GNU MediaGoblin 的密碼，請在您的ç€è¦½å™¨ä¸æ‰“開下é¢çš„網å€ï¼š\n\n%(verification_url)s\n\n如果您èªç‚ºé€™å€‹æ˜¯å€‹èª¤æœƒï¼Œè«‹å¿½ç•¥æ¤å°ä¿¡ä»¶ï¼Œç¹¼çºŒç•¶å€‹å¿«æ¨‚的哥布林ï¼" - -#: mediagoblin/templates/mediagoblin/auth/login.html:44 -msgid "Don't have an account yet?" -msgstr "還沒有帳號嗎？" - -#: mediagoblin/templates/mediagoblin/auth/login.html:46 -msgid "Create one here!" -msgstr "在這裡建立一個å§ï¼" - -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Forgot your password?" -msgstr "忘了密碼嗎？" +msgstr "請將以下文å—複製並貼到應用程å¼ä¸Šï¼š" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -844,7 +905,7 @@ msgid "" "your web browser:\n" "\n" "%(verification_url)s" -msgstr "%(username)s 您好：\n\nè¦å•Ÿå‹• GNU MediaGoblin 帳號，請在您的ç€è¦½å™¨ä¸æ‰“開下é¢çš„網å€:\n\n%(verification_url)s" +msgstr "%(username)s 您好：\n\nè¦å•Ÿå‹• GNU MediaGoblin 帳號，請在您的ç€è¦½å™¨ä¸æ‰“開下é¢çš„網å€ï¼š\n\n%(verification_url)s" #: mediagoblin/templates/mediagoblin/bits/base_footer.html:21 #, python-format @@ -861,6 +922,10 @@ msgid "" "href=\"%(source_link)s\">Source code</a> available." msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a> 授權釋出。備有<a href=\"%(source_link)s\">原始碼</a>。" +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30 +msgid "Terms of Service" +msgstr "使用者æ¢æ¬¾" + #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20 msgid "Explore" msgstr "探索" @@ -873,7 +938,7 @@ msgstr "嘿ï¼æ¡è¿Žä¾†åˆ° MediaGoblin ç«™å°ï¼ " msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." -msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 與眾ä¸åŒçš„媒體分享網站。" +msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 超讚的媒體分享架站軟體。" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" @@ -890,13 +955,13 @@ msgid "" "\n" " >Create an account at this site</a>\n" " or" -msgstr "" +msgstr "\n >在本站建立一個帳號</a>\n 或" #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" "\n" " <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">在您自己的伺æœå™¨ä¸Šå®‰è£ MediaGoblin</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -910,13 +975,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "編輯 %(media_title)s 的附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:191 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:207 msgid "Attachments" msgstr "附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:213 msgid "Add attachment" msgstr "新增附件" @@ -933,7 +998,7 @@ msgstr "å–消" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" @@ -943,23 +1008,12 @@ msgstr "儲å˜è®Šæ›´" #: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format msgid "Changing %(username)s's email" -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/change_email.html:40 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45 -msgid "Save" -msgstr "儲å˜" - -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 -#, python-format -msgid "Changing %(username)s's password" -msgstr "更改 %(username)s 的密碼" +msgstr "更改 %(username)s çš„ email ä½å€" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" -msgstr "真的è¦åˆªé™¤ä½¿ç”¨è€…「%(user_name)sã€ä»¥åŠç›¸é—œçš„媒體與留言？" +msgstr "真的è¦åˆªé™¤ä½¿ç”¨è€…「%(user_name)sã€ä»¥åŠæ‰€æœ‰ç›¸é—œçš„媒體與評論？" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" @@ -983,13 +1037,13 @@ msgstr "編輯 %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "æ£åœ¨æ”¹è®Š %(username)s 的帳號è¨å®š" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54 msgid "Delete my account" msgstr "刪除我的帳號" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59 msgid "Email" -msgstr "" +msgstr "Email" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -1014,23 +1068,26 @@ msgid "" "\n" "If you are not %(username)s or didn't request an email change, you can ignore\n" "this email." -msgstr "" +msgstr "您好：\n\n我們è¦ç¢ºèªæ‚¨æ˜¯ %(username)s 。如果確實如æ¤ï¼Œè«‹é»žé¸ä»¥ä¸‹é€£çµä¾†èªè¨¼æ‚¨çš„æ–° email ä½å€ã€‚\n\n%(verification_url)s\n\n如果您ä¸æ˜¯ %(username)s 或沒有è¦æ±‚修改 email ä½å€ï¼Œè«‹å¿½ç•¥é€™å°éƒµä»¶ã€‚" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 msgid "New comments" -msgstr "" +msgstr "æ–°çš„è©•è«–" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/moderation/report.html:55 +#: mediagoblin/templates/mediagoblin/moderation/report.html:117 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:168 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:48 #, python-format msgid "%(formatted_time)s ago" msgstr "%(formatted_time)s å‰" #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 msgid "Mark all read" -msgstr "" +msgstr "全部標示為已讀" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -1043,7 +1100,7 @@ msgstr "這個媒體具有以下標籤：%(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:74 msgid "Download" msgstr "下載" @@ -1067,7 +1124,7 @@ msgstr "您å¯ä»¥åœ¨ <a href=\"http://getfirefox.com\">http://getfirefox.com</a> #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:80 msgid "Original file" msgstr "原始檔案" @@ -1126,30 +1183,231 @@ msgstr "æª”æ¡ˆæ ¼å¼" msgid "Object Height" msgstr "物件高度" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:63 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." msgstr "抱æ‰ï¼Œç”±æ–¼æ‚¨çš„ç€è¦½å™¨ä¸æ”¯æ´ HTML5 影片，本影片無法æ’放" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:66 msgid "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" msgstr "您å¯ä»¥åœ¨ <a href=\"http://getfirefox.com\">http://getfirefox.com</a> å–å¾—å¯ä»¥æ’放æ¤å½±ç‰‡çš„先進ç€è¦½å™¨ã€‚" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:69 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:88 msgid "WebM file (VP8/Vorbis)" -msgstr "" +msgstr "WebM 檔案 (VP8/Vorbis)" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30 +msgid "" +"Here you can track the state of media being processed on this instance." +msgstr "æ¤è™•æ‚¨å¯ä»¥è¿½è¹¤æœ¬ç«™å°è™•ç†åª’體的狀態。" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 +msgid "Media in-processing" +msgstr "媒體處ç†ä¸" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56 +msgid "No media in-processing" +msgstr "沒有æ£åœ¨è™•ç†ä¸çš„媒體" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 +msgid "These uploads failed to process:" +msgstr "無法處ç†é€™äº›ä¸Šå‚³å…§å®¹ï¼š" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 +msgid "No failed entries!" +msgstr "沒有失敗的紀錄ï¼" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93 +msgid "Last 10 successful uploads" +msgstr "最近 10 次æˆåŠŸä¸Šå‚³çš„紀錄" + +#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 +msgid "No processed entries, yet!" +msgstr "ç¾åœ¨é‚„沒有處ç†çš„紀錄ï¼" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:27 +msgid "Sorry, no such report found." +msgstr "抱æ‰ï¼Œæ‰¾ä¸åˆ°è©²å›žå ±ã€‚" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:32 +msgid "Return to Reports Panel" +msgstr "å›žåˆ°å›žå ±é¢æ¿" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:33 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:155 +msgid "Report" +msgstr "å›žå ±" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:36 +msgid "Reported comment" +msgstr "å·²ç¶“å›žå ±çš„è©•è«–" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:81 +#, python-format +msgid "" +"\n" +" â– Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n" +" " +msgstr "\n â– è©²åª’é«”çš„å›žå ±ä¾†è‡ª <a href=\"%(user_url)s\">%(user_name)s</a>\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:90 +#, python-format +msgid "" +"\n" +" CONTENT BY\n" +" <a href=\"%(user_url)s\"> %(user_name)s</a>\n" +" HAS BEEN DELETED\n" +" " +msgstr "\n <a href=\"%(user_url)s\"> %(user_name)s</a>\n 的內容已被刪除\n " + +#: mediagoblin/templates/mediagoblin/moderation/report.html:130 +msgid "Resolve" +msgstr "處ç†" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:134 +#: mediagoblin/templates/mediagoblin/moderation/report.html:153 +msgid "Resolve This Report" +msgstr "處ç†é€™é …å›žå ±" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:145 +msgid "Status" +msgstr "狀態" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:147 +msgid "RESOLVED" +msgstr "已經處ç†" + +#: mediagoblin/templates/mediagoblin/moderation/report.html:155 +msgid "You cannot take action against an administrator" +msgstr "您ä¸èƒ½å°ç®¡ç†è€…進行æ“作" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27 +msgid "Report panel" +msgstr "å›žå ±é¢æ¿" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30 +msgid "" +"\n" +" Here you can look up open reports that have been filed by users.\n" +" " +msgstr "\n 在這裡您å¯ä»¥çœ‹åˆ°å°šæœªè™•ç†çš„ä½¿ç”¨è€…å›žå ±\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35 +msgid "Active Reports Filed" +msgstr "å·²é€å‡ºçš„ç¾è¡Œå›žå ±" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171 +msgid "Offender" +msgstr "被告" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78 +msgid "When Reported" +msgstr "å›žå ±æ™‚é–“" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173 +msgid "Reported By" +msgstr "原告" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80 +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174 +msgid "Reason" +msgstr "ç†ç”±" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94 +#, python-format +msgid "" +"\n" +" Comment Report #%(report_id)s\n" +" " +msgstr "\nè©•è«–å›žå ± #%(report_id)s" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109 +#, python-format +msgid "" +"\n" +" Media Report #%(report_id)s\n" +" " +msgstr "\nåª’é«”å›žå ± #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123 +msgid "No open reports found." +msgstr "沒有尚未處ç†çš„å›žå ±ã€‚" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125 +msgid "Closed Reports" +msgstr "å·²çµæ¡ˆçš„å›žå ±" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170 +msgid "Resolved" +msgstr "已處ç†" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172 +msgid "Action Taken" +msgstr "發生時間" + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185 +#, python-format +msgid "" +"\n" +" Closed Report #%(report_id)s\n" +" " +msgstr "\nå·²çµæ¡ˆå›žå ± #%(report_id)s\n " + +#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199 +msgid "No closed reports found." +msgstr "找ä¸åˆ°å·²çµæ¡ˆçš„å›žå ±ã€‚" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21 +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26 +msgid "User panel" +msgstr "使用者é¢æ¿" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29 +msgid "" +"\n" +" Here you can look up users in order to take punitive actions on them.\n" +" " +msgstr "\n在這裡您å¯ä»¥æŸ¥è©¢ä½¿ç”¨è€…，以進行å„é …è™•ç½®ã€‚ " + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34 +msgid "Active Users" +msgstr "活動ä¸çš„使用者" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75 +msgid "ID" +msgstr "ID" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77 +msgid "When Joined" +msgstr "åŠ å…¥æ™‚é–“" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78 +msgid "# of Comments Posted" +msgstr "張貼評論數" + +#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95 +msgid "No users found." +msgstr "找ä¸åˆ°è©²ä½¿ç”¨è€…。" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" msgstr "新增è’è—" -#: mediagoblin/templates/mediagoblin/submit/start.html:23 -#: mediagoblin/templates/mediagoblin/submit/start.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:28 +#: mediagoblin/templates/mediagoblin/submit/start.html:35 msgid "Add your media" msgstr "åŠ å…¥æ‚¨çš„åª’é«”" @@ -1198,7 +1456,7 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> çš„è’è—" msgid "" "Hi %(username)s,\n" "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n" -msgstr "%(username)s 您好：\n%(comment_author)s 在 %(instance_name)s å°æ‚¨çš„內容 (%(comment_url)s) 張貼留言\n" +msgstr "%(username)s 您好：\n%(comment_author)s 在 %(instance_name)s å°æ‚¨çš„內容 (%(comment_url)s) 張貼評論\n" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 #, python-format @@ -1224,17 +1482,17 @@ msgstr "â– ç€è¦½ <a href=\"%(user_url)s\">%(username)s</a> 的媒體" #: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" -msgstr "新增留言" +msgstr "新增評論" #: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" -msgstr "å¢žåŠ ç•™è¨€" +msgstr "å¢žåŠ è©•è«–" #: mediagoblin/templates/mediagoblin/user_pages/media.html:112 msgid "Comment Preview" -msgstr "" +msgstr "è©•è«–é 覽" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:166 msgid "Added" msgstr "新增於" @@ -1261,85 +1519,107 @@ msgstr "您å¯ä»¥åœ¨é€™è£¡è¿½è¹¤æ‚¨çš„è—廊ä¸åª’體處ç†çš„狀態。" msgid "Your last 10 successful uploads" msgstr "您的最近 10 次æˆåŠŸä¸Šå‚³çš„紀錄" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:31 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:89 -#, python-format -msgid "%(username)s's profile" -msgstr "%(username)s 的個人檔案" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:43 -msgid "Sorry, no such user found." -msgstr "抱æ‰ï¼Œæ‰¾ä¸åˆ°é€™å€‹ä½¿ç”¨è€…。" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:50 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:70 -msgid "Email verification needed" -msgstr "需è¦èªè‰é›»å郵件" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:21 +msgid "<h2>File a Report</h2>" +msgstr "<h2>寄é€å›žå ±</h2>" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:53 -msgid "Almost done! Your account still needs to be activated." -msgstr "快完æˆäº†ï¼ä½†æ‚¨éœ€è¦å•Ÿç”¨æ‚¨çš„帳號。" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:58 -msgid "" -"An email should arrive in a few moments with instructions on how to do so." -msgstr "啟用æ¥é©Ÿçš„ email 將會寄到您的信箱。" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:62 -msgid "In case it doesn't:" -msgstr "如果ä»ç„¶ç„¡æ³•èªè‰ï¼Œæ‚¨å¯ä»¥ï¼š" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:65 -msgid "Resend verification email" -msgstr "é‡é€èªè‰ä¿¡" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:24 +msgid "Reporting this Comment" +msgstr "å›žå ±è©²è©•è«–" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 -msgid "" -"Someone has registered an account with this username, but it still has to be" -" activated." -msgstr "有人用了這個帳號登錄了，但是這個帳號需è¦è¢«å•Ÿç”¨ã€‚" +#: mediagoblin/templates/mediagoblin/user_pages/report.html:60 +msgid "Reporting this Media Entry" +msgstr "å›žå ±è©²åª’é«”é …ç›®" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:79 +#: mediagoblin/templates/mediagoblin/user_pages/report.html:72 #, python-format 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> 然後é‡é€ä¸€æ¬¡ã€‚" +"\n" +" â– Published by <a href=\"%(user_url)s\"\n" +" class=\"comment_authorlink\">%(username)s</a>\n" +" " +msgstr "\nâ– ç”± <a href=\"%(user_url)s\"\nclass=\"comment_authorlink\">%(username)s</a> 發佈\n " + +#: mediagoblin/templates/mediagoblin/user_pages/report.html:81 +msgid "File Report " +msgstr "é€å‡ºå›žå ±" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:45 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25 +#, python-format +msgid "%(username)s's profile" +msgstr "%(username)s 的個人檔案" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:96 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:52 msgid "Here's a spot to tell others about yourself." msgstr "這個地方能讓您å‘他人介紹自己。" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "Edit profile" msgstr "編輯個人檔案" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:61 msgid "This user hasn't filled in their profile (yet)." msgstr "這個使用者(é‚„)沒有填寫個人檔案。" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:80 msgid "Browse collections" msgstr "ç€è¦½è’è—" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:93 #, python-format msgid "View all of %(username)s's media" msgstr "查看 %(username)s 的全部媒體" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." msgstr "æ¤è™•æ˜¯æ‚¨çš„媒體會出ç¾çš„åœ°æ–¹ï¼Œä½†æ˜¯ä¼¼ä¹Žé‚„æ²’æœ‰åŠ å…¥ä»»ä½•æ±è¥¿ã€‚" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:162 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "那裡好åƒé‚„沒有任何的媒體…" +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40 +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60 +msgid "Email verification needed" +msgstr "需è¦èªè‰é›»å郵件" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43 +msgid "Almost done! Your account still needs to be activated." +msgstr "快完æˆäº†ï¼ä½†æ‚¨éœ€è¦å•Ÿç”¨æ‚¨çš„帳號。" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48 +msgid "" +"An email should arrive in a few moments with instructions on how to do so." +msgstr "啟用æ¥é©Ÿçš„ email 將會寄到您的信箱。" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52 +msgid "In case it doesn't:" +msgstr "如果ä»ç„¶ç„¡æ³•èªè‰ï¼Œæ‚¨å¯ä»¥ï¼š" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55 +msgid "Resend verification email" +msgstr "é‡é€èªè‰ä¿¡" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63 +msgid "" +"Someone has registered an account with this username, but it still has to be" +" activated." +msgstr "有人用了這個帳號登錄了，但是這個帳號需è¦è¢«å•Ÿç”¨ã€‚" + +#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68 +#, python-format +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/utils/collection_gallery.html:49 msgid "(remove)" msgstr " (移除)" @@ -1388,6 +1668,10 @@ msgstr "æ›´æ–°çš„" msgid "older" msgstr "更舊的" +#: mediagoblin/templates/mediagoblin/utils/report.html:25 +msgid "Report media" +msgstr "å›žå ±åª’é«”" + #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" msgstr "標籤" @@ -1396,34 +1680,34 @@ msgstr "標籤" msgid "Could not read the image file." msgstr "無法讀å–圖片檔案。" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:38 msgid "Oops!" msgstr "糟糕ï¼" -#: mediagoblin/tools/response.py:37 +#: mediagoblin/tools/response.py:39 msgid "An error occured" msgstr "發生錯誤" -#: mediagoblin/tools/response.py:51 +#: mediagoblin/tools/response.py:53 msgid "Bad Request" -msgstr "" +msgstr "錯誤的請求" -#: mediagoblin/tools/response.py:53 +#: mediagoblin/tools/response.py:55 msgid "The request sent to the server is invalid, please double check it" -msgstr "" +msgstr "傳é€åˆ°æ¤ä¼ºæœå™¨çš„請求無效，請å†ä¸‰ç¢ºèª" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:63 msgid "Operation not allowed" msgstr "æ“作ä¸å…許" -#: mediagoblin/tools/response.py:61 +#: mediagoblin/tools/response.py:64 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Dave å°ä¸èµ·ï¼Œæˆ‘ä¸èƒ½è®“ä½ é€™æ¨£åšï¼</p><p>您æ£åœ¨è©¦è‘—æ“作ä¸å…許您使用的功能。您打算刪除所有使用者的帳號嗎？" -#: mediagoblin/tools/response.py:69 +#: mediagoblin/tools/response.py:72 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -1456,13 +1740,13 @@ msgstr "分" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "留言" +msgstr "è©•è«–" #: mediagoblin/user_pages/forms.py:25 msgid "" "You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " "target=\"_blank\">Markdown</a> for formatting." -msgstr "" +msgstr "您å¯ä»¥ä½¿ç”¨ <a href=\"http://markdown.tw\" target=\"_blank\">Markdown</a> 來排版。" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1489,19 +1773,23 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "您å¯ä»¥ä½¿ç”¨\n<a href=\"http://markdown.tw\" target=\"_blank\">\nMarkdown</a> 來排版。" -#: mediagoblin/user_pages/views.py:179 +#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61 +msgid "Reason for Reporting" +msgstr "å›žå ±ç†ç”±" + +#: mediagoblin/user_pages/views.py:178 msgid "Sorry, comments are disabled." -msgstr "抱æ‰ï¼Œç•™è¨€è¢«é—œé–‰ã€‚" +msgstr "抱æ‰ï¼Œè©•è«–被關閉了。" -#: mediagoblin/user_pages/views.py:184 +#: mediagoblin/user_pages/views.py:183 msgid "Oops, your comment was empty." -msgstr "啊，您的留言是空的。" +msgstr "啊，您的評論是空的。" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:189 msgid "Your comment has been posted!" -msgstr "您的留言已經張貼完æˆï¼" +msgstr "您的評論已經張貼完æˆï¼" #: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." @@ -1521,43 +1809,43 @@ msgstr "「%sã€å·²ç¶“在「%sã€è’è—" msgid "\"%s\" added to collection \"%s\"" msgstr "「%sã€åŠ 入「%sã€è’è—" -#: mediagoblin/user_pages/views.py:302 +#: mediagoblin/user_pages/views.py:307 msgid "You deleted the media." msgstr "您已經刪除æ¤åª’體。" -#: mediagoblin/user_pages/views.py:314 +#: mediagoblin/user_pages/views.py:319 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾é¸ç¢ºèªï¼Œè©²åª’體沒有被移除。" -#: mediagoblin/user_pages/views.py:321 +#: mediagoblin/user_pages/views.py:326 msgid "You are about to delete another user's media. Proceed with caution." msgstr "您æ£åœ¨åˆªé™¤åˆ¥äººçš„媒體，請å°å¿ƒæ“作。" -#: mediagoblin/user_pages/views.py:395 +#: mediagoblin/user_pages/views.py:399 msgid "You deleted the item from the collection." msgstr "您已經從該è’è—ä¸åˆªé™¤è©²é …目。" -#: mediagoblin/user_pages/views.py:399 +#: mediagoblin/user_pages/views.py:403 msgid "The item was not removed because you didn't check that you were sure." msgstr "由於您沒有勾é¸ç¢ºèªï¼Œè©²é …目沒有被移除。" -#: mediagoblin/user_pages/views.py:407 +#: mediagoblin/user_pages/views.py:411 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您æ£åœ¨å¾žåˆ¥äººçš„è’è—ä¸åˆªé™¤é …目，請å°å¿ƒæ“作。" -#: mediagoblin/user_pages/views.py:440 +#: mediagoblin/user_pages/views.py:443 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%sã€è’è—。" -#: mediagoblin/user_pages/views.py:447 +#: mediagoblin/user_pages/views.py:450 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾é¸ç¢ºèªï¼Œè©²è’è—沒有被移除。" -#: mediagoblin/user_pages/views.py:455 +#: mediagoblin/user_pages/views.py:458 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您æ£åœ¨åˆªé™¤åˆ¥äººçš„è’è—，請å°å¿ƒæ“作。" diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py index 134157dc..80ae633b 100644 --- a/mediagoblin/media_types/__init__.py +++ b/mediagoblin/media_types/__init__.py @@ -50,23 +50,23 @@ class MediaManagerBase(object): return hasattr(self, i) -def sniff_media(media): +def sniff_media(media_file, filename): ''' Iterate through the enabled media types and find those suited for a certain file. ''' try: - return get_media_type_and_manager(media.filename) + return get_media_type_and_manager(filename) except FileTypeNotSupported: _log.info('No media handler found by file extension. Doing it the expensive way...') # Create a temporary file for sniffers suchs as GStreamer-based # Audio video - media_file = tempfile.NamedTemporaryFile() - media_file.write(media.stream.read()) - media.stream.seek(0) + tmp_media_file = tempfile.NamedTemporaryFile() + tmp_media_file.write(media_file.read()) + tmp_media_file.seek(0) - media_type = hook_handle('sniff_handler', media_file, media=media) + media_type = hook_handle('sniff_handler', tmp_media_file, filename) if media_type: _log.info('{0} accepts the file'.format(media_type)) return media_type, hook_handle(('media_manager', media_type)) diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index 3b287877..84030362 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -36,14 +36,14 @@ SUPPORTED_EXTENSIONS = ['txt', 'asc', 'nfo'] MEDIA_TYPE = 'mediagoblin.media_types.ascii' -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): _log.info('Sniffing {0}'.format(MEDIA_TYPE)) - if kw.get('media') is not None: - name, ext = os.path.splitext(kw['media'].filename) - clean_ext = ext[1:].lower() - if clean_ext in SUPPORTED_EXTENSIONS: - return MEDIA_TYPE + name, ext = os.path.splitext(filename) + clean_ext = ext[1:].lower() + + if clean_ext in SUPPORTED_EXTENSIONS: + return MEDIA_TYPE return None @@ -120,6 +120,9 @@ class CommonAsciiProcessor(MediaProcessor): thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_resizing(font, thumb_size): + return + tmp_thumb = os.path.join( self.conversions_subdir, self.name_builder.fill('{basename}.thumbnail.png')) @@ -144,10 +147,34 @@ class CommonAsciiProcessor(MediaProcessor): Image.ANTIALIAS) thumb.save(thumb_file) + thumb_info = {'font': font, + 'width': thumb_size[0], + 'height': thumb_size[1]} + _log.debug('Copying local file to public storage') store_public(self.entry, 'thumb', tmp_thumb, self.name_builder.fill('{basename}.thumbnail.jpg')) + self.entry.set_file_metadata('thumb', **thumb_info) + + + def _skip_resizing(self, font, thumb_size): + thumb_info = self.entry.get_file_metadata('thumb') + + if not thumb_info: + return False + + skip = True + + if thumb_info.get('font') != font: + skip = False + elif thumb_info.get('width') != thumb_size[0]: + skip = False + elif thumb_info.get('height') != thumb_size[1]: + skip = False + + return skip + class InitialProcessor(CommonAsciiProcessor): """ diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py index d0716448..f12f231e 100644 --- a/mediagoblin/media_types/audio/processing.py +++ b/mediagoblin/media_types/audio/processing.py @@ -33,7 +33,7 @@ _log = logging.getLogger(__name__) MEDIA_TYPE = 'mediagoblin.media_types.audio' -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): _log.info('Sniffing {0}'.format(MEDIA_TYPE)) try: transcoder = AudioTranscoder() @@ -87,10 +87,34 @@ class CommonAudioProcessor(MediaProcessor): self.entry.media_files['best_quality'] = self.entry \ .media_files['webm_audio'] + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + skip = True + + if not file_metadata: + return False + + if keyname == 'webm_audio': + if kwargs.get('quality') != file_metadata.get('quality'): + skip = False + elif keyname == 'spectrogram': + if kwargs.get('max_width') != file_metadata.get('max_width'): + skip = False + elif kwargs.get('fft_size') != file_metadata.get('fft_size'): + skip = False + elif keyname == 'thumb': + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def transcode(self, quality=None): if not quality: quality = self.audio_config['quality'] + if self._skip_processing('webm_audio', quality=quality): + return + progress_callback = ProgressCallback(self.entry) webm_audio_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( @@ -110,12 +134,18 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'webm_audio', webm_audio_tmp, self.name_builder.fill('{basename}.medium.webm')) + self.entry.set_file_metadata('webm_audio', **{'quality': quality}) + def create_spectrogram(self, max_width=None, fft_size=None): if not max_width: max_width = mgg.global_config['media:medium']['max_width'] if not fft_size: fft_size = self.audio_config['spectrogram_fft_size'] + if self._skip_processing('spectrogram', max_width=max_width, + fft_size=fft_size): + return + wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( '{basename}.ogg')) @@ -140,12 +170,19 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'spectrogram', spectrogram_tmp, self.name_builder.fill('{basename}.spectrogram.jpg')) + file_metadata = {'max_width': max_width, + 'fft_size': fft_size} + self.entry.set_file_metadata('spectrogram', **file_metadata) + def generate_thumb(self, size=None): if not size: max_width = mgg.global_config['media:thumb']['max_width'] max_height = mgg.global_config['media:thumb']['max_height'] size = (max_width, max_height) + if self._skip_processing('thumb', size=size): + return + thumb_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( '{basename}-thumbnail.jpg')) @@ -166,6 +203,8 @@ class CommonAudioProcessor(MediaProcessor): store_public(self.entry, 'thumb', thumb_tmp, self.name_builder.fill('{basename}.thumbnail.jpg')) + self.entry.set_file_metadata('thumb', **{'size': size}) + class InitialProcessor(CommonAudioProcessor): """ diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 4c7bdb15..1db82ee7 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -76,6 +76,14 @@ def resize_image(entry, resized, keyname, target_name, new_size, resized.save(resized_file, quality=quality) store_public(entry, keyname, tmp_resized_filename, target_name) + # store the thumb/medium info + image_info = {'width': new_size[0], + 'height': new_size[1], + 'quality': quality, + 'filter': filter} + + entry.set_file_metadata(keyname, **image_info) + def resize_tool(entry, force, keyname, orig_file, target_name, @@ -86,6 +94,13 @@ def resize_tool(entry, max_height = mgg.global_config['media:' + keyname]['max_height'] new_size = (max_width, max_height) + # If thumb or medium is already the same quality and size, then don't + # reprocess + if _skip_resizing(entry, keyname, new_size, quality, filter): + _log.info('{0} of same size and quality already in use, skipping ' + 'resizing of media {1}.'.format(keyname, entry.id)) + return + # If the size of the original file exceeds the specified size for the desized # file, a target_name file is created and later associated with the media # entry. @@ -105,24 +120,46 @@ def resize_tool(entry, quality, filter) +def _skip_resizing(entry, keyname, size, quality, filter): + """ + Determines wither the saved thumb or medium is of the same quality and size + """ + image_info = entry.get_file_metadata(keyname) + + if not image_info: + return False + + skip = True + + if image_info.get('width') != size[0]: + skip = False + + elif image_info.get('height') != size[1]: + skip = False + + elif image_info.get('filter') != filter: + skip = False + + elif image_info.get('quality') != quality: + skip = False + + return skip + + SUPPORTED_FILETYPES = ['png', 'gif', 'jpg', 'jpeg', 'tiff'] -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): _log.info('Sniffing {0}'.format(MEDIA_TYPE)) - if kw.get('media') is not None: # That's a double negative! - name, ext = os.path.splitext(kw['media'].filename) - clean_ext = ext[1:].lower() # Strip the . from ext and make lowercase - - if clean_ext in SUPPORTED_FILETYPES: - _log.info('Found file extension in supported filetypes') - return MEDIA_TYPE - else: - _log.debug('Media present, extension not found in {0}'.format( - SUPPORTED_FILETYPES)) + name, ext = os.path.splitext(filename) + clean_ext = ext[1:].lower() # Strip the . from ext and make lowercase + + if clean_ext in SUPPORTED_FILETYPES: + _log.info('Found file extension in supported filetypes') + return MEDIA_TYPE else: - _log.warning('Need additional information (keyword argument \'media\')' - ' to be able to handle sniffing') + _log.debug('Media present, extension not found in {0}'.format( + SUPPORTED_FILETYPES)) return None diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py index 549def69..6fb0b782 100644 --- a/mediagoblin/media_types/pdf/processing.py +++ b/mediagoblin/media_types/pdf/processing.py @@ -168,18 +168,16 @@ def check_prerequisites(): return False return True -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): _log.info('Sniffing {0}'.format(MEDIA_TYPE)) if not check_prerequisites(): return None - if kw.get('media') is not None: - name, ext = os.path.splitext(kw['media'].filename) - clean_ext = ext[1:].lower() - if clean_ext in supported_extensions(): - return MEDIA_TYPE + name, ext = os.path.splitext(filename) + clean_ext = ext[1:].lower() - return None + if clean_ext in supported_extensions(): + return MEDIA_TYPE def create_pdf_thumb(original, thumb_filename, width, height): # Note: pdftocairo adds '.png', remove it @@ -261,6 +259,22 @@ class CommonPdfProcessor(MediaProcessor): else: self.pdf_filename = self._generate_pdf() + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + skip = True + + if not file_metadata: + return False + + if keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + elif keyname == 'medium': + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def copy_original(self): copy_original( self.entry, self.process_filename, @@ -271,6 +285,9 @@ class CommonPdfProcessor(MediaProcessor): thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + # Note: pdftocairo adds '.png', so don't include an ext thumb_filename = os.path.join(self.workbench.dir, self.name_builder.fill( @@ -288,6 +305,8 @@ class CommonPdfProcessor(MediaProcessor): store_public(self.entry, 'thumb', thumb_filename + '.png', self.name_builder.fill('{basename}.thumbnail.png')) + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) + def _generate_pdf(self): """ Store the pdf. If the file is not a pdf, make it a pdf @@ -317,6 +336,9 @@ class CommonPdfProcessor(MediaProcessor): size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('medium', size=size): + return + # Note: pdftocairo adds '.png', so don't include an ext filename = os.path.join(self.workbench.dir, self.name_builder.fill('{basename}.medium')) @@ -333,6 +355,8 @@ class CommonPdfProcessor(MediaProcessor): store_public(self.entry, 'medium', filename + '.png', self.name_builder.fill('{basename}.medium.png')) + self.entry.set_file_metadata('medium', size=size) + class InitialProcessor(CommonPdfProcessor): """ diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 77d3d86e..65a86234 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -47,21 +47,18 @@ BLEND_SCRIPT = pkg_resources.resource_filename( 'blender_render.py')) -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): _log.info('Sniffing {0}'.format(MEDIA_TYPE)) - if kw.get('media') is not None: - name, ext = os.path.splitext(kw['media'].filename) - clean_ext = ext[1:].lower() - if clean_ext in SUPPORTED_FILETYPES: - _log.info('Found file extension in supported filetypes') - return MEDIA_TYPE - else: - _log.debug('Media present, extension not found in {0}'.format( - SUPPORTED_FILETYPES)) + name, ext = os.path.splitext(filename) + clean_ext = ext[1:].lower() + + if clean_ext in SUPPORTED_FILETYPES: + _log.info('Found file extension in supported filetypes') + return MEDIA_TYPE else: - _log.warning('Need additional information (keyword argument \'media\')' - ' to be able to handle sniffing') + _log.debug('Media present, extension not found in {0}'.format( + SUPPORTED_FILETYPES)) return None @@ -144,11 +141,30 @@ class CommonStlProcessor(MediaProcessor): # copy it up! store_public(self.entry, keyname, workbench_path, filename) + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + + if not file_metadata: + return False + skip = True + + if keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + else: + if kwargs.get('size') != file_metadata.get('size'): + skip = False + + return skip + def generate_thumb(self, thumb_size=None): if not thumb_size: thumb_size = (mgg.global_config['media:thumb']['max_width'], mgg.global_config['media:thumb']['max_height']) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + self._snap( "thumb", "{basename}.thumb.jpg", @@ -156,11 +172,16 @@ class CommonStlProcessor(MediaProcessor): thumb_size, project="PERSP") + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) + def generate_perspective(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('perspective', size=size): + return + self._snap( "perspective", "{basename}.perspective.jpg", @@ -168,11 +189,16 @@ class CommonStlProcessor(MediaProcessor): size, project="PERSP") + self.entry.set_file_metadata('perspective', size=size) + def generate_topview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('top', size=size): + return + self._snap( "top", "{basename}.top.jpg", @@ -180,11 +206,16 @@ class CommonStlProcessor(MediaProcessor): self.greatest*2], size) + self.entry.set_file_metadata('top', size=size) + def generate_frontview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('front', size=size): + return + self._snap( "front", "{basename}.front.jpg", @@ -192,11 +223,16 @@ class CommonStlProcessor(MediaProcessor): self.model.average[2]], size) + self.entry.set_file_metadata('front', size=size) + def generate_sideview(self, size=None): if not size: size = (mgg.global_config['media:medium']['max_width'], mgg.global_config['media:medium']['max_height']) + if self._skip_processing('side', size=size): + return + self._snap( "side", "{basename}.side.jpg", @@ -204,6 +240,8 @@ class CommonStlProcessor(MediaProcessor): self.model.average[2]], size) + self.entry.set_file_metadata('side', size=size) + def store_dimensions(self): """ Put model dimensions into the database diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 4d1d5ea2..eb5a062c 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -44,7 +44,7 @@ class VideoTranscodingFail(BaseProcessingFail): general_message = _(u'Video transcoding failed') -def sniff_handler(media_file, **kw): +def sniff_handler(media_file, filename): transcoder = transcoders.VideoTranscoder() data = transcoder.discover(media_file.name) @@ -52,8 +52,7 @@ def sniff_handler(media_file, **kw): _log.debug('Discovered: {0}'.format(data)) if not data: - _log.error('Could not discover {0}'.format( - kw.get('media'))) + _log.error('Could not discover {0}'.format(filename)) return None if data['is_video'] is True: @@ -155,6 +154,29 @@ class CommonVideoProcessor(MediaProcessor): self.entry.media_files['best_quality'] = self.entry \ .media_files['webm_video'] + def _skip_processing(self, keyname, **kwargs): + file_metadata = self.entry.get_file_metadata(keyname) + + if not file_metadata: + return False + skip = True + + if keyname == 'webm_video': + if kwargs.get('medium_size') != file_metadata.get('medium_size'): + skip = False + elif kwargs.get('vp8_quality') != file_metadata.get('vp8_quality'): + skip = False + elif kwargs.get('vp8_threads') != file_metadata.get('vp8_threads'): + skip = False + elif kwargs.get('vorbis_quality') != \ + file_metadata.get('vorbis_quality'): + skip = False + elif keyname == 'thumb': + if kwargs.get('thumb_size') != file_metadata.get('thumb_size'): + skip = False + + return skip + def transcode(self, medium_size=None, vp8_quality=None, vp8_threads=None, vorbis_quality=None): @@ -173,6 +195,14 @@ class CommonVideoProcessor(MediaProcessor): if not vorbis_quality: vorbis_quality = self.video_config['vorbis_quality'] + file_metadata = {'medium_size': medium_size, + 'vp8_threads': vp8_threads, + 'vp8_quality': vp8_quality, + 'vorbis_quality': vorbis_quality} + + if self._skip_processing('webm_video', **file_metadata): + return + # Extract metadata and keep a record of it metadata = self.transcoder.discover(self.process_filename) store_metadata(self.entry, metadata) @@ -209,6 +239,8 @@ class CommonVideoProcessor(MediaProcessor): self.name_builder.fill('{basename}.medium.webm')) _log.debug('Saved medium') + self.entry.set_file_metadata('webm_video', **file_metadata) + self.did_transcode = True # Save the width and height of the transcoded video @@ -225,6 +257,9 @@ class CommonVideoProcessor(MediaProcessor): if not thumb_size: thumb_size = (mgg.global_config['media:thumb']['max_width'],) + if self._skip_processing('thumb', thumb_size=thumb_size): + return + # We will only use the width so that the correct scale is kept transcoders.VideoThumbnailerMarkII( self.process_filename, @@ -236,6 +271,7 @@ class CommonVideoProcessor(MediaProcessor): store_public(self.entry, 'thumb', tmp_thumb, self.name_builder.fill('{basename}.thumbnail.jpg')) + self.entry.set_file_metadata('thumb', thumb_size=thumb_size) class InitialProcessor(CommonVideoProcessor): """ diff --git a/mediagoblin/admin/__init__.py b/mediagoblin/moderation/__init__.py index 719b56e7..719b56e7 100644 --- a/mediagoblin/admin/__init__.py +++ b/mediagoblin/moderation/__init__.py diff --git a/mediagoblin/moderation/forms.py b/mediagoblin/moderation/forms.py new file mode 100644 index 00000000..72305b29 --- /dev/null +++ b/mediagoblin/moderation/forms.py @@ -0,0 +1,149 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import wtforms +from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ + +ACTION_CHOICES = [ + (u'takeaway', _(u'Take away privilege')), + (u'userban', _(u'Ban the user')), + (u'sendmessage', _(u'Send the user a message')), + (u'delete', _(u'Delete the content'))] + +class MultiCheckboxField(wtforms.SelectMultipleField): + """ + A multiple-select, except displays a list of checkboxes. + + Iterating the field will produce subfields, allowing custom rendering of + the enclosed checkbox fields. + + code from http://wtforms.simplecodes.com/docs/1.0.4/specific_problems.html + """ + widget = wtforms.widgets.ListWidget(prefix_label=False) + option_widget = wtforms.widgets.CheckboxInput() + + +# ============ Forms for mediagoblin.moderation.user page ================== # + +class PrivilegeAddRemoveForm(wtforms.Form): + """ + This form is used by an admin to give/take away a privilege directly from + their user page. + """ + privilege_name = wtforms.HiddenField('',[wtforms.validators.required()]) + +class BanForm(wtforms.Form): + """ + This form is used by an admin to ban a user directly from their user page. + """ + user_banned_until = wtforms.DateField( + _(u'User will be banned until:'), + format='%Y-%m-%d', + validators=[wtforms.validators.optional()]) + why_user_was_banned = wtforms.TextAreaField( + _(u'Why are you banning this User?'), + validators=[wtforms.validators.optional()]) + +# =========== Forms for mediagoblin.moderation.report page ================= # + +class ReportResolutionForm(wtforms.Form): + """ + This form carries all the information necessary to take punitive actions + against a user who created content that has been reported. + + :param action_to_resolve A list of Unicode objects representing + a choice from the ACTION_CHOICES const- + -ant. Every choice passed affects what + punitive actions will be taken against + the user. + + :param targeted_user A HiddenField object that holds the id + of the user that was reported. + + :param take_away_privileges A list of Unicode objects which repres- + -ent the privileges that are being tak- + -en away. This field is optional and + only relevant if u'takeaway' is in the + `action_to_resolve` list. + + :param user_banned_until A DateField object that holds the date + that the user will be unbanned. This + field is optional and only relevant if + u'userban' is in the action_to_resolve + list. If the user is being banned and + this field is blank, the user is banned + indefinitely. + + :param why_user_was_banned A TextArea object that holds the + reason that a user was banned, to disp- + -lay to them when they try to log in. + This field is optional and only relevant + if u'userban' is in the + `action_to_resolve` list. + + :param message_to_user A TextArea object that holds a message + which will be emailed to the user. This + is only relevant if the u'sendmessage' + option is in the `action_to_resolve` + list. + + :param resolution_content A TextArea object that is required for + every report filed. It represents the + reasons that the moderator/admin resol- + -ved the report in such a way. + """ + action_to_resolve = MultiCheckboxField( + _(u'What action will you take to resolve the report?'), + validators=[wtforms.validators.optional()], + choices=ACTION_CHOICES) + targeted_user = wtforms.HiddenField('', + validators=[wtforms.validators.required()]) + take_away_privileges = wtforms.SelectMultipleField( + _(u'What privileges will you take away?'), + validators=[wtforms.validators.optional()]) + user_banned_until = wtforms.DateField( + _(u'User will be banned until:'), + format='%Y-%m-%d', + validators=[wtforms.validators.optional()]) + why_user_was_banned = wtforms.TextAreaField( + validators=[wtforms.validators.optional()]) + message_to_user = wtforms.TextAreaField( + validators=[wtforms.validators.optional()]) + resolution_content = wtforms.TextAreaField() + +# ======== Forms for mediagoblin.moderation.report_panel page ============== # + +class ReportPanelSortingForm(wtforms.Form): + """ + This form is used for sorting and filtering through different reports in + the mediagoblin.moderation.reports_panel view. + + """ + active_p = wtforms.IntegerField( + validators=[wtforms.validators.optional()]) + closed_p = wtforms.IntegerField( + validators=[wtforms.validators.optional()]) + reported_user = wtforms.IntegerField( + validators=[wtforms.validators.optional()]) + reporter = wtforms.IntegerField( + validators=[wtforms.validators.optional()]) + +class UserPanelSortingForm(wtforms.Form): + """ + This form is used for sorting different reports. + """ + p = wtforms.IntegerField( + validators=[wtforms.validators.optional()]) diff --git a/mediagoblin/moderation/routing.py b/mediagoblin/moderation/routing.py new file mode 100644 index 00000000..ba10bc6d --- /dev/null +++ b/mediagoblin/moderation/routing.py @@ -0,0 +1,38 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +moderation_routes = [ + ('mediagoblin.moderation.media_panel', + '/media/', + 'mediagoblin.moderation.views:moderation_media_processing_panel'), + ('mediagoblin.moderation.users', + '/users/', + 'mediagoblin.moderation.views:moderation_users_panel'), + ('mediagoblin.moderation.reports', + '/reports/', + 'mediagoblin.moderation.views:moderation_reports_panel'), + ('mediagoblin.moderation.users_detail', + '/users/<string:user>/', + 'mediagoblin.moderation.views:moderation_users_detail'), + ('mediagoblin.moderation.give_or_take_away_privilege', + '/users/<string:user>/privilege/', + 'mediagoblin.moderation.views:give_or_take_away_privilege'), + ('mediagoblin.moderation.ban_or_unban', + '/users/<string:user>/ban/', + 'mediagoblin.moderation.views:ban_or_unban'), + ('mediagoblin.moderation.reports_detail', + '/reports/<int:report_id>/', + 'mediagoblin.moderation.views:moderation_reports_detail')] diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py new file mode 100644 index 00000000..e0337536 --- /dev/null +++ b/mediagoblin/moderation/tools.py @@ -0,0 +1,217 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from mediagoblin import mg_globals +from mediagoblin.db.models import User, Privilege, UserBan +from mediagoblin.db.base import Session +from mediagoblin.tools.mail import send_email +from mediagoblin.tools.response import redirect +from datetime import datetime +from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ + +def take_punitive_actions(request, form, report, user): + message_body ='' + + # The bulk of this action is running through all of the different + # punitive actions that a moderator could take. + if u'takeaway' in form.action_to_resolve.data: + for privilege_name in form.take_away_privileges.data: + take_away_privileges(user.username, privilege_name) + form.resolution_content.data += \ + u"\n{mod} took away {user}\'s {privilege} privileges.".format( + mod=request.user.username, + user=user.username, + privilege=privilege_name) + + # If the moderator elects to ban the user, a new instance of user_ban + # will be created. + if u'userban' in form.action_to_resolve.data: + user_ban = ban_user(form.targeted_user.data, + expiration_date=form.user_banned_until.data, + reason=form.why_user_was_banned.data) + Session.add(user_ban) + form.resolution_content.data += \ + u"\n{mod} banned user {user} {expiration_date}.".format( + mod=request.user.username, + user=user.username, + expiration_date = ( + "until {date}".format(date=form.user_banned_until.data) + if form.user_banned_until.data + else "indefinitely" + ) + ) + + # If the moderator elects to send a warning message. An email will be + # sent to the email address given at sign up + if u'sendmessage' in form.action_to_resolve.data: + message_body = form.message_to_user.data + form.resolution_content.data += \ + u"\n{mod} sent a warning email to the {user}.".format( + mod=request.user.username, + user=user.username) + + if u'delete' in form.action_to_resolve.data and \ + report.is_comment_report(): + deleted_comment = report.comment + Session.delete(deleted_comment) + form.resolution_content.data += \ + u"\n{mod} deleted the comment.".format( + mod=request.user.username) + elif u'delete' in form.action_to_resolve.data and \ + report.is_media_entry_report(): + deleted_media = report.media_entry + deleted_media.delete() + form.resolution_content.data += \ + u"\n{mod} deleted the media entry.".format( + mod=request.user.username) + report.archive( + resolver_id=request.user.id, + resolved=datetime.now(), + result=form.resolution_content.data) + + Session.add(report) + Session.commit() + if message_body: + send_email( + mg_globals.app_config['email_sender_address'], + [user.email], + _('Warning from')+ '- {moderator} '.format( + moderator=request.user.username), + message_body) + + return redirect( + request, + 'mediagoblin.moderation.users_detail', + user=user.username) + + +def take_away_privileges(user,*privileges): + """ + Take away all of the privileges passed as arguments. + + :param user A Unicode object representing the target user's + User.username value. + + :param privileges A variable number of Unicode objects describing + the privileges being taken away. + + + :returns True If ALL of the privileges were taken away + successfully. + + :returns False If ANY of the privileges were not taken away + successfully. This means the user did not have + (one of) the privilege(s) to begin with. + """ + if len(privileges) == 1: + privilege = Privilege.query.filter( + Privilege.privilege_name==privileges[0]).first() + user = User.query.filter( + User.username==user).first() + if privilege in user.all_privileges: + user.all_privileges.remove(privilege) + return True + return False + + elif len(privileges) > 1: + return (take_away_privileges(user, privileges[0]) and \ + take_away_privileges(user, *privileges[1:])) + +def give_privileges(user,*privileges): + """ + Take away all of the privileges passed as arguments. + + :param user A Unicode object representing the target user's + User.username value. + + :param privileges A variable number of Unicode objects describing + the privileges being granted. + + + :returns True If ALL of the privileges were granted successf- + -ully. + + :returns False If ANY of the privileges were not granted succ- + essfully. This means the user already had (one + of) the privilege(s) to begin with. + """ + if len(privileges) == 1: + privilege = Privilege.query.filter( + Privilege.privilege_name==privileges[0]).first() + user = User.query.filter( + User.username==user).first() + if privilege not in user.all_privileges: + user.all_privileges.append(privilege) + return True + return False + + elif len(privileges) > 1: + return (give_privileges(user, privileges[0]) and \ + give_privileges(user, *privileges[1:])) + +def ban_user(user_id, expiration_date=None, reason=None): + """ + This function is used to ban a user. If the user is already banned, the + function returns False. If the user is not already banned, this function + bans the user using the arguments to build a new UserBan object. + + :returns False if the user is already banned and the ban is not updated + :returns UserBan object if there is a new ban that was created. + """ + user_ban =UserBan.query.filter( + UserBan.user_id==user_id) + if user_ban.count(): + return False + new_user_ban = UserBan( + user_id=user_id, + expiration_date=expiration_date, + reason=reason) + return new_user_ban + +def unban_user(user_id): + """ + This function is used to unban a user. If the user is not currently banned, + nothing happens. + + :returns True if the operation was completed successfully and the user + has been unbanned + :returns False if the user was never banned. + """ + user_ban = UserBan.query.filter( + UserBan.user_id==user_id) + if user_ban.count() == 0: + return False + user_ban.first().delete() + return True + +def parse_report_panel_settings(form): + """ + This function parses the url arguments to which are used to filter reports + in the reports panel view. More filters can be added to make a usuable + search function. + + :returns A dictionary of sqlalchemy-usable filters. + """ + filters = {} + + if form.validate(): + filters['reported_user_id'] = form.reported_user.data + filters['reporter_id'] = form.reporter.data + + filters = dict((k, v) + for k, v in filters.iteritems() if v) + + return filters diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py new file mode 100644 index 00000000..f4de11ad --- /dev/null +++ b/mediagoblin/moderation/views.py @@ -0,0 +1,219 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +from mediagoblin.db.models import (MediaEntry, User,ReportBase, Privilege, + UserBan) +from mediagoblin.decorators import (require_admin_or_moderator_login, + active_user_from_url, user_has_privilege, + allow_reporting) +from mediagoblin.tools.response import render_to_response, redirect +from mediagoblin.moderation import forms as moderation_forms +from mediagoblin.moderation.tools import (take_punitive_actions, \ + take_away_privileges, give_privileges, ban_user, unban_user, \ + parse_report_panel_settings) +from math import ceil + +@require_admin_or_moderator_login +def moderation_media_processing_panel(request): + ''' + Show the global media processing panel for this instance + ''' + processing_entries = MediaEntry.query.filter_by(state = u'processing').\ + order_by(MediaEntry.created.desc()) + + # Get media entries which have failed to process + failed_entries = MediaEntry.query.filter_by(state = u'failed').\ + order_by(MediaEntry.created.desc()) + + processed_entries = MediaEntry.query.filter_by(state = u'processed').\ + order_by(MediaEntry.created.desc()).limit(10) + + # Render to response + return render_to_response( + request, + 'mediagoblin/moderation/media_panel.html', + {'processing_entries': processing_entries, + 'failed_entries': failed_entries, + 'processed_entries': processed_entries}) + +@require_admin_or_moderator_login +def moderation_users_panel(request): + ''' + Show the global panel for monitoring users in this instance + ''' + current_page = 1 + if len(request.args) > 0: + form = moderation_forms.UserPanelSortingForm(request.args) + if form.validate(): + current_page = form.p.data or 1 + + all_user_list = User.query + user_list = all_user_list.order_by( + User.created.desc()).offset( + (current_page-1)*10).limit(10) + last_page = int(ceil(all_user_list.count()/10.)) + + return render_to_response( + request, + 'mediagoblin/moderation/user_panel.html', + {'user_list': user_list, + 'current_page':current_page, + 'last_page':last_page}) + +@require_admin_or_moderator_login +def moderation_users_detail(request): + ''' + Shows details about a particular user. + ''' + user = User.query.filter_by(username=request.matchdict['user']).first() + active_reports = user.reports_filed_on.filter( + ReportBase.resolved==None).limit(5) + closed_reports = user.reports_filed_on.filter( + ReportBase.resolved!=None).all() + privileges = Privilege.query + user_banned = UserBan.query.get(user.id) + ban_form = moderation_forms.BanForm() + + return render_to_response( + request, + 'mediagoblin/moderation/user.html', + {'user':user, + 'privileges': privileges, + 'reports':active_reports, + 'user_banned':user_banned, + 'ban_form':ban_form}) + +@require_admin_or_moderator_login +@allow_reporting +def moderation_reports_panel(request): + ''' + Show the global panel for monitoring reports filed against comments or + media entries for this instance. + ''' + filters = [] + active_settings, closed_settings = {'current_page':1}, {'current_page':1} + + if len(request.args) > 0: + form = moderation_forms.ReportPanelSortingForm(request.args) + if form.validate(): + filters = parse_report_panel_settings(form) + active_settings['current_page'] = form.active_p.data or 1 + closed_settings['current_page'] = form.closed_p.data or 1 + filters = [ + getattr(ReportBase,key)==val + for key,val in filters.viewitems()] + + all_active = ReportBase.query.filter( + ReportBase.resolved==None).filter( + *filters) + all_closed = ReportBase.query.filter( + ReportBase.resolved!=None).filter( + *filters) + + # report_list and closed_report_list are the two lists of up to 10 + # items which are actually passed to the user in this request + report_list = all_active.order_by( + ReportBase.created.desc()).offset( + (active_settings['current_page']-1)*10).limit(10) + closed_report_list = all_closed.order_by( + ReportBase.created.desc()).offset( + (closed_settings['current_page']-1)*10).limit(10) + + active_settings['last_page'] = int(ceil(all_active.count()/10.)) + closed_settings['last_page'] = int(ceil(all_closed.count()/10.)) + # Render to response + return render_to_response( + request, + 'mediagoblin/moderation/report_panel.html', + {'report_list':report_list, + 'closed_report_list':closed_report_list, + 'active_settings':active_settings, + 'closed_settings':closed_settings}) + +@require_admin_or_moderator_login +@allow_reporting +def moderation_reports_detail(request): + """ + This is the page an admin or moderator goes to see the details of a report. + The report can be resolved or unresolved. This is also the page that a mod- + erator would go to to take an action to resolve a report. + """ + form = moderation_forms.ReportResolutionForm(request.form) + report = ReportBase.query.get(request.matchdict['report_id']) + + form.take_away_privileges.choices = [ + (s.privilege_name,s.privilege_name.title()) \ + for s in report.reported_user.all_privileges + ] + + if request.method == "POST" and form.validate() and not ( + not request.user.has_privilege(u'admin') and + report.reported_user.has_privilege(u'admin')): + + user = User.query.get(form.targeted_user.data) + return take_punitive_actions(request, form, report, user) + + + form.targeted_user.data = report.reported_user_id + + return render_to_response( + request, + 'mediagoblin/moderation/report.html', + {'report':report, + 'form':form}) + +@user_has_privilege(u'admin') +@active_user_from_url +def give_or_take_away_privilege(request, url_user): + ''' + A form action to give or take away a particular privilege from a user. + Can only be used by an admin. + ''' + form = moderation_forms.PrivilegeAddRemoveForm(request.form) + if request.method == "POST" and form.validate(): + privilege = Privilege.query.filter( + Privilege.privilege_name==form.privilege_name.data).one() + if not take_away_privileges( + url_user.username, form.privilege_name.data): + + give_privileges(url_user.username, form.privilege_name.data) + url_user.save() + + return redirect( + request, + 'mediagoblin.moderation.users_detail', + user=url_user.username) + +@user_has_privilege(u'admin') +@active_user_from_url +def ban_or_unban(request, url_user): + """ + A page to ban or unban a user. Only can be used by an admin. + """ + form = moderation_forms.BanForm(request.form) + if request.method == "POST" and form.validate(): + already_banned = unban_user(url_user.id) + same_as_requesting_user = (request.user.id == url_user.id) + if not already_banned and not same_as_requesting_user: + user_ban = ban_user(url_user.id, + expiration_date = form.user_banned_until.data, + reason = form.why_user_was_banned.data) + user_ban.save() + return redirect( + request, + 'mediagoblin.moderation.users_detail', + user=url_user.username) diff --git a/mediagoblin/oauth/views.py b/mediagoblin/oauth/views.py index 116eb023..14c8ab14 100644 --- a/mediagoblin/oauth/views.py +++ b/mediagoblin/oauth/views.py @@ -18,12 +18,12 @@ import datetime from oauthlib.oauth1 import (RequestTokenEndpoint, AuthorizationEndpoint, AccessTokenEndpoint) - + from mediagoblin.decorators import require_active_login from mediagoblin.tools.translate import pass_to_ugettext from mediagoblin.meddleware.csrf import csrf_exempt from mediagoblin.tools.request import decode_request -from mediagoblin.tools.response import (render_to_response, redirect, +from mediagoblin.tools.response import (render_to_response, redirect, json_response, render_400, form_response) from mediagoblin.tools.crypto import random_string @@ -41,7 +41,7 @@ client_types = ["web", "native"] # currently what pump supports def client_register(request): """ Endpoint for client registration """ try: - data = decode_request(request) + data = decode_request(request) except ValueError: error = "Could not decode data." return json_response({"error": error}, status=400) @@ -56,7 +56,7 @@ def client_register(request): if data.get("application_type", None) not in client_types: error = "Unknown application_type." return json_response({"error": error}, status=400) - + client_type = data["type"] if client_type == "client_update": @@ -69,7 +69,7 @@ def client_register(request): return json_response({"error": error}, status=400) client = Client.query.filter_by( - id=data["client_id"], + id=data["client_id"], secret=data["client_secret"] ).first() @@ -78,7 +78,7 @@ def client_register(request): return json_response({"error": error}, status=403) client.application_name = data.get( - "application_name", + "application_name", client.application_name ) @@ -108,12 +108,12 @@ def client_register(request): client_secret = random_string(43) # again, seems to be what pump uses expirey = 0 # for now, lets not have it expire expirey_db = None if expirey == 0 else expirey - application_type = data["application_type"] - + application_type = data["application_type"] + # save it client = Client( - id=client_id, - secret=client_secret, + id=client_id, + secret=client_secret, expirey=expirey_db, application_type=application_type, ) @@ -126,12 +126,12 @@ def client_register(request): if logo_url is not None and not validate_url(logo_url): error = "Logo URL {0} is not a valid URL.".format(logo_url) return json_response( - {"error": error}, + {"error": error}, status=400 ) else: client.logo_url = logo_url - + client.application_name = data.get("application_name", None) contacts = data.get("contacts", None) @@ -146,8 +146,8 @@ def client_register(request): # not a valid email error = "Email {0} is not a valid email.".format(contact) return json_response({"error": error}, status=400) - - + + client.contacts = contacts redirect_uris = data.get("redirect_uris", None) @@ -166,7 +166,7 @@ def client_register(request): client.redirect_uri = redirect_uris - + client.save() expirey = 0 if client.expirey is None else client.expirey @@ -182,7 +182,7 @@ def client_register(request): def request_token(request): """ Returns request token """ try: - data = decode_request(request) + data = decode_request(request) except ValueError: error = "Could not decode data." return json_response({"error": error}, status=400) @@ -193,7 +193,7 @@ def request_token(request): if not data and request.headers: data = request.headers - + data = dict(data) # mutableifying authorization = decode_authorization_header(data) @@ -226,12 +226,12 @@ def request_token(request): return form_response(tokens) -@require_active_login +@require_active_login def authorize(request): """ Displays a page for user to authorize """ if request.method == "POST": return authorize_finish(request) - + _ = pass_to_ugettext token = request.args.get("oauth_token", None) if token is None: @@ -243,10 +243,10 @@ def authorize(request): if oauth_request is None: err_msg = _("No request token found.") return render_400(request, err_msg) - + if oauth_request.used: return authorize_finish(request) - + if oauth_request.verifier is None: orequest = GMGRequest(request) request_validator = GMGRequestValidator() @@ -279,7 +279,7 @@ def authorize(request): "mediagoblin/api/authorize.html", context ) - + def authorize_finish(request): """ Finishes the authorize """ @@ -288,7 +288,7 @@ def authorize_finish(request): verifier = request.form["oauth_verifier"] oauth_request = RequestToken.query.filter_by(token=token, verifier=verifier) oauth_request = oauth_request.first() - + if oauth_request is None: # invalid token or verifier err_msg = _("No request token found.") @@ -321,10 +321,10 @@ def authorize_finish(request): @csrf_exempt def access_token(request): - """ Provides an access token based on a valid verifier and request token """ + """ Provides an access token based on a valid verifier and request token """ data = request.headers - parsed_tokens = decode_authorization_header(data) + parsed_tokens = decode_authorization_header(data) if parsed_tokens == dict() or "oauth_token" not in parsed_tokens: error = "Missing required parameter." diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py index b7e74799..69fae7bb 100644 --- a/mediagoblin/plugins/api/views.py +++ b/mediagoblin/plugins/api/views.py @@ -17,17 +17,19 @@ import json import logging -from os.path import splitext -from werkzeug.exceptions import BadRequest, Forbidden +from werkzeug.exceptions import BadRequest from werkzeug.wrappers import Response +from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.response import json_response from mediagoblin.decorators import require_active_login from mediagoblin.meddleware.csrf import csrf_exempt -from mediagoblin.media_types import sniff_media +from mediagoblin.media_types import \ + InvalidFileType, FileTypeNotSupported from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable -from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \ - run_process_media, new_upload_entry +from mediagoblin.submit.lib import \ + check_file_field, submit_media, get_upload_file_limits, \ + FileUploadLimit, UserUploadLimit, UserPastUploadLimit _log = logging.getLogger(__name__) @@ -49,45 +51,46 @@ def post_entry(request): _log.debug('File field not found') raise BadRequest() - media_file = request.files['file'] - - media_type, media_manager = sniff_media(media_file) - - entry = new_upload_entry(request.user) - entry.media_type = unicode(media_type) - entry.title = unicode(request.form.get('title') - or splitext(media_file.filename)[0]) - - entry.description = unicode(request.form.get('description')) - entry.license = unicode(request.form.get('license', '')) - - entry.generate_slug() - - # queue appropriately - queue_file = prepare_queue_task(request.app, entry, media_file.filename) - - with queue_file: - queue_file.write(request.files['file'].stream.read()) - - # Save now so we have this data before kicking off processing - entry.save() - - if request.form.get('callback_url'): - metadata = request.db.ProcessingMetaData() - metadata.media_entry = entry - metadata.callback_url = unicode(request.form['callback_url']) - metadata.save() - - # Pass off to processing - # - # (... don't change entry after this point to avoid race - # conditions with changes to the document via processing code) - feed_url = request.urlgen( - 'mediagoblin.user_pages.atom_feed', - qualified=True, user=request.user.username) - run_process_media(entry, feed_url) - - return json_response(get_entry_serializable(entry, request.urlgen)) + upload_limit, max_file_size = get_upload_file_limits(request.user) + + callback_url = request.form.get('callback_url') + if callback_url: + callback_url = unicode(callback_url) + try: + entry = submit_media( + mg_app=request.app, user=request.user, + submitted_file=request.files['file'], + filename=request.files['file'].filename, + title=unicode(request.form.get('title')), + description=unicode(request.form.get('description')), + license=unicode(request.form.get('license', '')), + upload_limit=upload_limit, max_file_size=max_file_size, + callback_url=callback_url) + + return json_response(get_entry_serializable(entry, request.urlgen)) + + # Handle upload limit issues + except FileUploadLimit: + raise BadRequest( + _(u'Sorry, the file size is too big.')) + except UserUploadLimit: + raise BadRequest( + _('Sorry, uploading this file will put you over your' + ' upload limit.')) + except UserPastUploadLimit: + raise BadRequest( + _('Sorry, you have reached your upload limit.')) + + except Exception as e: + ''' + This section is intended to catch exceptions raised in + mediagoblin.media_types + ''' + if isinstance(e, InvalidFileType) or \ + isinstance(e, FileTypeNotSupported): + raise BadRequest(unicode(e)) + else: + raise @api_auth diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index 33a554b0..64564c7f 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -13,17 +13,45 @@ # # 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/>. +from pkg_resources import resource_filename +import os + from mediagoblin.plugins.basic_auth import forms as auth_forms from mediagoblin.plugins.basic_auth import tools as auth_tools from mediagoblin.auth.tools import create_basic_user from mediagoblin.db.models import User from mediagoblin.tools import pluginapi from sqlalchemy import or_ +from mediagoblin.tools.staticdirect import PluginStatic + + +PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): config = pluginapi.get_config('mediagoblin.plugins.basic_auth') + routes = [ + ('mediagoblin.plugins.basic_auth.edit.pass', + '/edit/password/', + 'mediagoblin.plugins.basic_auth.views:change_pass'), + ('mediagoblin.plugins.basic_auth.forgot_password', + '/auth/forgot_password/', + 'mediagoblin.plugins.basic_auth.views:forgot_password'), + ('mediagoblin.plugins.basic_auth.verify_forgot_password', + '/auth/forgot_password/verify/', + 'mediagoblin.plugins.basic_auth.views:verify_forgot_password')] + + pluginapi.register_routes(routes) + pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) + + pluginapi.register_template_hooks( + {'edit_link': 'mediagoblin/plugins/basic_auth/edit_link.html', + 'fp_link': 'mediagoblin/plugins/basic_auth/fp_link.html', + 'fp_head': 'mediagoblin/plugins/basic_auth/fp_head.html', + 'create_account': + 'mediagoblin/plugins/basic_auth/create_account_link.html'}) + def get_user(**kwargs): username = kwargs.pop('username', None) @@ -85,4 +113,7 @@ hooks = { 'auth_check_password': check_password, 'auth_fake_login_attempt': auth_tools.fake_login_attempt, 'template_global_context': append_to_global_context, + 'static_setup': lambda: PluginStatic( + 'coreplugin_basic_auth', + resource_filename('mediagoblin.plugins.basic_auth', 'static')) } diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py index 6cf01b38..c10496f8 100644 --- a/mediagoblin/plugins/basic_auth/forms.py +++ b/mediagoblin/plugins/basic_auth/forms.py @@ -44,3 +44,33 @@ class LoginForm(wtforms.Form): stay_logged_in = wtforms.BooleanField( label='', description=_('Stay logged in')) + + +class ForgotPassForm(wtforms.Form): + username = wtforms.TextField( + _('Username or email'), + [wtforms.validators.Required(), + normalize_user_or_email_field()]) + + +class ChangeForgotPassForm(wtforms.Form): + password = wtforms.PasswordField( + 'Password', + [wtforms.validators.Required(), + wtforms.validators.Length(min=5, max=1024)]) + token = wtforms.HiddenField( + '', + [wtforms.validators.Required()]) + + +class ChangePassForm(wtforms.Form): + old_password = wtforms.PasswordField( + _('Old password'), + [wtforms.validators.Required()], + description=_( + "Enter your old password to prove you own this account.")) + new_password = wtforms.PasswordField( + _('New password'), + [wtforms.validators.Required(), + wtforms.validators.Length(min=6, max=30)], + id="password") diff --git a/mediagoblin/static/js/autofilledin_password.js b/mediagoblin/plugins/basic_auth/static/js/autofilledin_password.js index 45e867fe..45e867fe 100644 --- a/mediagoblin/static/js/autofilledin_password.js +++ b/mediagoblin/plugins/basic_auth/static/js/autofilledin_password.js diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html index a3cf9cb9..47cd591e 100644 --- a/mediagoblin/templates/mediagoblin/auth/change_fp.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html @@ -29,7 +29,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.verify_forgot_password') }}" method="POST" enctype="multipart/form-data"> {{ csrf_token }} <div class="form_box"> diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html index 2a1ffee0..596a4def 100644 --- a/mediagoblin/templates/mediagoblin/edit/change_pass.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html @@ -31,7 +31,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.edit.pass') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}" method="POST" enctype="multipart/form-data"> <div class="form_box edit_box"> <h1> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html new file mode 100644 index 00000000..7425630b --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html @@ -0,0 +1,27 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block create_account %} + {% if allow_registration %} + <p> + {% trans %}Don't have an account yet?{% endtrans %} + <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> + {%- trans %}Create one here!{% endtrans %}</a> + </p> + {% endif %} +{% endblock %} diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html new file mode 100644 index 00000000..9fd09ab1 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block change_pass_link %} + <p> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}"> + {% trans %}Change your password.{% endtrans %} + </a> + </p> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html index 6cfd2c85..b0028ab6 100644 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html @@ -24,7 +24,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" + <form action="{{ request.urlgen('mediagoblin.plugins.basic_auth.forgot_password') }}" method="POST" enctype="multipart/form-data"> {{ csrf_token }} <div class="form_box"> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html new file mode 100644 index 00000000..292dce28 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_head.html @@ -0,0 +1,20 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# + You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +<script type="text/javascript" + src="{{ request.staticdirect('/js/autofilledin_password.js', 'coreplugin_basic_auth') }}"></script> diff --git a/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html new file mode 100644 index 00000000..404358d8 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block fp_link %} + <p> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.forgot_password') }}" id="forgot_password"> + {% trans %}Forgot your password?{% endtrans %}</a> + </p> +{% endblock %} + diff --git a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_verification_email.txt index fb5e1674..fb5e1674 100644 --- a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt +++ b/mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_verification_email.txt diff --git a/mediagoblin/plugins/basic_auth/tools.py b/mediagoblin/plugins/basic_auth/tools.py index 1300bb9a..f943bf39 100644 --- a/mediagoblin/plugins/basic_auth/tools.py +++ b/mediagoblin/plugins/basic_auth/tools.py @@ -16,6 +16,11 @@ import bcrypt import random +from mediagoblin import mg_globals +from mediagoblin.tools.crypto import get_timed_signer_url +from mediagoblin.tools.mail import send_email +from mediagoblin.tools.template import render_template + def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None): """ @@ -82,3 +87,35 @@ def fake_login_attempt(): randplus_hashed_pass = bcrypt.hashpw(hashed_pass, rand_salt) randplus_stored_hash == randplus_hashed_pass + + +EMAIL_FP_VERIFICATION_TEMPLATE = ( + u"{uri}?" + u"token={fp_verification_key}") + + +def send_fp_verification_email(user, request): + """ + Send the verification email to users to change their password. + + Args: + - user: a user object + - request: the request + """ + fp_verification_key = get_timed_signer_url('mail_verification_token') \ + .dumps(user.id) + + rendered_email = render_template( + request, 'mediagoblin/plugins/basic_auth/fp_verification_email.txt', + {'username': user.username, + 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format( + uri=request.urlgen('mediagoblin.plugins.basic_auth.verify_forgot_password', + qualified=True), + fp_verification_key=fp_verification_key)}) + + # TODO: There is no error handling in place + send_email( + mg_globals.app_config['email_sender_address'], + [user.email], + 'GNU MediaGoblin - Change forgotten password!', + rendered_email) diff --git a/mediagoblin/plugins/basic_auth/views.py b/mediagoblin/plugins/basic_auth/views.py new file mode 100644 index 00000000..02d370f0 --- /dev/null +++ b/mediagoblin/plugins/basic_auth/views.py @@ -0,0 +1,223 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +from itsdangerous import BadSignature + +from mediagoblin import messages +from mediagoblin.db.models import User +from mediagoblin.decorators import require_active_login +from mediagoblin.plugins.basic_auth import forms, tools +from mediagoblin.tools.crypto import get_timed_signer_url +from mediagoblin.tools.mail import email_debug_message +from mediagoblin.tools.response import redirect, render_to_response, render_404 +from mediagoblin.tools.translate import pass_to_ugettext as _ + + +def forgot_password(request): + """ + Forgot password view + + Sends an email with an url to renew forgotten password. + Use GET querystring parameter 'username' to pre-populate the input field + """ + fp_form = forms.ForgotPassForm(request.form, + username=request.args.get('username')) + + if not (request.method == 'POST' and fp_form.validate()): + # Either GET request, or invalid form submitted. Display the template + return render_to_response(request, + 'mediagoblin/plugins/basic_auth/forgot_password.html', + {'fp_form': fp_form}) + + # If we are here: method == POST and form is valid. username casing + # has been sanitized. Store if a user was found by email. We should + # not reveal if the operation was successful then as we don't want to + # leak if an email address exists in the system. + found_by_email = '@' in fp_form.username.data + + if found_by_email: + user = User.query.filter_by( + email=fp_form.username.data).first() + # Don't reveal success in case the lookup happened by email address. + success_message = _("If that email address (case sensitive!) is " + "registered an email has been sent with " + "instructions on how to change your password.") + + else: # found by username + user = User.query.filter_by( + username=fp_form.username.data).first() + + if user is None: + messages.add_message(request, + messages.WARNING, + _("Couldn't find someone with that username.")) + return redirect(request, 'mediagoblin.auth.forgot_password') + + success_message = _("An email has been sent with instructions " + "on how to change your password.") + + if user and user.has_privilege(u'active') is False: + # Don't send reminder because user is inactive or has no verified email + messages.add_message(request, + messages.WARNING, + _("Could not send password recovery email as your username is in" + "active or your account's email address has not been verified.")) + + return redirect(request, 'mediagoblin.user_pages.user_home', + user=user.username) + + # SUCCESS. Send reminder and return to login page + if user: + email_debug_message(request) + tools.send_fp_verification_email(user, request) + + messages.add_message(request, messages.INFO, success_message) + return redirect(request, 'mediagoblin.auth.login') + + +def verify_forgot_password(request): + """ + Check the forgot-password verification and possibly let the user + change their password because of it. + """ + # get form data variables, and specifically check for presence of token + formdata = _process_for_token(request) + if not formdata['has_token']: + return render_404(request) + + formdata_vars = formdata['vars'] + + # Catch error if token is faked or expired + try: + token = get_timed_signer_url("mail_verification_token") \ + .loads(formdata_vars['token'], max_age=10*24*3600) + except BadSignature: + messages.add_message( + request, + messages.ERROR, + _('The verification key or user id is incorrect.')) + + return redirect( + request, + 'index') + + # check if it's a valid user id + user = User.query.filter_by(id=int(token)).first() + + # no user in db + if not user: + messages.add_message( + request, messages.ERROR, + _('The user id is incorrect.')) + return redirect( + request, 'index') + + # check if user active and has email verified + if user.has_privilege(u'active'): + cp_form = forms.ChangeForgotPassForm(formdata_vars) + + if request.method == 'POST' and cp_form.validate(): + user.pw_hash = tools.bcrypt_gen_password_hash( + cp_form.password.data) + user.save() + + messages.add_message( + request, + messages.INFO, + _("You can now log in using your new password.")) + return redirect(request, 'mediagoblin.auth.login') + else: + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_fp.html', + {'cp_form': cp_form}) + + ## Commenting this out temporarily because I'm checking into + ## what's going on with user.email_verified. + ## + ## ... if this commit lasts long enough for anyone but me (cwebber) to + ## notice it, they should pester me to remove this or remove it + ## themselves ;) + # + # if not user.email_verified: + # messages.add_message( + # request, messages.ERROR, + # _('You need to verify your email before you can reset your' + # ' password.')) + + if not user.status == 'active': + messages.add_message( + request, messages.ERROR, + _('You are no longer an active user. Please contact the system' + ' admin to reactivate your account.')) + + return redirect( + request, 'index') + + +def _process_for_token(request): + """ + Checks for tokens in formdata without prior knowledge of request method + + For now, returns whether the userid and token formdata variables exist, and + the formdata variables in a hash. Perhaps an object is warranted? + """ + # retrieve the formdata variables + if request.method == 'GET': + formdata_vars = request.GET + else: + formdata_vars = request.form + + formdata = { + 'vars': formdata_vars, + 'has_token': 'token' in formdata_vars} + + return formdata + + +@require_active_login +def change_pass(request): + form = forms.ChangePassForm(request.form) + user = request.user + + if request.method == 'POST' and form.validate(): + + if not tools.bcrypt_check_password( + form.old_password.data, user.pw_hash): + form.old_password.errors.append( + _('Wrong password')) + + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_pass.html', + {'form': form, + 'user': user}) + + # Password matches + user.pw_hash = tools.bcrypt_gen_password_hash( + form.new_password.data) + user.save() + + messages.add_message( + request, messages.SUCCESS, + _('Your password was changed successfully')) + + return redirect(request, 'mediagoblin.edit.account') + + return render_to_response( + request, + 'mediagoblin/plugins/basic_auth/change_pass.html', + {'form': form, + 'user': user}) diff --git a/mediagoblin/plugins/ldap/README.rst b/mediagoblin/plugins/ldap/README.rst new file mode 100644 index 00000000..ea9a34b3 --- /dev/null +++ b/mediagoblin/plugins/ldap/README.rst @@ -0,0 +1,64 @@ +.. MediaGoblin Documentation + + Written in 2012 by MediaGoblin contributors + + To the extent possible under law, the author(s) have dedicated all + copyright and related and neighboring rights to this software to + the public domain worldwide. This software is distributed without + any warranty. + + You should have received a copy of the CC0 Public Domain + Dedication along with this software. If not, see + <http://creativecommons.org/publicdomain/zero/1.0/>. + +.. _ldap-plugin: + +============= + ldap plugin +============= + +.. Warning:: + This plugin is not compatible with the other authentication plugins. + +This plugin allow your GNU Mediagoblin instance to authenticate against an +LDAP server. + +Set up the ldap plugin +====================== + +1. Install the ``python-ldap`` package. + +2. Add the following to your MediaGoblin .ini file in the ``[plugins]`` section:: + + [[mediagoblin.plugins.ldap]] + +Configuring the ldap plugin +=========================== + +This plugin allows you to use multiple ldap servers for authentication. + +In order to configure a server, add the following to you MediaGoblin .ini file +under the ldap plugin:: + + [[mediagoblin.plugins.ldap]] + [[[server1]]] + LDAP_SERVER_URI = 'ldap://ldap.testathon.net:389' + LDAP_USER_DN_TEMPLATE = 'cn={username},ou=users,dc=testathon,dc=net' + [[[server2]]] + ... + +Make any necessary changes to the above to work with your sever. Make sure +``{username}`` is where the username should be in LDAP_USER_DN_TEMPLATE. + +If you would like to fetch the users email from the ldap server upon account +registration, add ``LDAP_SEARCH_BASE = 'ou=users,dc=testathon,dc=net'`` and +``EMAIL_SEARCH_FIELD = 'mail'`` under you server configuration in your +MediaGoblin .ini file. + +.. Warning:: + By default, this plugin provides no encryption when communicating with the + ldap servers. If you would like to use an SSL connection, change + LDAP_SERVER_URI to use ``ldaps://`` and whichever port you use. Default ldap + port for SSL connections is 636. If you would like to use a TLS connection, + add ``LDAP_START_TLS = 'true'`` under your server configuration in your + MediaGoblin .ini file. diff --git a/mediagoblin/plugins/ldap/__init__.py b/mediagoblin/plugins/ldap/__init__.py new file mode 100644 index 00000000..4673acee --- /dev/null +++ b/mediagoblin/plugins/ldap/__init__.py @@ -0,0 +1,59 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import os + +from mediagoblin.auth.tools import create_basic_user +from mediagoblin.tools import pluginapi + +PLUGIN_DIR = os.path.dirname(__file__) + + +def setup_plugin(): + config = pluginapi.get_config('mediagoblin.plugins.ldap') + + routes = [ + ('mediagoblin.plugins.ldap.register', + '/auth/ldap/register/', + 'mediagoblin.plugins.ldap.views:register'), + ('mediagoblin.plugins.ldap.login', + '/auth/ldap/login/', + 'mediagoblin.plugins.ldap.views:login')] + + pluginapi.register_routes(routes) + pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) + + pluginapi.register_template_hooks( + {'create_account': 'mediagoblin/plugins/ldap/create_account_link.html'}) + + +def create_user(register_form): + if 'username' in register_form and 'password' not in register_form: + return create_basic_user(register_form) + + +def no_pass_redirect(): + return 'ldap' + + +def auth(): + return True + +hooks = { + 'setup': setup_plugin, + 'authentication': auth, + 'auth_no_pass_redirect': no_pass_redirect, + 'auth_create_user': create_user, +} diff --git a/mediagoblin/auth/forms.py b/mediagoblin/plugins/ldap/forms.py index 865502e9..7ec1479e 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/plugins/ldap/forms.py @@ -13,25 +13,28 @@ # # 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 wtforms from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.auth.tools import normalize_user_or_email_field -class ForgotPassForm(wtforms.Form): - username = wtforms.TextField( - _('Username or email'), +class RegisterForm(wtforms.Form): + username = wtforms.HiddenField( + '', [wtforms.validators.Required(), - normalize_user_or_email_field()]) + normalize_user_or_email_field(allow_email=False)]) + email = wtforms.TextField( + _('Email address'), + [wtforms.validators.Required(), + normalize_user_or_email_field(allow_user=False)]) -class ChangePassForm(wtforms.Form): - password = wtforms.PasswordField( - 'Password', +class LoginForm(wtforms.Form): + username = wtforms.TextField( + _('Username'), [wtforms.validators.Required(), - wtforms.validators.Length(min=5, max=1024)]) - token = wtforms.HiddenField( - '', + normalize_user_or_email_field()]) + password = wtforms.PasswordField( + _('Password'), [wtforms.validators.Required()]) diff --git a/mediagoblin/admin/routing.py b/mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html index 29515f12..947e4ae2 100644 --- a/mediagoblin/admin/routing.py +++ b/mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html @@ -1,3 +1,4 @@ +{# # GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # @@ -13,8 +14,12 @@ # # 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/>. +#} -admin_routes = [ - ('mediagoblin.admin.panel', - '/panel', - 'mediagoblin.admin.views:admin_processing_panel')] +{% block create_account %} + {% if allow_registration %} + <p> + {% trans %}Sign in to create an account!{% endtrans %} + </p> + {% endif %} +{% endblock %} diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py new file mode 100644 index 00000000..1c436792 --- /dev/null +++ b/mediagoblin/plugins/ldap/tools.py @@ -0,0 +1,65 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import ldap +import logging + +from mediagoblin.tools import pluginapi + +_log = logging.getLogger(__name__) + + +class LDAP(object): + def __init__(self): + self.ldap_settings = pluginapi.get_config('mediagoblin.plugins.ldap') + + def _connect(self, server): + _log.info('Connecting to {0}.'.format(server['LDAP_SERVER_URI'])) + self.conn = ldap.initialize(server['LDAP_SERVER_URI']) + + if server['LDAP_START_TLS'] == 'true': + _log.info('Initiating TLS') + self.conn.start_tls_s() + + def _get_email(self, server, username): + try: + results = self.conn.search_s(server['LDAP_SEARCH_BASE'], + ldap.SCOPE_SUBTREE, 'uid={0}' + .format(username), + [server['EMAIL_SEARCH_FIELD']]) + + email = results[0][1][server['EMAIL_SEARCH_FIELD']][0] + except KeyError: + email = None + + return email + + def login(self, username, password): + for k, v in self.ldap_settings.iteritems(): + try: + self._connect(v) + user_dn = v['LDAP_USER_DN_TEMPLATE'].format(username=username) + self.conn.simple_bind_s(user_dn, password.encode('utf8')) + email = self._get_email(v, username) + return username, email + + except ldap.LDAPError, e: + _log.info(e) + + finally: + _log.info('Unbinding {0}.'.format(v['LDAP_SERVER_URI'])) + self.conn.unbind() + + return False, None diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py new file mode 100644 index 00000000..aef1bf56 --- /dev/null +++ b/mediagoblin/plugins/ldap/views.py @@ -0,0 +1,104 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +from mediagoblin import mg_globals, messages +from mediagoblin.auth.tools import register_user +from mediagoblin.db.models import User +from mediagoblin.decorators import allow_registration, auth_enabled +from mediagoblin.plugins.ldap import forms +from mediagoblin.plugins.ldap.tools import LDAP +from mediagoblin.tools.translate import pass_to_ugettext as _ +from mediagoblin.tools.response import redirect, render_to_response + + +@auth_enabled +def login(request): + login_form = forms.LoginForm(request.form) + + login_failed = False + + if request.method == 'POST' and login_form.validate(): + l = LDAP() + username, email = l.login(login_form.username.data, + login_form.password.data) + + if username: + user = User.query.filter_by( + username=username).first() + + if user: + # set up login in session + request.session['user_id'] = unicode(user.id) + request.session.save() + + if request.form.get('next'): + return redirect(request, location=request.form['next']) + else: + return redirect(request, "index") + else: + if not mg_globals.app.auth: + messages.add_message( + request, + messages.WARNING, + _('Sorry, authentication is disabled on this ' + 'instance.')) + return redirect(request, 'index') + + register_form = forms.RegisterForm(username=username, + email=email) + + return render_to_response( + request, + 'mediagoblin/auth/register.html', + {'register_form': register_form, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.register')}) + + login_failed = True + + return render_to_response( + request, + 'mediagoblin/auth/login.html', + {'login_form': login_form, + 'next': request.GET.get('next') or request.form.get('next'), + 'login_failed': login_failed, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.login'), + 'allow_registration': mg_globals.app_config["allow_registration"]}) + + +@allow_registration +@auth_enabled +def register(request): + if request.method == 'GET': + return redirect( + request, + 'mediagoblin.plugins.ldap.login') + + register_form = forms.RegisterForm(request.form) + + if register_form.validate(): + user = register_user(request, register_form) + + if user: + # redirect the user to their homepage... there will be a + # message waiting for them to verify their email + return redirect( + request, 'mediagoblin.user_pages.user_home', + user=user.username) + + return render_to_response( + request, + 'mediagoblin/auth/register.html', + {'register_form': register_form, + 'post_url': request.urlgen('mediagoblin.plugins.ldap.register')}) diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html index 8d74c2b9..193a3b2d 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html @@ -20,8 +20,8 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script> + {{ super() }} + {% template_hook("fp_head") %} {% endblock %} {% block title -%} diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py index b639a4cb..bb2de7ab 100644 --- a/mediagoblin/plugins/openid/views.py +++ b/mediagoblin/plugins/openid/views.py @@ -195,11 +195,11 @@ def finish_login(request): return redirect(request, "index") else: # No user, need to register - if not mg_globals.app.auth: + if not mg_globals.app_config['allow_registration']: messages.add_message( request, messages.WARNING, - _('Sorry, authentication is disabled on this instance.')) + _('Sorry, registration is disabled on this instance.')) return redirect(request, 'index') # Get email and nickname from response diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py index ca723189..f913a730 100644 --- a/mediagoblin/plugins/piwigo/views.py +++ b/mediagoblin/plugins/piwigo/views.py @@ -16,17 +16,17 @@ import logging import re -from os.path import splitext -import shutil from werkzeug.exceptions import MethodNotAllowed, BadRequest, NotImplemented from werkzeug.wrappers import BaseResponse +from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.meddleware.csrf import csrf_exempt from mediagoblin.auth.tools import check_login_simple -from mediagoblin.media_types import sniff_media -from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \ - run_process_media, new_upload_entry +from mediagoblin.submit.lib import \ + submit_media, check_file_field, get_upload_file_limits, \ + FileUploadLimit, UserUploadLimit, UserPastUploadLimit + from mediagoblin.user_pages.lib import add_media_to_collection from mediagoblin.db.models import Collection @@ -126,58 +126,40 @@ def pwg_images_addSimple(request): if not check_file_field(request, 'image'): raise BadRequest() - filename = request.files['image'].filename - - # Sniff the submitted media to determine which - # media plugin should handle processing - media_type, media_manager = sniff_media( - request.files['image']) - - # create entry and save in database - entry = new_upload_entry(request.user) - entry.media_type = unicode(media_type) - entry.title = ( - unicode(form.name.data) - or unicode(splitext(filename)[0])) - - entry.description = unicode(form.comment.data) - - ''' - # Process the user's folksonomy "tags" - entry.tags = convert_to_tag_list_of_dicts( - form.tags.data) - ''' - - # Generate a slug from the title - entry.generate_slug() - - queue_file = prepare_queue_task(request.app, entry, filename) - - with queue_file: - shutil.copyfileobj(request.files['image'].stream, - queue_file, - length=4 * 1048576) - - # Save now so we have this data before kicking off processing - entry.save() - - # Pass off to processing - # - # (... don't change entry after this point to avoid race - # conditions with changes to the document via processing code) - feed_url = request.urlgen( - 'mediagoblin.user_pages.atom_feed', - qualified=True, user=request.user.username) - run_process_media(entry, feed_url) - - collection_id = form.category.data - if collection_id > 0: - collection = Collection.query.get(collection_id) - if collection is not None and collection.creator == request.user.id: - add_media_to_collection(collection, entry, "") - - return {'image_id': entry.id, 'url': entry.url_for_self(request.urlgen, - qualified=True)} + upload_limit, max_file_size = get_upload_file_limits(request.user) + + try: + entry = submit_media( + mg_app=request.app, user=request.user, + submitted_file=request.files['image'], + filename=request.files['image'].filename, + title=unicode(form.name.data), + description=unicode(form.comment.data), + upload_limit=upload_limit, max_file_size=max_file_size) + + collection_id = form.category.data + if collection_id > 0: + collection = Collection.query.get(collection_id) + if collection is not None and collection.creator == request.user.id: + add_media_to_collection(collection, entry, "") + + return { + 'image_id': entry.id, + 'url': entry.url_for_self( + request.urlgen, + qualified=True)} + + # Handle upload limit issues + except FileUploadLimit: + raise BadRequest( + _(u'Sorry, the file size is too big.')) + except UserUploadLimit: + raise BadRequest( + _('Sorry, uploading this file will put you over your' + ' upload limit.')) + except UserPastUploadLimit: + raise BadRequest( + _('Sorry, you have reached your upload limit.')) md5sum_matcher = re.compile(r"^[0-9a-fA-F]{32}$") diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 3b36fca9..102fd5de 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -246,8 +246,6 @@ class ProcessingManager(object): try: processor = self.processors[key] except KeyError: - import pdb - pdb.set_trace() raise ProcessorDoesNotExist( "'%s' processor does not exist for this media type" % key) diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 327ed8cc..1393f01c 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -18,7 +18,7 @@ import logging from mediagoblin.tools.routing import add_route, mount, url_map from mediagoblin.tools.pluginapi import PluginManager -from mediagoblin.admin.routing import admin_routes +from mediagoblin.moderation.routing import moderation_routes from mediagoblin.auth.routing import auth_routes @@ -27,8 +27,10 @@ _log = logging.getLogger(__name__) def get_url_map(): add_route('index', '/', 'mediagoblin.views:root_view') + add_route('terms_of_service','/terms_of_service', + 'mediagoblin.views:terms_of_service') mount('/auth', auth_routes) - mount('/a', admin_routes) + mount('/mod', moderation_routes) import mediagoblin.submit.routing import mediagoblin.user_pages.routing diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index cadd019a..7b422167 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -156,6 +156,10 @@ a.logo { margin: 6px 8px 6px 0; } +.fine_print { + font-size: 0.8em; +} + .mediagoblin_content { width: 100%; padding-bottom: 74px; @@ -220,6 +224,7 @@ footer { color: #283F35; } + .button_form { min-width: 99px; margin: 10px 0px 10px 15px; @@ -397,40 +402,40 @@ textarea#description, textarea#bio { /* comments */ -.comment_wrapper { +.comment_wrapper, .report_wrapper { margin-top: 20px; margin-bottom: 20px; } -.comment_wrapper p { +.comment_wrapper p, .report_wrapper p { margin-bottom: 2px; } -.comment_author { +.comment_author, .report_author { padding-top: 4px; font-size: 0.9em; } -a.comment_authorlink { +a.comment_authorlink, a.report_authorlink { text-decoration: none; padding-right: 5px; font-weight: bold; padding-left: 2px; } -a.comment_authorlink:hover { +a.comment_authorlink:hover, a.report_authorlink:hover { text-decoration: underline; } -a.comment_whenlink { +a.comment_whenlink, a.report_whenlink { text-decoration: none; } -a.comment_whenlink:hover { +a.comment_whenlink:hover, a.report_whenlink:hover { text-decoration: underline; } -.comment_content { +.comment_content, .report_content { margin-left: 8px; margin-top: 8px; } @@ -454,6 +459,13 @@ textarea#comment_content { padding-right: 6px; } + +a.report_authorlink, a.report_whenlink { + color: #D486B1; +} + +ul#action_to_resolve {list-style:none; margin-left:10px;} + /* media galleries */ .media_thumbnail { @@ -654,6 +666,38 @@ table.media_panel th { text-align: left; } +/* moderator panels */ + +table.admin_panel { + width: 100% +} + +table.admin_side_panel { + width: 60% +} + +table.admin_panel th, table.admin_side_panel th { + font-weight: bold; + padding-bottom: 4px; + text-align: left; + color: #fff; +} + +table td.user_with_privilege { + font-weight: bold; + color: #86D4B1; +} + +table td.user_without_privilege { + font-weight: bold; + color: #D486B1; +} + +.return_to_panel { + text-align:right; + float: right; + font-size:1.2em +} /* Delete panel */ @@ -662,6 +706,27 @@ table.media_panel th { margin-left: 10px; } +/* code of conduct */ + +#code_of_conduct_list { + margin-left:25px; + margin-bottom: 10px; +} +#code_of_conduct_list li { + margin:5px 0 15px 25px; +} +#code_of_conduct_list strong{ + color:#fff; +} + +.nested_sublist { + margin: 5px 0 10px 25px; + font-size:80%; +} +.nested_sublist li { + margin-bottom: 10px; +} + /* ASCII art and code */ @font-face { diff --git a/mediagoblin/static/images/frontpage_image.png b/mediagoblin/static/images/frontpage_image.png Binary files differdeleted file mode 100644 index 689eb2c2..00000000 --- a/mediagoblin/static/images/frontpage_image.png +++ /dev/null diff --git a/mediagoblin/static/images/home_goblin.xcf b/mediagoblin/static/images/home_goblin.xcf Binary files differnew file mode 100644 index 00000000..e75d6b5f --- /dev/null +++ b/mediagoblin/static/images/home_goblin.xcf diff --git a/mediagoblin/static/images/icon_clipboard.png b/mediagoblin/static/images/icon_clipboard.png Binary files differnew file mode 100644 index 00000000..6f94498b --- /dev/null +++ b/mediagoblin/static/images/icon_clipboard.png diff --git a/mediagoblin/static/images/icon_clipboard_alert.png b/mediagoblin/static/images/icon_clipboard_alert.png Binary files differnew file mode 100644 index 00000000..952c588d --- /dev/null +++ b/mediagoblin/static/images/icon_clipboard_alert.png diff --git a/mediagoblin/static/js/setup_report_forms.js b/mediagoblin/static/js/setup_report_forms.js new file mode 100644 index 00000000..a75a92dd --- /dev/null +++ b/mediagoblin/static/js/setup_report_forms.js @@ -0,0 +1,67 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +function init_report_resolution_form() { + hidden_input_names = { + 'takeaway':['take_away_privileges'], + 'userban':['user_banned_until','why_user_was_banned'], + 'sendmessage':['message_to_user'] +} + init_user_banned_form(); + $('form#resolution_form').hide() + $('#open_resolution_form').click(function() { + $('form#resolution_form').toggle(); + $.each(hidden_input_names, function(key, list){ + $.each(list, function(index, name){ + $('label[for='+name+']').hide(); + $('#'+name).hide(); + }); + }); + }); + $('#action_to_resolve').change(function() { + $('ul#action_to_resolve li input:checked').each(function() { + $.each(hidden_input_names[$(this).val()], function(index, name){ + $('label[for='+name+']').show(); + $('#'+name).show(); + }); + }); + $('ul#action_to_resolve li input:not(:checked)').each(function() { + $.each(hidden_input_names[$(this).val()], function(index, name){ + $('label[for='+name+']').hide(); + $('#'+name).hide(); + }); + }); + }); + $("#submit_this_report").click(function(){ + submit_user_banned_form() + }); +} + +function submit_user_banned_form() { + if ($("#user_banned_until").val() == 'YYYY-MM-DD'){ + $("#user_banned_until").val(""); + } +} + +function init_user_banned_form() { + $('#user_banned_until').val("YYYY-MM-DD") + $("#user_banned_until").focus(function() { + $(this).val(""); + $(this).unbind('focus'); + }); +} diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index 1bbf2cb8..c70e2731 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -16,12 +16,18 @@ import logging import uuid +from os.path import splitext + from werkzeug.utils import secure_filename from werkzeug.datastructures import FileStorage -from mediagoblin.db.models import MediaEntry +from mediagoblin import mg_globals +from mediagoblin.tools.text import convert_to_tag_list_of_dicts +from mediagoblin.db.models import MediaEntry, ProcessingMetaData from mediagoblin.processing import mark_entry_failed from mediagoblin.processing.task import ProcessMedia +from mediagoblin.notifications import add_comment_subscription +from mediagoblin.media_types import sniff_media _log = logging.getLogger(__name__) @@ -47,6 +53,153 @@ def new_upload_entry(user): return entry +def get_upload_file_limits(user): + """ + Get the upload_limit and max_file_size for this user + """ + if user.upload_limit >= 0: + upload_limit = user.upload_limit + else: + upload_limit = mg_globals.app_config.get('upload_limit', None) + + max_file_size = mg_globals.app_config.get('max_file_size', None) + + return upload_limit, max_file_size + + +class UploadLimitError(Exception): + """ + General exception for when an upload will be over some upload limit + """ + pass + + +class FileUploadLimit(UploadLimitError): + """ + This file is over the site upload limit + """ + pass + + +class UserUploadLimit(UploadLimitError): + """ + This file is over the user's particular upload limit + """ + pass + + +class UserPastUploadLimit(UploadLimitError): + """ + The user is *already* past their upload limit! + """ + pass + + + +def submit_media(mg_app, user, submitted_file, filename, + title=None, description=None, + license=None, tags_string=u"", + upload_limit=None, max_file_size=None, + callback_url=None, + # If provided we'll do the feed_url update, otherwise ignore + urlgen=None,): + """ + Args: + - mg_app: The MediaGoblinApp instantiated for this process + - user: the user object this media entry should be associated with + - submitted_file: the file-like object that has the + being-submitted file data in it (this object should really have + a .name attribute which is the filename on disk!) + - filename: the *original* filename of this. Not necessarily the + one on disk being referenced by submitted_file. + - title: title for this media entry + - description: description for this media entry + - license: license for this media entry + - tags_string: comma separated string of tags to be associated + with this entry + - upload_limit: size in megabytes that's the per-user upload limit + - max_file_size: maximum size each file can be that's uploaded + - callback_url: possible post-hook to call after submission + - urlgen: if provided, used to do the feed_url update + """ + if upload_limit and user.uploaded >= upload_limit: + raise UserPastUploadLimit() + + # If the filename contains non ascii generate a unique name + if not all(ord(c) < 128 for c in filename): + filename = unicode(uuid.uuid4()) + splitext(filename)[-1] + + # Sniff the submitted media to determine which + # media plugin should handle processing + media_type, media_manager = sniff_media(submitted_file, filename) + + # create entry and save in database + entry = new_upload_entry(user) + entry.media_type = media_type + entry.title = (title or unicode(splitext(filename)[0])) + + entry.description = description or u"" + + entry.license = license or None + + # Process the user's folksonomy "tags" + entry.tags = convert_to_tag_list_of_dicts(tags_string) + + # Generate a slug from the title + entry.generate_slug() + + queue_file = prepare_queue_task(mg_app, entry, filename) + + with queue_file: + queue_file.write(submitted_file.read()) + + # Get file size and round to 2 decimal places + file_size = mg_app.queue_store.get_file_size( + entry.queued_media_file) / (1024.0 * 1024) + file_size = float('{0:.2f}'.format(file_size)) + + # Check if file size is over the limit + if max_file_size and file_size >= max_file_size: + raise FileUploadLimit() + + # Check if user is over upload limit + if upload_limit and (user.uploaded + file_size) >= upload_limit: + raise UserUploadLimit() + + user.uploaded = user.uploaded + file_size + user.save() + + entry.file_size = file_size + + # Save now so we have this data before kicking off processing + entry.save() + + # Various "submit to stuff" things, callbackurl and this silly urlgen + # thing + if callback_url: + metadata = ProcessingMetaData() + metadata.media_entry = entry + metadata.callback_url = callback_url + metadata.save() + + if urlgen: + feed_url = urlgen( + 'mediagoblin.user_pages.atom_feed', + qualified=True, user=user.username) + else: + feed_url = None + + # Pass off to processing + # + # (... don't change entry after this point to avoid race + # conditions with changes to the document via processing code) + run_process_media(entry, feed_url) + + add_comment_subscription(user, entry) + + return entry + + def prepare_queue_task(app, entry, filename): """ Prepare a MediaEntry for the processing queue and get a queue file diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 7f7dee33..42c378a8 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -16,55 +16,38 @@ from mediagoblin import messages import mediagoblin.mg_globals as mg_globals -from os.path import splitext import logging -import uuid _log = logging.getLogger(__name__) -from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.response import render_to_response, redirect -from mediagoblin.decorators import require_active_login +from mediagoblin.decorators import require_active_login, user_has_privilege from mediagoblin.submit import forms as submit_forms from mediagoblin.messages import add_message, SUCCESS -from mediagoblin.media_types import sniff_media, \ +from mediagoblin.media_types import \ InvalidFileType, FileTypeNotSupported -from mediagoblin.submit.lib import check_file_field, prepare_queue_task, \ - run_process_media, new_upload_entry - -from mediagoblin.notifications import add_comment_subscription +from mediagoblin.submit.lib import \ + check_file_field, submit_media, get_upload_file_limits, \ + FileUploadLimit, UserUploadLimit, UserPastUploadLimit @require_active_login +@user_has_privilege(u'uploader') def submit_start(request): """ First view for submitting a file. """ - user = request.user - if user.upload_limit >= 0: - upload_limit = user.upload_limit - else: - upload_limit = mg_globals.app_config.get('upload_limit', None) - - if upload_limit and user.uploaded >= upload_limit: - messages.add_message( - request, - messages.WARNING, - _('Sorry, you have reached your upload limit.')) - return redirect(request, "mediagoblin.user_pages.user_home", - user=request.user.username) - - max_file_size = mg_globals.app_config.get('max_file_size', None) + upload_limit, max_file_size = get_upload_file_limits(request.user) submit_form = submit_forms.get_submit_start_form( request.form, license=request.user.license_preference, max_file_size=max_file_size, upload_limit=upload_limit, - uploaded=user.uploaded) + uploaded=request.user.uploaded) if request.method == 'POST' and submit_form.validate(): if not check_file_field(request, 'file'): @@ -72,83 +55,39 @@ def submit_start(request): _(u'You must provide a file.')) else: try: - filename = request.files['file'].filename - - # If the filename contains non ascii generate a unique name - if not all(ord(c) < 128 for c in filename): - filename = unicode(uuid.uuid4()) + splitext(filename)[-1] - - # Sniff the submitted media to determine which - # media plugin should handle processing - media_type, media_manager = sniff_media( - request.files['file']) - - # create entry and save in database - entry = new_upload_entry(request.user) - entry.media_type = unicode(media_type) - entry.title = ( - unicode(submit_form.title.data) - or unicode(splitext(request.files['file'].filename)[0])) - - entry.description = unicode(submit_form.description.data) - - entry.license = unicode(submit_form.license.data) or None - - # Process the user's folksonomy "tags" - entry.tags = convert_to_tag_list_of_dicts( - submit_form.tags.data) - - # Generate a slug from the title - entry.generate_slug() - - queue_file = prepare_queue_task(request.app, entry, filename) - - with queue_file: - queue_file.write(request.files['file'].stream.read()) - - # Get file size and round to 2 decimal places - file_size = request.app.queue_store.get_file_size( - entry.queued_media_file) / (1024.0 * 1024) - file_size = float('{0:.2f}'.format(file_size)) - - error = False - - # Check if file size is over the limit - if max_file_size and file_size >= max_file_size: - submit_form.file.errors.append( - _(u'Sorry, the file size is too big.')) - error = True - - # Check if user is over upload limit - if upload_limit and (user.uploaded + file_size) >= upload_limit: - submit_form.file.errors.append( - _('Sorry, uploading this file will put you over your' - ' upload limit.')) - error = True - - if not error: - user.uploaded = user.uploaded + file_size - user.save() - - entry.file_size = file_size - - # Save now so we have this data before kicking off processing - entry.save() - - # Pass off to processing - # - # (... don't change entry after this point to avoid race - # conditions with changes to the document via processing code) - feed_url = request.urlgen( - 'mediagoblin.user_pages.atom_feed', - qualified=True, user=request.user.username) - run_process_media(entry, feed_url) - add_message(request, SUCCESS, _('Woohoo! Submitted!')) - - add_comment_subscription(request.user, entry) + submit_media( + mg_app=request.app, user=request.user, + submitted_file=request.files['file'], + filename=request.files['file'].filename, + title=unicode(submit_form.title.data), + description=unicode(submit_form.description.data), + license=unicode(submit_form.license.data) or None, + tags_string=submit_form.tags.data, + upload_limit=upload_limit, max_file_size=max_file_size, + urlgen=request.urlgen) + + add_message(request, SUCCESS, _('Woohoo! Submitted!')) + + return redirect(request, "mediagoblin.user_pages.user_home", + user=request.user.username) + + + # Handle upload limit issues + except FileUploadLimit: + submit_form.file.errors.append( + _(u'Sorry, the file size is too big.')) + except UserUploadLimit: + submit_form.file.errors.append( + _('Sorry, uploading this file will put you over your' + ' upload limit.')) + except UserPastUploadLimit: + messages.add_message( + request, + messages.WARNING, + _('Sorry, you have reached your upload limit.')) + return redirect(request, "mediagoblin.user_pages.user_home", + user=request.user.username) - return redirect(request, "mediagoblin.user_pages.user_home", - user=user.username) except Exception as e: ''' This section is intended to catch exceptions raised in diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 3329b5d0..93cd82d9 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -20,8 +20,8 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script> + {{ super() }} + {% template_hook("fp_head") %} {% endblock %} {% block title -%} @@ -39,21 +39,10 @@ {% trans %}Logging in failed!{% endtrans %} </div> {% endif %} - {% if allow_registration %} - <p> - {% trans %}Don't have an account yet?{% endtrans %} - <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> - {%- trans %}Create one here!{% endtrans %}</a> - </p> - {% endif %} + {% template_hook("create_account") %} {% template_hook("login_link") %} {{ wtforms_util.render_divs(login_form, True) }} - {% if pass_auth %} - <p> - <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password"> - {% trans %}Forgot your password?{% endtrans %}</a> - </p> - {% endif %} + {% template_hook("fp_link") %} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/> </div> diff --git a/mediagoblin/templates/mediagoblin/banned.html b/mediagoblin/templates/mediagoblin/banned.html new file mode 100644 index 00000000..0b5a6884 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/banned.html @@ -0,0 +1,35 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} + +{% block title %}{% trans %}You are Banned.{% endtrans %}{% endblock %} + +{% block mediagoblin_content %} + <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}" + alt="{% trans %}Image of goblin stressing out{% endtrans %}" /> + + <h1>{% trans %}You have been banned{% endtrans %} + {% if expiration_date %} + {% trans until_when=expiration_date %}until {{ until_when }}{% endtrans %} + {% else %} + {% trans %}indefinitely{% endtrans %} + {% endif %} + </h2> + <p>{{ reason|safe }}</p> + <div class="clear"></div> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index eb37e25f..df0b94aa 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -62,7 +62,9 @@ {% block mediagoblin_header_title %}{% endblock %} <div class="header_right"> {%- if request.user %} - {% if request.user and request.user.status == 'active' %} + {% if request.user and + request.user.has_privilege('active') and + not request.user.is_banned() %} {% set notification_count = get_notification_count(request.user.id) %} {% if notification_count %} @@ -71,7 +73,7 @@ {% endif %} <a href="javascript:;" class="button_action header_dropdown_down">▼</a> <a href="javascript:;" class="button_action header_dropdown_up">▲</a> - {% elif request.user and request.user.status == "needs_email_verification" %} + {% elif request.user and not request.user.has_privilege('active') %} {# the following link should only appear when verification is needed #} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user=request.user.username) }}" @@ -84,6 +86,14 @@ "javascript:;" {% endif %} >{% trans %}log out{% endtrans %}</a> + {% elif request.user and request.user.is_banned() %} + <a id="logout" href= + {% if persona is not defined %} + "{{ request.urlgen('mediagoblin.auth.logout') }}" + {% else %} + "javascript:;" + {% endif %} + >{% trans %}log out{% endtrans %}</a> {% endif %} {%- elif auth %} <a href= @@ -98,7 +108,7 @@ {%- endif %} </div> <div class="clear"></div> - {% if request.user and request.user.status == 'active' %} + {% if request.user and request.user.has_privilege('active') %} <div class="header_dropdown"> <p> <span class="dropdown_title"> @@ -133,12 +143,20 @@ {%- trans %}Create new collection{% endtrans -%} </a> {% template_hook("create_blog_home") %} - {% if request.user.is_admin %} + {% if request.user.has_privilege('admin','moderator') %} <p> - <span class="dropdown_title">Admin powers:</span> - <a href="{{ request.urlgen('mediagoblin.admin.panel') }}"> + <span class="dropdown_title">Moderation powers:</span> + <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}"> {%- trans %}Media processing panel{% endtrans -%} </a> + · + <a href="{{ request.urlgen('mediagoblin.moderation.users') }}"> + {%- trans %}User management panel{% endtrans -%} + </a> + · + <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}"> + {%- trans %}Report management panel{% endtrans -%} + </a> </p> {% endif %} {% include 'mediagoblin/fragments/header_notifications.html' %} diff --git a/mediagoblin/templates/mediagoblin/bits/base_footer.html b/mediagoblin/templates/mediagoblin/bits/base_footer.html index 80cd41b0..84397be2 100644 --- a/mediagoblin/templates/mediagoblin/bits/base_footer.html +++ b/mediagoblin/templates/mediagoblin/bits/base_footer.html @@ -24,5 +24,12 @@ {% trans source_link=app_config['source_link'] -%} Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. {%- endtrans %} + {% if app_config['show_tos'] %} + <p class="fine_print"> + <a href="{{ request.urlgen('terms_of_service') }}"> + {%- trans %}Terms of Service{%- endtrans %} + </a> + </p> + {% endif %} </footer> {%- endblock mediagoblin_footer -%} diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 14011daa..574fe459 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,6 +41,7 @@ Changing {{ username }}'s account settings {%- endtrans -%} </h1> + {% template_hook("edit_link") %} {{ wtforms_util.render_divs(form, True) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> @@ -59,7 +60,7 @@ </a> {% if pass_auth is defined %} · - <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> + <a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}"> {% trans %}Password{% endtrans %} </a> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index c6f770c1..9386ffcf 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -40,12 +40,8 @@ margin: -1.5em auto auto -2em; } .vjs-play-progress, .vjs-volume-level { - background-color: #561792 !important; + background-color: #86D4B1 !important; } - .vjs-default-skin { - color: #a59ead !important; - } - </style> {%- endblock %} diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/moderation/media_panel.html index 1c3c866e..3c929d4f 100644 --- a/mediagoblin/templates/mediagoblin/admin/panel.html +++ b/mediagoblin/templates/mediagoblin/moderation/media_panel.html @@ -21,6 +21,7 @@ {% trans %}Media processing panel{% endtrans %} — {{ super() }} {%- endblock %} + {% block mediagoblin_content %} <h1>{% trans %}Media processing panel{% endtrans %}</h1> @@ -28,7 +29,7 @@ <p> {% trans %}Here you can track the state of media being processed on this instance.{% endtrans %} </p> - + <h2>{% trans %}Media in-processing{% endtrans %}</h2> {% if processing_entries.count() %} @@ -56,7 +57,7 @@ </table> {% else %} <p><em>{% trans %}No media in-processing{% endtrans %}</em></p> -{% endif %} +{% endif %} <h2>{% trans %}These uploads failed to process:{% endtrans %}</h2> {% if failed_entries.count() %} diff --git a/mediagoblin/templates/mediagoblin/moderation/report.html b/mediagoblin/templates/mediagoblin/moderation/report.html new file mode 100644 index 00000000..cedbd49a --- /dev/null +++ b/mediagoblin/templates/mediagoblin/moderation/report.html @@ -0,0 +1,161 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{%- extends "mediagoblin/base.html" %} +{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} +{%- block mediagoblin_head %} + <script src="{{ request.staticdirect('/js/setup_report_forms.js') }}"> + </script> +{% endblock %} + +{%- block mediagoblin_content %} +{% if not report %} + {% trans %}Sorry, no such report found.{% endtrans %} +{% else %} + <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}" + class="return_to_panel button_action" + title="Return to Reports Panel"> + {% trans %}Return to Reports Panel{% endtrans %}</a> + <h2>{% trans %}Report{% endtrans %} #{{ report.id }}</h2> + {% if report.is_comment_report() and report.comment %} + + {% trans %}Reported comment{% endtrans %}: + {% set comment = report.comment %} + {% set reported_user = comment.get_author %} + <div id="comment-{{ comment.id }}" + class="comment_wrapper"> + <div class="comment_author"> + <img src="{{ request.staticdirect('/images/icon_comment.png') }}" /> + <a href="{{ request.urlgen('mediagoblin.moderation.users_detail', + user=comment.get_author.username) }}" + class="comment_authorlink"> + {{- reported_user.username -}} + </a> + <a href="{{ request.urlgen( + 'mediagoblin.user_pages.media_home.view_comment', + comment=comment.id, + user=comment.get_media_entry.get_uploader.username, + media=comment.get_media_entry.slug_or_id) }}#comment" + class="comment_whenlink"> + <span title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'> + {%- trans formatted_time=timesince(comment.created) -%} + {{ formatted_time }} ago + {%- endtrans -%} + </span></a>: + </div> + <div class=comment_content> + {% autoescape False %} + {{ comment.content_html }} + {% endautoescape %} + </div> + </div> + {% elif report.is_media_entry_report() and report.media_entry %} + + {% set media_entry = report.media_entry %} + <div class="media_thumbnail"> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home', + user=media_entry.get_uploader.username, + media=media_entry.slug_or_id) }}"> + <img src="{{ media_entry.thumb_url}}"/></a> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home', + user=media_entry.get_uploader.username, + media=media_entry.slug_or_id) }}" class=thumb_entry_title> + {{ media_entry.title }}</a> + </div> + <div class=clear></div> + <p> + {% trans user_name=report.reported_user.username, + user_url=request.urlgen( + 'mediagoblin.moderation.users_detail', + user=report.reported_user.username) %} + â– Reported media by <a href="{{ user_url }}">{{ user_name }}</a> + {% endtrans %} + </p> + <div class=clear></div> + {% else %} + <h2>{% trans user_url=request.urlgen( + 'mediagoblin.moderation.users_detail', + user=report.reporter.username), + user_name=report.reported_user.username %} + CONTENT BY + <a href="{{ user_url }}"> {{ user_name }}</a> + HAS BEEN DELETED + {% endtrans %} + </h2> + {% endif %} + Reason for report: + <div id="report-{{ report.id }}" + class="report_wrapper"> + <div class="report_author"> + <img src="{{ request.staticdirect( + '/images/icon_clipboard_alert.png') }}" + alt="Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + Distributed by the GNOME project http://www.gnome.org" /> + <a href="{{ request.urlgen('mediagoblin.moderation.users_detail', + user=report.reporter.username) }}" + class="report_authorlink"> + {{- report.reporter.username -}} + </a> + <a href="{{ request.urlgen('mediagoblin.moderation.reports_detail', + report_id=report.id) }}" + class="report_whenlink"> + <span title='{{- report.created.strftime("%I:%M%p %Y-%m-%d") -}}'> + {%- trans formatted_time=timesince(report.created) -%} + {{ formatted_time }} ago + {%- endtrans -%} + </span> + </a> + </div> + <div class="report_content"> + {{ report.report_content }} + </div> + </div> + {% if not report.is_archived_report() and + not (report.reported_user.has_privilege('admin') and + not request.user.has_privilege('admin')) %} + <input type=button value="{% trans %}Resolve{% endtrans %}" id=open_resolution_form /> + <form action="" method="POST" id=resolution_form> + {{ wtforms_util.render_divs(form) }} + {{ csrf_token }} + <input type=submit id="submit_this_report" value="{% trans %}Resolve This Report{% endtrans %}"/> + </form> + <script> + $(document).ready(function() { + init_report_resolution_form(); + }); + </script> + {% elif report.is_archived_report() %} + <h2><img src="{{ request.staticdirect('/images/icon_clipboard.png') }}" + alt="Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + Distributed by the GNOME project http://www.gnome.org" /> + {% trans %}Status{% endtrans %}: + </h2> + <b>{% trans %}RESOLVED{% endtrans %}</b> + {{ report.resolved.strftime("%I:%M%p %Y-%m-%d") }} + <pre> + <p>{{ report.result }}</p> + </pre> + {% else %} + <input type=button disabled=disabled value="{% trans %}Resolve This Report{% endtrans %}"/> + <p> + {% trans -%} + You cannot take action against an administrator + {%- endtrans %} + </p> + {% endif %} +{% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/moderation/report_panel.html b/mediagoblin/templates/mediagoblin/moderation/report_panel.html new file mode 100644 index 00000000..95b6be80 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/moderation/report_panel.html @@ -0,0 +1,202 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} +{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} + +{% block title -%} + {% trans %}Report panel{% endtrans %} — {{ super() }} +{%- endblock %} + +{% block mediagoblin_content %} + +<h1>{% trans %}Report panel{% endtrans %}</h1> + +<p> + {% trans %} + Here you can look up open reports that have been filed by users. + {% endtrans %} +</p> + +<h2>{% trans %}Active Reports Filed{% endtrans %}</h2> +{% if report_list.count() %} + {% if not active_settings.last_page == 1 %} + {% if 'active_p='~active_settings.current_page in request.query_string %} + {% set query_string = request.query_string %}{% else %} + {% set query_string = +'active_p='~active_settings.current_page~"&"+request.query_string %} + {% endif %} + <div class="right_align"> + {% set first_vis = active_settings.current_page-3 %} + {% set last_vis = active_settings.current_page+3 %} + {% set curr_page = active_settings.current_page %} + {% if 1 == curr_page %}<b>1</b>{% else %} + <a href ="?{{ query_string.replace( + 'active_p='~active_settings.current_page, + 'active_p='~1) }}"> + 1</a>{% endif %} + {% if first_vis > 1 %}...{% endif %} + {% for p in range(first_vis,last_vis+1) %} + {% if p > 1 and p < active_settings.last_page and +curr_page !=p %} + <a href="?{{ query_string.replace( + 'active_p='~active_settings.current_page, + 'active_p='~p) }}"> + {{ p }}</a> + {% elif p > 1 and p < active_settings.last_page %} + <b>{{ p }}</b> + {% endif %} + {% endfor %} + {% if last_vis < active_settings.last_page %}...{% endif %} + {% if active_settings.last_page != curr_page %} + <a href ="?{{ query_string.replace( + 'active_p='~active_settings.current_page, + 'active_p='~active_settings.last_page) }}"> + {{ active_settings.last_page }}</a> + {% else %}<b>{{ active_settings.last_page }}</b> + {% endif %} + </div> + {% endif %} + <table class="admin_panel processing"> + <tr> + <th></th> + <th>{% trans %}Offender{% endtrans %}</th> + <th>{% trans %}When Reported{% endtrans %}</th> + <th>{% trans %}Reported By{% endtrans %}</th> + <th>{% trans %}Reason{% endtrans %}</th> + </tr> + {% for report in report_list %} + <tr> + {% if report.discriminator == "comment_report" %} + <td> + <img + src="{{ request.staticdirect( + '/images/icon_clipboard_alert.png') }}" + alt="Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + Distributed by the GNOME project http://www.gnome.org" /> + <a href="{{ request.urlgen( + 'mediagoblin.moderation.reports_detail', + report_id=report.id) }}"> + {% trans report_id=report.id %} + Comment Report #{{ report_id }} + {% endtrans %} + </a> + </td> + {% elif report.discriminator == "media_report" %} + <td> + <img + src="{{ request.staticdirect( + '/images/icon_clipboard_alert.png') }}" + alt="Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + Distributed by the GNOME project http://www.gnome.org" /> + <a href="{{ request.urlgen( + 'mediagoblin.moderation.reports_detail', + report_id=report.id) }}"> + {% trans report_id=report.id %} + Media Report #{{ report_id }} + {% endtrans %} + </a> + </td> + {% endif %} + <td>{{ report.reported_user.username }}</td> + <td>{{ report.created.strftime("%F %R") }}</td> + <td>{{ report.reporter.username }}</td> + <td>{{ report.report_content[0:20] }}...</td> + </tr> + {% endfor %} + </table> +{% else %} + <p><em>{% trans %}No open reports found.{% endtrans %}</em></p> +{% endif %} +<h2>{% trans %}Closed Reports{% endtrans %}</h2> +{% if closed_report_list.count() %} + {% if not closed_settings.last_page == 1 %} + {% if 'closed_p='~closed_settings.current_page in request.query_string %} + {% set query_string = request.query_string %}{% else %} + {% set query_string = +'closed_p='~closed_settings.current_page~"&"+request.query_string %} + {% endif %} + <div class="right_align"> + {% set first_vis = closed_settings.current_page-3 %} + {% set last_vis = closed_settings.current_page+3 %} + {% set curr_page = closed_settings.current_page %} + {% if not curr_page==1 %} + <a href ="?{{ query_string.replace( + 'closed_p='~closed_settings.current_page, + 'closed_p='~1) }}">1</a> + {% else %} + <b>1 </b> + {% endif %} + {% if first_vis > 1 %}...{% endif %} + {% for p in range(first_vis,last_vis+1) %} + {% if p > 1 and p < closed_settings.last_page and +curr_page !=p %} + <a href="?{{ query_string.replace( + 'closed_p='~closed_settings.current_page, + 'closed_p='~p) }}"> + {{ p }}</a> + + {% elif p > 1 and p < closed_settings.last_page %} + <b>{{ p }}</b> + {% endif %} + {% endfor %} + {% if last_vis < closed_settings.last_page %}...{% endif %} + {% if curr_page != closed_settings.last_page %} + <a href ="?{{ query_string.replace( + 'closed_p='~closed_settings.current_page, + 'closed_p='~closed_settings.last_page) }}"> + {{ closed_settings.last_page }}</a> + {% else %}<b>{{ closed_settings.last_page }}</b> + {% endif %} + </div> + {% endif %} + <table class="media_panel processing"> + <tr> + <th></th> + <th>{% trans %}Resolved{% endtrans %}</th> + <th>{% trans %}Offender{% endtrans %}</th> + <th>{% trans %}Action Taken{% endtrans %}</th> + <th>{% trans %}Reported By{% endtrans %}</th> + <th>{% trans %}Reason{% endtrans %}</th> + </tr> + {% for report in closed_report_list %} + <tr> + <td> + <img + src="{{ request.staticdirect('/images/icon_clipboard.png') }}" + alt="Under a GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + Distributed by the GNOME project http://www.gnome.org" /> + <a href="{{ request.urlgen('mediagoblin.moderation.reports_detail', + report_id=report.id) }}"> + {% trans report_id=report.id %} + Closed Report #{{ report_id }} + {% endtrans %} + </a> + </td> + <td>{{ report.resolved.strftime("%F %R") }}</td> + <td>{{ report.reported_user.username }}</td> + <td>{{ report.created.strftime("%F %R") }}</td> + <td>{{ report.reporter.username }}</td> + <td>{{ report.report_content[:15] }}...</td> + </tr> + {% endfor %} + </table> +{% else %} + <p><em>{% trans %}No closed reports found.{% endtrans %}</em></p> +{% endif %} + +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html new file mode 100644 index 00000000..6335ea12 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -0,0 +1,217 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} +{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} + +{% block title %} + {%- if user -%} + {%- trans username=user.username -%} + User: {{ username }} + {%- endtrans %} — {{ super() }} + {%- else -%} + {{ super() }} + {%- endif -%} +{% endblock %} + +{%- block mediagoblin_head %} + <script src="{{ request.staticdirect('/js/setup_report_forms.js') }}"> + </script> +{% endblock %} + +{% block mediagoblin_content -%} + {# If no user... #} + {% if not user %} + <p>{% trans %}Sorry, no such user found.{% endtrans %}</p> + {# User exists, but needs verification #} + {% elif not user.has_privilege('active') %} + <div class="profile_sidebar empty_space"> + <h1>{% trans %}Email verification needed{% endtrans %}</h1> + <p> + {% trans -%} + Someone has registered an account with this username, but it still has + to be activated. + {%- endtrans %} + </p> + + </div> + + {# Active(?) (or at least verified at some point) user, horray! #} + {% else %} + <a href="{{ request.urlgen('mediagoblin.moderation.users') }}" + class="return_to_panel button_action" + title="Return to Users Panel"> + {% trans %}Return to Users Panel{% endtrans %}</a> + <h1> + {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} + {% if user_banned and user_banned.expiration_date %} + — {% trans expiration_date=user_banned.expiration_date -%} + BANNED until {{ expiration_date }} + {%- endtrans %} + {% elif user_banned %} + — {% trans %}Banned Indefinitely{% endtrans %} + {% endif %} + </h1> + {% if not user.url and not user.bio %} + <div class="profile_sidebar empty_space"> + <p> + {% trans -%} + This user hasn't filled in their profile (yet). + {%- endtrans %} + </p> + {% else %} + <div class="profile_sidebar"> + {% include "mediagoblin/utils/profile.html" %} + {% if request.user and + (request.user.id == user.id or request.user.has_privilege('admin')) %} + <a href="{{ request.urlgen('mediagoblin.edit.profile', + user=user.username) }}"> + {%- trans %}Edit profile{% endtrans -%} + </a> + {% endif %} + {% endif %} + <p> + <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list', + user=user.username) }}"> + {%- trans %}Browse collections{% endtrans -%} + </a> + </p> + </div> + {% endif %} + {% if user %} + <h2> + {%- trans username=user.username -%} + Active Reports on {{ username }} + {%- endtrans -%} + </h2> + {% if reports.count() %} + <table class="admin_side_panel"> + <tr> + <th>{%- trans %}Report ID{% endtrans -%}</th> + <th>{%- trans %}Reported Content{% endtrans -%}</th> + <th>{%- trans %}Description of Report{% endtrans -%}</th> + </tr> + {% for report in reports %} + <tr> + <td> + <img src="{{ request.staticdirect('/images/icon_clipboard.png') }}" /> + <a href="{{ request.urlgen('mediagoblin.moderation.reports_detail', + report_id=report.id) }}"> + {%- trans report_number=report.id -%} + Report #{{ report_number }} + {%- endtrans -%} + </a> + </td> + <td> + {% if report.discriminator == "comment_report" %} + <a>{%- trans %}Reported Comment{% endtrans -%}</a> + {% elif report.discriminator == "media_report" %} + <a>{%- trans %}Reported Media Entry{% endtrans -%}</a> + {% endif %} + </td> + <td>{{ report.report_content[:21] }} + {% if report.report_content|count >20 %}...{% endif %}</td> + <td>{%- trans %}Resolve{% endtrans -%}</td> + </tr> + {% endfor %} + <tr><td></td><td></td> + </table> + {% else %} + {%- trans username=user.username -%} + No active reports filed on {{ username }} + {%- endtrans -%} + {% endif %} + <span class="right_align"> + <a href="{{ request.urlgen( + 'mediagoblin.moderation.reports') }}?reported_user={{user.id}}"> + {%- trans + username=user.username %}All reports on {{ username }}{% endtrans %}</a> + · + <a href="{{ request.urlgen( + 'mediagoblin.moderation.reports') }}?reporter={{user.id}}"> + {%- trans username=user.username -%} + All reports that {{ username }} has filed + {%- endtrans %}</a> + </span> + <span class=clear></span> + <h2>{% trans username=user.username -%} + {{ username }}'s Privileges{% endtrans %}</h2> + <form method=POST action="{{ request.urlgen( + 'mediagoblin.moderation.ban_or_unban', + user=user.username) }}" class="right_align"> + {{ csrf_token }} + {% if request.user.has_privilege('admin') and not user_banned and + not user.id == request.user.id %} + {{ wtforms_util.render_divs(ban_form) }} + <input type=submit class="button_action" + value="{% trans %}Ban User{% endtrans %}" + id="ban_user_submit" /> + {% elif request.user.has_privilege('admin') and + not user.id == request.user.id %} + <input type=submit class="button_action right_align" + value="{% trans %}UnBan User{% endtrans %}" /> + {% endif %} + </form> + <form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege', + user=user.username) }}" + method=post > + <table class="admin_side_panel"> + <tr> + <th>{% trans %}Privilege{% endtrans %}</th> + <th>{% trans %}User Has Privilege{% endtrans %}</th> + </tr> + {% for privilege in privileges %} + <tr> + <td>{{ privilege.privilege_name }}</td> + {% if privilege in user.all_privileges %} + <td class="user_with_privilege"> + {% trans %}Yes{% endtrans %}{% else %} + <td class="user_without_privilege"> + {% trans %}No{% endtrans %}{% endif %} + </td> + {% if request.user.has_privilege('admin') %} + <td> + {% if privilege in user.all_privileges %} + <input type=submit id="{{ privilege.privilege_name }}" + class="submit_button button_action" + value =" -" /> + {% else %} + <input type=submit id="{{ privilege.privilege_name }}" + class="submit_button button_action" + value ="+" /> + {% endif %} + </td> + {% endif %} + </tr> + {% endfor %} + </table> + {{ csrf_token }} + <input type=hidden name=privilege_name id=hidden_privilege_name /> + </form> + {% endif %} + <script> +$(document).ready(function(){ + $('.submit_button').click(function(){ + $('#hidden_privilege_name').val($(this).attr('id')); + }); + init_user_banned_form(); + $('#ban_user_submit').click(function(){ + submit_user_banned_form() + }); +}); + </script> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/moderation/user_panel.html b/mediagoblin/templates/mediagoblin/moderation/user_panel.html new file mode 100644 index 00000000..4949960e --- /dev/null +++ b/mediagoblin/templates/mediagoblin/moderation/user_panel.html @@ -0,0 +1,97 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} + +{% block title -%} + {% trans %}User panel{% endtrans %} — {{ super() }} +{%- endblock %} + +{% block mediagoblin_content %} + +<h1>{% trans %}User panel{% endtrans %}</h1> + +<p> + {% trans %} + Here you can look up users in order to take punitive actions on them. + {% endtrans %} +</p> + +<h2>{% trans %}Active Users{% endtrans %}</h2> + +{% if user_list.count() %} + {% if not last_page == 1 %} + {% if 'p='~current_page in request.query_string %} + {% set query_string = request.query_string %}{% else %} + {% set query_string = +'p='~current_page~"&"+request.query_string %} + {% endif %} + <div class="right_align"> + {% set first_vis = current_page-3 %} + {% set last_vis = current_page+3 %} + {% if 1 == current_page %}<b>1</b>{% else %} + <a href ="?{{ query_string.replace( + 'p='~current_page, + 'p='~1) }}"> + 1</a>{% endif %} + {% if first_vis > 1 %}...{% endif %} + {% for p in range(first_vis,last_vis+1) %} + {% if p > 1 and p < last_page and +current_page !=p %} + <a href="?{{ query_string.replace( + 'p='~current_page, + 'p='~p) }}"> + {{ p }}</a> + {% elif p > 1 and p < last_page %} + <b>{{ p }}</b> + {% endif %} + {% endfor %} + {% if last_vis < last_page %}...{% endif %} + {% if last_page != current_page %} + <a href ="?{{ query_string.replace( + 'p='~current_page, + 'p='~last_page) }}"> + {{ last_page }}</a> + {% else %}<b>{{ last_page }}</b> + {% endif %} + </div> + {% endif %} + <table class="admin_panel processing"> + <tr> + <th>{% trans %}ID{% endtrans %}</th> + <th>{% trans %}Username{% endtrans %}</th> + <th>{% trans %}When Joined{% endtrans %}</th> + <th>{% trans %}# of Comments Posted{% endtrans %}</th> + </tr> + {% for user in user_list %} + <tr> + <td>{{ user.id }}</td> + <td> + <a href="{{ request.urlgen('mediagoblin.moderation.users_detail', + user= user.username) }}"> + {{ user.username }} + </a> + </td> + <td>{{ user.created.strftime("%F %R") }}</td> + <td>{{ user.posted_comments.count() }}</td> + </tr> + {% endfor %} + </table> +{% else %} + <p><em>{% trans %}No users found.{% endtrans %}</em></p> +{% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/terms_of_service.html b/mediagoblin/templates/mediagoblin/terms_of_service.html new file mode 100644 index 00000000..610afd25 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/terms_of_service.html @@ -0,0 +1,303 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{% extends "mediagoblin/base.html" %} + +{% block title %} + Terms of Service +{% endblock %} + +{% block mediagoblin_content -%} +{# <h2>The gist</h2> +# This is where you might insert your own particular rules, unique to your +# own website. Or your own worded summary. +#} + +<h2>Terms of Service</h2> + +<p> +The following terms and conditions govern all use of the +{{ app_config['html_title'] }} website and all content, services and products +available at or through the website (taken together, the Website). +"Operator" means the owners and operators of this website. +The Website is offered subject to your acceptance without modification of all +of the terms and conditions contained herein and all other operating rules, +policies (including, without limitation, Operator’s Privacy Policy) and +procedures that may be published from time to time on this Site by Operator +(collectively, the “Agreementâ€). +</p> + +<p> +Please read this Agreement carefully before accessing or using the Website. +By accessing or using any part of the web site, you agree to become bound by +the terms and conditions of this agreement. If you do not agree to all the +terms and conditions of this agreement, then you may not access the Website +or use any services. If these terms and conditions are considered an offer by +Operator, acceptance is expressly limited to these terms. The Website is +available only to individuals who are at least 13 years old. +</p> + +<ol id="code_of_conduct_list"> + <li><strong>Your {{ app_config['html_title'] }} Account and Site.</strong> + If you create a notice stream on the Website, you are responsible for + maintaining the security of your account and notice stream, and you are + fully responsible for all activities that occur under the account and any + other actions taken in connection with the notice stream. You must not + describe or assign keywords to your notice stream in a misleading or + unlawful manner, + including in a manner intended to trade on the name or reputation of + others, and Operator may change or remove any description or keyword that + it considers inappropriate or unlawful, or otherwise likely to cause + Operator liability. You must immediately notify Operator of any + unauthorized uses of your notice stream, your account or any other breaches + of security. Operator will not be liable for any acts or omissions by You, + including any damages of any kind incurred as a result of such acts or + omissions. + </li> + <li><strong>Responsibility of Contributors.</strong> If you operate a notice + stream, comment on a notice stream, post material to the Website, post + links on the Website, or otherwise make + (or allow any third party to make) material + available by means of the Website (any such material, “Contentâ€), You are + entirely responsible for the content of, and any harm resulting from, that + Content. That is the case regardless of whether the Content in question + constitutes text, graphics, an audio file, or computer software. By making + Content available, you represent and warrant that: + <ul class="nested_sublist"> + <li> + the downloading, copying and use of the Content will not infringe + the proprietary rights, including but not limited to the copyright, + patent, trademark or trade secret rights, of any third party; + </li> + <li> + if your employer has rights to any copyrights, patents, or trademarks + you create, you have either (i) received permission from your employer + to post or make available the Content, including but not limited to any + software, or (ii) secured from your employer a waiver as to all rights + in or to the Content; + </li> + <li> + you have fully complied with any third-party licenses relating to the + Content, and have done all things necessary to successfully pass + through to end users any required terms; + </li> + <li>the Content does not contain or install any viruses, worms, malware, + Trojan horses or other harmful or destructive content; + </li> + <li>the Content is not spam, and does not contain unethical or unwanted + commercial content designed to drive traffic to third party sites or + boost the search engine rankings of third party sites, or to further + unlawful acts (such as phishing) or mislead recipients as to the + source of the material (such as spoofing); + </li> + <li>if the Content is machine- or randomly-generated, it is for purposes + of direct entertainment, information and/or utility for you or other + users, and not for spam, + </li> + <li>the Content is not libelous or defamatory (more info on what that + means), does not contain threats or incite violence towards individuals + or entities, and does not violate the privacy or publicity rights of + any third party; + </li> + <li>your notice stream is not getting advertised via unwanted electronic + messages such as spam links on newsgroups, email lists, other notice + streams and web sites, and similar unsolicited promotional methods; + </li> + <li>your notice stream is not named in a manner that misleads your + readers into thinking that you are another person or company. For + example, your notice stream’s URL or name is not the name of a person + other than yourself or company other than your own; and + </li> + <li>you have, in the case of Content that includes computer code, + accurately categorized and/or described the type, nature, uses and + effects of the materials, whether requested to do so by Operator or + otherwise.</li> + </ul> + By submitting Content to Operator for inclusion on your Website, you grant + Operator a world-wide, royalty-free, and non-exclusive license to + reproduce, modify, adapt and publish the Content solely for the purpose of + displaying, distributing and promoting your notice stream. + By submitting Content to Operator for inclusion on your Website, you grant + all readers the right to use, re-use, modify and/or re-distribute the + Content under the terms of the Creative Commons Attribution 3.0. + If you delete Content, Operator will use reasonable efforts to remove it + from the Website, but you acknowledge that caching or references to the + Content may not be made immediately unavailable. + Without limiting any of those representations or warranties, Operator has + the right (though not the obligation) to, in Operator’s sole discretion + (i) refuse or remove any content that, in Operator’s reasonable opinion, + violates any Operator policy or is in any way harmful or objectionable, or + (ii) terminate or deny access to and use of the Website to any individual + or entity for any reason, in Operator’s sole discretion. + </li> + <li><strong>Responsibility of Website Visitors.</strong> Operator has not + reviewed, and cannot + review, all of the material, including computer software, posted to the + Website, and cannot therefore be responsible for that material’s content, + use or effects. By operating the Website, Operator does not represent or + imply that it endorses the material there posted, or that it believes such + material to be accurate, useful or non-harmful. You are responsible for + taking precautions as necessary to protect yourself and your computer + systems from viruses, worms, Trojan horses, and other harmful or + destructive content. The Website may contain content that is offensive, + indecent, or otherwise objectionable, as well as content containing + technical inaccuracies, typographical mistakes, and other errors. The + Website may also contain material that violates the privacy or publicity + rights, or infringes the copyright, patent, trademark and other proprietary + rights, of third parties, or the downloading, copying or use of which is + subject to additional terms and conditions, stated or unstated. Operator + disclaims any responsibility for any harm resulting from the use by + visitors of the Website, or from any downloading by those visitors of + content there posted. + </li> + <li><strong>Content Posted on Other Websites.</strong> We have not reviewed, + and cannot + review, all of the material, including computer software, made available + through the websites and webpages to which {{ app_config['html_title'] }} + links, and that link to {{ app_config['html_title'] }}. Operator does not + have any control over those external websites and webpages, and is not + responsible for their contents or their use. By linking to a external + website or webpage, Operator does not represent or imply that it endorses + such website or webpage. You are responsible for taking precautions as + necessary to protect yourself and your computer systems from viruses, + worms, Trojan horses, and other harmful or destructive content. Operator + disclaims any responsibility for any harm resulting from your use of + external websites and webpages. + </li> + <li> + <strong>Copyright Infringement and DMCA Policy.</strong> + As Operator asks others to respect its copyrights and trademark rights, + it respects the copyright, patent, and trademark rights of others. + If you believe that material located on or linked to by + {{ app_config['html_title'] }} violates your copyright, you are encouraged + to notify Operator in accordance with Operator’s Digital Millennium + Copyright Act (â€DMCAâ€) Policy. Operator will respond to all such notices, + including as required or appropriate by removing the infringing material or + disabling all links to the infringing material. In the case of a visitor who + may infringe or repeatedly infringes the copyrights or other trademark or + patent rights of Operator or others, Operator may, in its discretion, + terminate or deny access to and use of the Website. In the case of such + termination, Operator will have no obligation to provide a refund of any + amounts previously paid to Operator.</li> + <li> + <strong>Copyrights, patents, and trademarks.</strong> + This Agreement does not transfer from Operator to + you any Operator or third party copyrights, patents, or trademarks, + and all right, title and interest in and to such copyrights, patents, + and trademarks will remain (as between the + parties) solely with Operator. {{ app_config['html_title'] }}, the + {{ app_config['html_title'] }} logo, and all other trademarks, service + marks, graphics and logos used in connection with + {{ app_config['html_title'] }}, or the Website may be trademarks or + registered trademarks of Operator or Operator’s licensors. Other + trademarks, service marks, graphics and logos used in connection with the + Website may be the trademarks of other third parties. Your use of the + Website grants you no right or license to reproduce or otherwise use any + Operator or third-party trademarks. + </li> + <li><strong>Changes.</strong> Operator reserves the right, at its sole + discretion, to modify + or replace any part of this Agreement. It is your responsibility to check + this Agreement periodically for changes. Your continued use of or access + to the Website following the posting of any changes to this Agreement + constitutes acceptance of those changes. Operator may also, in the future, + offer new services and/or features through the Website (including, the + release of new tools and resources). Such new features and/or services + shall be subject to the terms and conditions of this Agreement. + </li> + <li><strong>Termination.</strong> Operator may terminate your access to all + or any part of + the Website at any time, with or without cause, with or without notice, + effective immediately. If you wish to terminate this Agreement or your + {{ app_config['html_title'] }} account (if you have one), you may simply + discontinue using the Website. All provisions of this Agreement which by + their nature should survive termination shall survive termination, + including, without limitation, ownership provisions, warranty disclaimers, + indemnity and limitations of liability. + </li> + <li><strong>Disclaimer of Warranties.</strong> The Website is provided + “as isâ€. Operator and + its suppliers and licensors hereby disclaim all warranties of any kind, + express or implied, including, without limitation, the warranties of + merchantability, fitness for a particular purpose and non-infringement. + Neither Operator nor its suppliers and licensors, makes any warranty that + the Website will be error free or that access thereto will be continuous + or uninterrupted. If you’re actually reading this, here’s a treat. You + understand that you download from, or otherwise obtain content or services + through, the Website at your own discretion and risk. + </li> + <li><strong>Limitation of Liability.</strong> In no event will Operator, or + its suppliers or + licensors, be liable with respect to any subject matter of this agreement + under any contract, negligence, strict liability or other legal or + equitable theory for: (i) any special, incidental or consequential damages; + (ii) the cost of procurement or substitute products or services; (iii) for + interruption of use or loss or corruption of data; or (iv) for any amounts + that exceed the fees paid by you to Operator under this agreement during + the twelve (12) month period prior to the cause of action. Operator shall + have no liability for any failure or delay due to matters beyond their + reasonable control. The foregoing shall not apply to the extent prohibited + by applicable law. + </li> + <li><strong>General Representation and Warranty.</strong> You represent and + warrant that (i) + your use of the Website will be in strict accordance with the Operator + Privacy Policy, with this Agreement and with all applicable laws and + regulations (including without limitation any local laws or regulations in + your country, state, city, or other governmental area, regarding online + conduct and acceptable content, and including all applicable laws regarding + the transmission of technical data exported from the United States or the + country in which you reside) and (ii) your use of the Website will not + infringe or misappropriate the copyrights, patents, and trademark rights of + any third party. + </li> + <li> + <strong>Indemnification.</strong> + You agree to indemnify and hold harmless Operator, its contractors, and its + licensors, and their respective directors, officers, employees and agents + from and against any and all claims and expenses, including attorneys’ fees, + arising out of your use of the Website, including but not limited to out of + your violation this Agreement. + </li> + <li><strong>Miscellaneous.</strong> This Agreement constitutes the entire + agreement between + Operator and you concerning the subject matter hereof, and they may only + be modified by a written amendment signed by an authorized executive of + Operator, or by the posting by Operator of a revised version. If any part + of this Agreement is held invalid or unenforceable, that part will be + construed to reflect the parties’ original intent, and the remaining + portions will remain in full force and effect. A waiver by either party of + any term or condition of this Agreement or any breach thereof, in any one + instance, will not waive such term or condition or any subsequent breach + thereof. You may assign your rights under this Agreement to any party that + consents to, and agrees to be bound by, its terms and conditions; Operator + may assign its rights under this Agreement without condition. This + Agreement will be binding upon and will inure to the benefit of the + parties, their successors and permitted assigns. + </li> +</ol> + +<p> +Originally published by Automattic, Inc. as the WordPress.com Terms of Service +and made available by them under the Creative Commons Attribution- +ShareAlike 3.0 License. Modifications to remove reference to "VIP services", +rename "blog" to "notice stream", remove the choice-of-venue clause, and add +variables specific to instances of this software made by Control Yourself, Inc. +and made available under the terms of the same license. +</p> + +{% endblock -%} diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection.html b/mediagoblin/templates/mediagoblin/user_pages/collection.html index 5a7baadd..0f712c01 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection.html @@ -44,8 +44,8 @@ {{ collection_title }} by <a href="{{ user_url }}">{{ username }}</a> {%- endtrans %} </h1> - {% if request.user and (collection.creator == request.user.id or - request.user.is_admin) %} + {% if request.user and (collection.creator == request.user.id or + request.user.has_privilege('admin')) %} {% set edit_url = request.urlgen('mediagoblin.edit.edit_collection', user=collection.get_creator.username, collection=collection.slug) %} @@ -63,10 +63,10 @@ </p> {{ collection_gallery(request, collection_items, pagination) }} - + {% set feed_url = request.urlgen('mediagoblin.user_pages.collection_atom_feed', - user=user.username, + user=user.username, collection=collection.slug ) %} {% include "mediagoblin/utils/feed_link.html" %} - -{% endblock %} + +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_list.html b/mediagoblin/templates/mediagoblin/user_pages/collection_list.html index 8ac0b988..4b449c76 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection_list.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection_list.html @@ -34,7 +34,7 @@ </h1> {% if request.user %} - {% if request.user.status == 'active' %} + {% if request.user.has_privilege('active') %} <p> <a href="{{ request.urlgen('mediagoblin.submit.collection', user=user.username) }}"> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 39935b40..81e5013e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -72,7 +72,7 @@ </h2> {% if request.user and (media.uploader == request.user.id or - request.user.is_admin) %} + request.user.has_privilege('admin')) %} {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', user= media.get_uploader.username, media_id=media.id) %} @@ -86,7 +86,7 @@ {% autoescape False %} <p>{{ media.description_html }}</p> {% endautoescape %} - {% if comments %} + {% if comments and request.user and request.user.has_privilege('commenter') %} {% if app_config['allow_comments'] %} <a {% if not request.user %} @@ -146,6 +146,15 @@ {{ comment.content_html }} {%- endautoescape %} </div> + <div> + {% if app_config.allow_reporting %} + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.report_comment', + user=media.get_uploader.username, + media=media.slug_or_id, + comment=comment.id) }}"> + {% trans %}Report{% endtrans %}</a> + {% endif %} + </div> </li> {% endfor %} </ul> @@ -156,7 +165,7 @@ <div class="media_sidebar"> <h3>{% trans %}Added{% endtrans %}</h3> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> - {%- trans formatted_time=timesince(media.created) -%} + {%- trans formatted_time=timesince(media.created) -%} {{ formatted_time }} ago {%- endtrans -%} </span></p> @@ -170,6 +179,10 @@ {% include "mediagoblin/utils/collections.html" %} + {% if app_config.allow_reporting %} + {% include "mediagoblin/utils/report.html" %} + {% endif %} + {% include "mediagoblin/utils/license.html" %} {% include "mediagoblin/utils/exif.html" %} @@ -189,7 +202,7 @@ {%- if app_config['allow_attachments'] and request.user and (media.uploader == request.user.id - or request.user.is_admin) %} + or request.user.has_privilege('admin')) %} {%- if not media.attachment_files|count %} <h3>{% trans %}Attachments{% endtrans %}</h3> {%- endif %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/report.html b/mediagoblin/templates/mediagoblin/user_pages/report.html new file mode 100644 index 00000000..ce0fb1bc --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/report.html @@ -0,0 +1,83 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} +{%- extends "mediagoblin/base.html" %} +{%- import "/mediagoblin/utils/wtforms.html" as wtforms_util %} +{%- block mediagoblin_content -%} +{% trans %}<h2>File a Report</h2>{% endtrans %} +<form action="" method=POST > + {% if comment is defined %} + <h3>{% trans %}Reporting this Comment{% endtrans %}</h3> + {%- set comment_author = comment.get_author %} + {%- set comment_author_url = request.urlgen( + 'mediagoblin.user_pages.user_home', + user=comment_author.username) %} + {%- set comment_url = request.urlgen( + 'mediagoblin.user_pages.media_home.view_comment', + comment=comment.id, + user=media.get_uploader.username, + media=media.slug_or_id) %} + <div id="comment-{{ comment.id }}" + class="comment_wrapper"> + <div class="comment_author"> + <img + src="{{ request.staticdirect('/images/icon_comment.png') }}" /> + <a href="{{ comment_author_url }}" + class="comment_authorlink"> + {{- comment_author.username -}} + </a> + <a href="{{ comment_url }}" + class="comment_whenlink"> + <span + title='{{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}}'> + + {%- trans formatted_time=timesince(comment.created) -%} + {{ formatted_time }} ago + {%- endtrans -%} + </span></a>: + </div> + <div class="comment_content"> + {% autoescape False -%} + {{ comment.content_html }} + {%- endautoescape %} + </div> + </div> + {% elif media is defined %} + <h3>{% trans %}Reporting this Media Entry{% endtrans %}</h3> + <div class="media_thumbnail"> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home', + user=media.get_uploader.username, + media=media.slug_or_id) }}"> + <img src="{{ media.thumb_url }}"/></a> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home', + user=media.get_uploader.username, + media=media.slug_or_id) }}" + class=thumb_entry_title>{{ media.title }}</a> + </div> + <div class=clear></div> + {%- trans user_url = request.urlgen('mediagoblin.user_pages.user_home', user=media.get_uploader.username), + username = media.get_uploader.username %} + â– Published by <a href="{{ user_url }}" + class="comment_authorlink">{{ username }}</a> + {% endtrans %} + {%- endif %} + + {{- wtforms_util.render_divs(form) }} + {{ csrf_token }} + <input type=submit value="{% trans %}File Report {% endtrans %}" /> +</form> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 6cb6aa51..d554b7e8 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -14,6 +14,9 @@ # # 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/>. +# + +# This is the main user homepage for active users #} {% extends "mediagoblin/base.html" %} @@ -38,106 +41,76 @@ {% block mediagoblin_content -%} - {# If no user... #} - {% if not user %} - <p>{% trans %}Sorry, no such user found.{% endtrans %}</p> - - {# User exists, but needs verification #} - {% elif user.status == "needs_email_verification" %} - {% if user == request.user %} - {# this should only be visible when you are this user #} - <div class="form_box"> - <h1>{% trans %}Email verification needed{% endtrans %}</h1> + <h1> + {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} + </h1> + {% if not user.url and not user.bio %} + {% if request.user and (request.user.id == user.id) %} + <div class="profile_sidebar empty_space"> <p> - {% trans -%} - Almost done! Your account still needs to be activated. - {%- endtrans %} - </p> - <p> - {% trans -%} - An email should arrive in a few moments with instructions on how to do so. - {%- endtrans %} + {% trans %}Here's a spot to tell others about yourself.{% endtrans %} </p> - <p>{% trans %}In case it doesn't:{% endtrans %}</p> - - <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}" - class="button_action_highlight">{% trans %}Resend verification email{% endtrans %}</a> - </div> + <a href="{{ request.urlgen('mediagoblin.edit.profile', + user=user.username) }}" class="button_action"> + {%- trans %}Edit profile{% endtrans -%} + </a> {% else %} - {# if the user is not you, but still needs to verify their email #} - <div class="form_box"> - <h1>{% trans %}Email verification needed{% endtrans %}</h1> - + <div class="profile_sidebar empty_space"> <p> {% trans -%} - Someone has registered an account with this username, but it still has to be activated. - {%- endtrans %} - </p> - - <p> - {% trans login_url=request.urlgen('mediagoblin.auth.login') -%} - If you are that person but you've lost your verification email, you can <a href="{{ login_url }}">log in</a> and resend it. + This user hasn't filled in their profile (yet). {%- endtrans %} </p> - </div> {% endif %} - - {# Active(?) (or at least verified at some point) user, horray! #} {% else %} - <h1> - {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} - </h1> - - {% if not user.url and not user.bio %} - {% if request.user and (request.user.id == user.id) %} - <div class="profile_sidebar empty_space"> - <p> - {% trans %}Here's a spot to tell others about yourself.{% endtrans %} - </p> - <a href="{{ request.urlgen('mediagoblin.edit.profile', - user=user.username) }}" class="button_action"> - {%- trans %}Edit profile{% endtrans -%} - </a> - {% else %} - <div class="profile_sidebar empty_space"> - <p> - {% trans -%} - This user hasn't filled in their profile (yet). - {%- endtrans %} - </p> + <div class="profile_sidebar"> + {% include "mediagoblin/utils/profile.html" %} + {% if request.user and + (request.user.id == user.id or request.user.has_privilege('admin')) %} + <a href="{{ request.urlgen('mediagoblin.edit.profile', + user=user.username) }}"> + {%- trans %}Edit profile{% endtrans -%} + </a> {% endif %} - {% else %} - <div class="profile_sidebar"> - {% include "mediagoblin/utils/profile.html" %} - {% if request.user and - (request.user.id == user.id or request.user.is_admin) %} - <a href="{{ request.urlgen('mediagoblin.edit.profile', - user=user.username) }}"> - {%- trans %}Edit profile{% endtrans -%} - </a> - {% endif %} - {% endif %} + {% endif %} + <p> + <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list', + user=user.username) }}"> + {%- trans %}Browse collections{% endtrans -%} + </a> + </p> + </div> + + {% if media_entries.count() %} + <div class="profile_showcase"> + {{ object_gallery(request, media_entries, pagination, + pagination_base_url=user_gallery_url, col_number=3) }} + {% include "mediagoblin/utils/object_gallery.html" %} + <div class="clear"></div> <p> - <a href="{{ request.urlgen('mediagoblin.user_pages.collection_list', - user=user.username) }}"> - {%- trans %}Browse collections{% endtrans -%} + <a href="{{ user_gallery_url }}"> + {% trans username=user.username -%} + View all of {{ username }}'s media{% endtrans -%} </a> </p> + {% set feed_url = request.urlgen( + 'mediagoblin.user_pages.atom_feed', + user=user.username) %} + {% include "mediagoblin/utils/feed_link.html" %} </div> - - {% if media_entries.count() %} - <div class="profile_showcase"> - {{ object_gallery(request, media_entries, pagination, - pagination_base_url=user_gallery_url, col_number=3) }} - {% include "mediagoblin/utils/object_gallery.html" %} - <div class="clear"></div> + {% else %} + {% if request.user and (request.user.id == user.id) %} + <div class="profile_showcase empty_space"> <p> - <a href="{{ user_gallery_url }}"> - {% trans username=user.username -%} - View all of {{ username }}'s media{% endtrans -%} - </a> + {% trans -%} + This is where your media will appear, but you don't seem to have added anything yet. + {%- endtrans %} </p> + <a class="button_action" + href="{{ request.urlgen('mediagoblin.submit.start') }}"> + {%- trans %}Add media{% endtrans -%} + </a> {% set feed_url = request.urlgen( 'mediagoblin.user_pages.atom_feed', user=user.username) %} @@ -145,28 +118,14 @@ {% include "mediagoblin/utils/feed_link.html" %} </div> {% else %} - {% if request.user and (request.user.id == user.id) %} - <div class="profile_showcase empty_space"> - <p> - {% trans -%} - This is where your media will appear, but you don't seem to have added anything yet. - {%- endtrans %} - </p> - <a class="button_action" - href="{{ request.urlgen('mediagoblin.submit.start') }}"> - {%- trans %}Add media{% endtrans -%} - </a> - </div> - {% else %} - <div class="profile_showcase empty_space"> - <p> - {% trans -%} - There doesn't seem to be any media here yet... - {%- endtrans %} - </p> - </div> - {% endif %} + <div class="profile_showcase empty_space"> + <p> + {% trans -%} + There doesn't seem to be any media here yet... + {%- endtrans %} + </p> + </div> {% endif %} - <div class="clear"></div> {% endif %} + <div class="clear"></div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html b/mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html new file mode 100644 index 00000000..6c9b5b8c --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html @@ -0,0 +1,81 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# This is the main user homepage for non-active users that still need +# registration etc. +#} +{% extends "mediagoblin/base.html" %} + +{% block title %} + {%- if user -%} + {%- trans username=user.username -%} + {{ username }}'s profile + {%- endtrans %} — {{ super() }} + {%- else -%} + {{ super() }} + {%- endif -%} +{% endblock %} + + +{% block mediagoblin_content -%} + {# User exists, but needs verification #} + {% if not user.has_privilege('active') %} + {% if user == request.user %} + {# this should only be visible when you are this user #} + <div class="form_box"> + <h1>{% trans %}Email verification needed{% endtrans %}</h1> + + <p> + {% trans -%} + Almost done! Your account still needs to be activated. + {%- endtrans %} + </p> + <p> + {% trans -%} + An email should arrive in a few moments with instructions on how to do so. + {%- endtrans %} + </p> + <p>{% trans %}In case it doesn't:{% endtrans %}</p> + + <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}" + class="button_action_highlight">{% trans %}Resend verification email{% endtrans %}</a> + </div> + {% else %} + {# if the user is not you, but still needs to verify their email #} + <div class="form_box"> + <h1>{% trans %}Email verification needed{% endtrans %}</h1> + + <p> + {% trans -%} + Someone has registered an account with this username, but it still has to be activated. + {%- endtrans %} + </p> + <p> + {% trans login_url=request.urlgen('mediagoblin.auth.login') -%} + If you are that person but you've lost your verification email, you can <a href="{{ login_url }}">log in</a> and resend it. + {%- endtrans %} + </p> + </div> + {% endif %} + + {# Active(?) (or at least verified at some point) user, horray! #} + {% else %} + <h1>{{ username }}</h1> + <p>{{ username }} is not active.</p> + <div class="clear"></div> + {% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index dcc59244..dfe2ebe2 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -38,8 +38,8 @@ <a href="{{ entry_url }}">{{ item.note }}</a> {% endif %} {% if request.user and - (item.in_collection.creator == request.user.id or - request.user.is_admin) %} + (item.in_collection.creator == request.user.id or + request.user.has_privilege('admin')) %} {%- set remove_url=request.urlgen( 'mediagoblin.user_pages.collection_item_confirm_remove', user=item.in_collection.get_creator.username, diff --git a/mediagoblin/templates/mediagoblin/utils/report.html b/mediagoblin/templates/mediagoblin/utils/report.html new file mode 100644 index 00000000..3829de97 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/utils/report.html @@ -0,0 +1,28 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + +{% block report_content -%} + <p> + <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.report_media', + user=media.get_uploader.username, + media=media.slug_or_id) }}" + class="button_action" id="button_reportmedia" title="Report media"> + {% trans %}Report media{% endtrans %} + </a> + </p> +{% endblock %} diff --git a/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini b/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini index a64e9e40..07c69442 100644 --- a/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini +++ b/mediagoblin/tests/auth_configs/authentication_disabled_appconfig.ini @@ -3,8 +3,8 @@ direct_remote_path = /test_static/ email_sender_address = "notice@mediagoblin.example.org" email_debug_mode = true -# TODO: Switch to using an in-memory database -sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db" +sql_engine = "sqlite://" +run_migrations = true # Celery shouldn't be set up by the application as it's setup via # mediagoblin.init.celery.from_celery diff --git a/mediagoblin/tests/auth_configs/ldap_appconfig.ini b/mediagoblin/tests/auth_configs/ldap_appconfig.ini new file mode 100644 index 00000000..9be37e17 --- /dev/null +++ b/mediagoblin/tests/auth_configs/ldap_appconfig.ini @@ -0,0 +1,41 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +[mediagoblin] +direct_remote_path = /test_static/ +email_sender_address = "notice@mediagoblin.example.org" +email_debug_mode = true + +sql_engine = "sqlite://" +run_migrations = true + +# Celery shouldn't be set up by the application as it's setup via +# mediagoblin.init.celery.from_celery +celery_setup_elsewhere = true + +[storage:publicstore] +base_dir = %(here)s/user_dev/media/public +base_url = /mgoblin_media/ + +[storage:queuestore] +base_dir = %(here)s/user_dev/media/queue + +[celery] +CELERY_ALWAYS_EAGER = true +CELERY_RESULT_DBURI = "sqlite:///%(here)s/user_dev/celery.db" +BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db" + +[plugins] +[[mediagoblin.plugins.ldap]] diff --git a/mediagoblin/tests/auth_configs/openid_appconfig.ini b/mediagoblin/tests/auth_configs/openid_appconfig.ini index c2bd82fd..3433e139 100644 --- a/mediagoblin/tests/auth_configs/openid_appconfig.ini +++ b/mediagoblin/tests/auth_configs/openid_appconfig.ini @@ -18,8 +18,8 @@ direct_remote_path = /test_static/ email_sender_address = "notice@mediagoblin.example.org" email_debug_mode = true -# TODO: Switch to using an in-memory database -sql_engine = "sqlite:///%(here)s/user_dev/mediagoblin.db" +sql_engine = "sqlite://" +run_migrations = true # Celery shouldn't be set up by the application as it's setup via # mediagoblin.init.celery.from_celery diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index 89cf1026..4e0cbd8f 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -35,7 +35,8 @@ class TestAPI(object): self.db = mg_globals.database self.user_password = u'4cc355_70k3N' - self.user = fixture_add_user(u'joapi', self.user_password) + self.user = fixture_add_user(u'joapi', self.user_password, + privileges=[u'active',u'uploader']) def login(self, test_app): test_app.post( diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index 61503d32..1bbc3d01 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -1,3 +1,4 @@ + # GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # @@ -83,31 +84,35 @@ def test_register_views(test_app): template.clear_test_template_context() response = test_app.post( '/auth/register/', { - 'username': u'happygirl', - 'password': 'iamsohappy', - 'email': 'happygrrl@example.org'}) + 'username': u'angrygirl', + 'password': 'iamsoangry', + 'email': 'angrygrrl@example.org'}) response.follow() ## Did we redirect to the proper page? Use the right template? - assert urlparse.urlsplit(response.location)[2] == '/u/happygirl/' - assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT + assert urlparse.urlsplit(response.location)[2] == '/u/angrygirl/' + assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT ## Make sure user is in place new_user = mg_globals.database.User.query.filter_by( - username=u'happygirl').first() + username=u'angrygirl').first() assert new_user - assert new_user.status == u'needs_email_verification' - assert new_user.email_verified == False + ## Make sure that the proper privileges are granted on registration + + assert new_user.has_privilege(u'commenter') + assert new_user.has_privilege(u'uploader') + assert new_user.has_privilege(u'reporter') + assert not new_user.has_privilege(u'active') ## Make sure user is logged in request = template.TEMPLATE_TEST_CONTEXT[ - 'mediagoblin/user_pages/user.html']['request'] + 'mediagoblin/user_pages/user_nonactive.html']['request'] assert request.session['user_id'] == unicode(new_user.id) ## Make sure we get email confirmation, and try verifying assert len(mail.EMAIL_TEST_INBOX) == 1 message = mail.EMAIL_TEST_INBOX.pop() - assert message['To'] == 'happygrrl@example.org' + assert message['To'] == 'angrygrrl@example.org' email_context = template.TEMPLATE_TEST_CONTEXT[ 'mediagoblin/auth/verification_email.txt'] assert email_context['verification_url'] in message.get_payload(decode=True) @@ -129,10 +134,8 @@ def test_register_views(test_app): # assert context['verification_successful'] == True # TODO: Would be good to test messages here when we can do so... new_user = mg_globals.database.User.query.filter_by( - username=u'happygirl').first() + username=u'angrygirl').first() assert new_user - assert new_user.status == u'needs_email_verification' - assert new_user.email_verified == False ## Verify the email activation works template.clear_test_template_context() @@ -143,10 +146,8 @@ def test_register_views(test_app): # assert context['verification_successful'] == True # TODO: Would be good to test messages here when we can do so... new_user = mg_globals.database.User.query.filter_by( - username=u'happygirl').first() + username=u'angrygirl').first() assert new_user - assert new_user.status == u'active' - assert new_user.email_verified == True # Uniqueness checks # ----------------- @@ -154,9 +155,9 @@ def test_register_views(test_app): template.clear_test_template_context() response = test_app.post( '/auth/register/', { - 'username': u'happygirl', - 'password': 'iamsohappy2', - 'email': 'happygrrl2@example.org'}) + 'username': u'angrygirl', + 'password': 'iamsoangry2', + 'email': 'angrygrrl2@example.org'}) context = template.TEMPLATE_TEST_CONTEXT[ 'mediagoblin/auth/register.html'] @@ -171,7 +172,7 @@ def test_register_views(test_app): template.clear_test_template_context() response = test_app.post( '/auth/forgot_password/', - {'username': u'happygirl'}) + {'username': u'angrygirl'}) response.follow() ## Did we redirect to the proper page? Use the right template? @@ -181,9 +182,9 @@ def test_register_views(test_app): ## Make sure link to change password is sent by email assert len(mail.EMAIL_TEST_INBOX) == 1 message = mail.EMAIL_TEST_INBOX.pop() - assert message['To'] == 'happygrrl@example.org' + assert message['To'] == 'angrygrrl@example.org' email_context = template.TEMPLATE_TEST_CONTEXT[ - 'mediagoblin/auth/fp_verification_email.txt'] + 'mediagoblin/plugins/basic_auth/fp_verification_email.txt'] #TODO - change the name of verification_url to something forgot-password-ish assert email_context['verification_url'] in message.get_payload(decode=True) @@ -204,13 +205,14 @@ def test_register_views(test_app): ## Verify step 1 of password-change works -- can see form to change password template.clear_test_template_context() response = test_app.get("%s?%s" % (path, get_params)) - assert 'mediagoblin/auth/change_fp.html' in template.TEMPLATE_TEST_CONTEXT + assert 'mediagoblin/plugins/basic_auth/change_fp.html' in \ + template.TEMPLATE_TEST_CONTEXT ## Verify step 2.1 of password-change works -- report success to user template.clear_test_template_context() response = test_app.post( '/auth/forgot_password/verify/', { - 'password': 'iamveryveryhappy', + 'password': 'iamveryveryangry', 'token': parsed_get_params['token']}) response.follow() assert 'mediagoblin/auth/login.html' in template.TEMPLATE_TEST_CONTEXT @@ -219,8 +221,8 @@ def test_register_views(test_app): template.clear_test_template_context() response = test_app.post( '/auth/login/', { - 'username': u'happygirl', - 'password': 'iamveryveryhappy'}) + 'username': u'angrygirl', + 'password': 'iamveryveryangry'}) # User should be redirected response.follow() @@ -233,7 +235,7 @@ def test_authentication_views(test_app): Test logging in and logging out """ # Make a new user - test_user = fixture_add_user(active_user=False) + test_user = fixture_add_user() # Get login @@ -330,7 +332,6 @@ def test_authentication_views(test_app): 'next' : '/u/chris/'}) assert urlparse.urlsplit(response.location)[2] == '/u/chris/' - @pytest.fixture() def authentication_disabled_app(request): return get_app( @@ -342,6 +343,7 @@ def authentication_disabled_app(request): def test_authentication_disabled_app(authentication_disabled_app): # app.auth should = false + assert mg_globals assert mg_globals.app.auth is False # Try to visit register page diff --git a/mediagoblin/tests/test_basic_auth.py b/mediagoblin/tests/test_basic_auth.py index cdd80fca..828f0515 100644 --- a/mediagoblin/tests/test_basic_auth.py +++ b/mediagoblin/tests/test_basic_auth.py @@ -13,7 +13,12 @@ # # 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 urlparse + +from mediagoblin.db.models import User from mediagoblin.plugins.basic_auth import tools as auth_tools +from mediagoblin.tests.tools import fixture_add_user +from mediagoblin.tools import template from mediagoblin.tools.testing import _activate_testing _activate_testing() @@ -57,3 +62,42 @@ def test_bcrypt_gen_password_hash(): pw, hashed_pw, '3><7R45417') assert not auth_tools.bcrypt_check_password( 'notthepassword', hashed_pw, '3><7R45417') + + +def test_change_password(test_app): + """Test changing password correctly and incorrectly""" + test_user = fixture_add_user( + password=u'toast', + privileges=[u'active']) + + test_app.post( + '/auth/login/', { + 'username': u'chris', + 'password': u'toast'}) + + # test that the password can be changed + res = test_app.post( + '/edit/password/', { + 'old_password': 'toast', + 'new_password': '123456', + }) + res.follow() + + # Did we redirect to the correct page? + assert urlparse.urlsplit(res.location)[2] == '/edit/account/' + + # test_user has to be fetched again in order to have the current values + test_user = User.query.filter_by(username=u'chris').first() + assert auth_tools.bcrypt_check_password('123456', test_user.pw_hash) + + # test that the password cannot be changed if the given + # old_password is wrong + template.clear_test_template_context() + test_app.post( + '/edit/password/', { + 'old_password': 'toast', + 'new_password': '098765', + }) + + test_user = User.query.filter_by(username=u'chris').first() + assert not auth_tools.bcrypt_check_password('098765', test_user.pw_hash) diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py index c43a3a42..4f44e0b9 100644 --- a/mediagoblin/tests/test_edit.py +++ b/mediagoblin/tests/test_edit.py @@ -27,7 +27,8 @@ class TestUserEdit(object): def setup(self): # set up new user self.user_password = u'toast' - self.user = fixture_add_user(password = self.user_password) + self.user = fixture_add_user(password = self.user_password, + privileges=[u'active']) def login(self, test_app): test_app.post( @@ -52,45 +53,11 @@ class TestUserEdit(object): # deleted too. Perhaps in submission test? #Restore user at end of test - self.user = fixture_add_user(password = self.user_password) + self.user = fixture_add_user(password = self.user_password, + privileges=[u'active']) self.login(test_app) - def test_change_password(self, test_app): - """Test changing password correctly and incorrectly""" - self.login(test_app) - - # test that the password can be changed - template.clear_test_template_context() - res = test_app.post( - '/edit/password/', { - 'old_password': 'toast', - 'new_password': '123456', - }) - res.follow() - - # Did we redirect to the correct page? - assert urlparse.urlsplit(res.location)[2] == '/edit/account/' - - # test_user has to be fetched again in order to have the current values - test_user = User.query.filter_by(username=u'chris').first() - assert auth.check_password('123456', test_user.pw_hash) - # Update current user passwd - self.user_password = '123456' - - # test that the password cannot be changed if the given - # old_password is wrong - template.clear_test_template_context() - test_app.post( - '/edit/password/', { - 'old_password': 'toast', - 'new_password': '098765', - }) - - test_user = User.query.filter_by(username=u'chris').first() - assert not auth.check_password('098765', test_user.pw_hash) - - def test_change_bio_url(self, test_app): """Test changing bio and URL""" self.login(test_app) @@ -115,7 +82,8 @@ class TestUserEdit(object): assert test_user.url == u'http://dustycloud.org/' # change a different user than the logged in (should fail with 403) - fixture_add_user(username=u"foo") + fixture_add_user(username=u"foo", + privileges=[u'active']) res = test_app.post( '/u/foo/edit/', { 'bio': u'I love toast!', diff --git a/mediagoblin/tests/test_ldap.py b/mediagoblin/tests/test_ldap.py new file mode 100644 index 00000000..48efb4b6 --- /dev/null +++ b/mediagoblin/tests/test_ldap.py @@ -0,0 +1,125 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +import urlparse +import pkg_resources +import pytest +import mock + +from mediagoblin import mg_globals +from mediagoblin.db.base import Session +from mediagoblin.tests.tools import get_app +from mediagoblin.tools import template + +pytest.importorskip("ldap") + + +@pytest.fixture() +def ldap_plugin_app(request): + return get_app( + request, + mgoblin_config=pkg_resources.resource_filename( + 'mediagoblin.tests.auth_configs', + 'ldap_appconfig.ini')) + + +def return_value(): + return u'chris', u'chris@example.com' + + +def test_ldap_plugin(ldap_plugin_app): + res = ldap_plugin_app.get('/auth/login/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/login/' + + res = ldap_plugin_app.get('/auth/register/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/register/' + + res = ldap_plugin_app.get('/auth/ldap/register/') + + assert urlparse.urlsplit(res.location)[2] == '/auth/ldap/login/' + + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', {}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/login.html'] + form = context['login_form'] + assert form.username.errors == [u'This field is required.'] + assert form.password.errors == [u'This field is required.'] + + @mock.patch('mediagoblin.plugins.ldap.tools.LDAP.login', mock.Mock(return_value=return_value())) + def _test_authentication(): + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', + {'username': u'chris', + 'password': u'toast'}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html'] + register_form = context['register_form'] + + assert register_form.username.data == u'chris' + assert register_form.email.data == u'chris@example.com' + + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/register/', + {'username': u'chris', + 'email': u'chris@example.com'}) + res.follow() + + assert urlparse.urlsplit(res.location)[2] == '/u/chris/' + assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT + + # Try to register with same email and username + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/register/', + {'username': u'chris', + 'email': u'chris@example.com'}) + + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/auth/register.html'] + register_form = context['register_form'] + + assert register_form.email.errors == [u'Sorry, a user with that email address already exists.'] + assert register_form.username.errors == [u'Sorry, a user with that name already exists.'] + + # Log out + ldap_plugin_app.get('/auth/logout/') + + # Get user and detach from session + test_user = mg_globals.database.User.query.filter_by( + username=u'chris').first() + Session.expunge(test_user) + + # Log back in + template.clear_test_template_context() + res = ldap_plugin_app.post( + '/auth/ldap/login/', + {'username': u'chris', + 'password': u'toast'}) + res.follow() + + assert urlparse.urlsplit(res.location)[2] == '/' + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT + + # Make sure user is in the session + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] + session = context['request'].session + assert session['user_id'] == unicode(test_user.id) + + _test_authentication() diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py index 427aa47c..86513c76 100644 --- a/mediagoblin/tests/test_modelmethods.py +++ b/mediagoblin/tests/test_modelmethods.py @@ -18,7 +18,7 @@ # methods, and so it makes sense to test them here. from mediagoblin.db.base import Session -from mediagoblin.db.models import MediaEntry +from mediagoblin.db.models import MediaEntry, User, Privilege from mediagoblin.tests.tools import fixture_add_user @@ -47,7 +47,7 @@ class TestMediaEntrySlugs(object): entry.id = this_id entry.uploader = uploader or self.chris_user.id entry.media_type = u'image' - + if save: entry.save() @@ -99,7 +99,7 @@ class TestMediaEntrySlugs(object): u"Beware, I exist!!", this_id=9000, save=False) entry.generate_slug() assert entry.slug == u"beware-i-exist-test" - + _real_test() def test_existing_slug_cant_use_id_extra_junk(self, test_app): @@ -151,6 +151,44 @@ class TestMediaEntrySlugs(object): qbert_entry.generate_slug() assert qbert_entry.slug is None +class TestUserHasPrivilege: + def _setup(self): + fixture_add_user(u'natalie', + privileges=[u'admin',u'moderator',u'active']) + fixture_add_user(u'aeva', + privileges=[u'moderator',u'active']) + self.natalie_user = User.query.filter( + User.username==u'natalie').first() + self.aeva_user = User.query.filter( + User.username==u'aeva').first() + + def test_privilege_added_correctly(self, test_app): + self._setup() + admin = Privilege.query.filter( + Privilege.privilege_name == u'admin').one() + # first make sure the privileges were added successfully + + assert admin in self.natalie_user.all_privileges + assert admin not in self.aeva_user.all_privileges + + def test_user_has_privilege_one(self, test_app): + self._setup() + + # then test out the user.has_privilege method for one privilege + assert not self.natalie_user.has_privilege(u'commenter') + assert self.aeva_user.has_privilege(u'active') + + + def test_user_has_privileges_multiple(self, test_app): + self._setup() + + # when multiple args are passed to has_privilege, the method returns + # True if the user has ANY of the privileges + assert self.natalie_user.has_privilege(u'admin',u'commenter') + assert self.aeva_user.has_privilege(u'moderator',u'active') + assert not self.natalie_user.has_privilege(u'commenter',u'uploader') + + def test_media_data_init(test_app): Session.rollback() @@ -165,3 +203,4 @@ def test_media_data_init(test_app): obj_in_session += 1 print repr(obj) assert obj_in_session == 0 + diff --git a/mediagoblin/tests/test_moderation.py b/mediagoblin/tests/test_moderation.py new file mode 100644 index 00000000..e7a0ebef --- /dev/null +++ b/mediagoblin/tests/test_moderation.py @@ -0,0 +1,242 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import pytest + +from mediagoblin.tests.tools import (fixture_add_user, + fixture_add_comment_report, fixture_add_comment) +from mediagoblin.db.models import User, CommentReport, MediaComment, UserBan +from mediagoblin.tools import template, mail +from webtest import AppError + +class TestModerationViews: + @pytest.fixture(autouse=True) + def _setup(self, test_app): + self.test_app = test_app + + fixture_add_user(u'admin', + privileges=[u'admin',u'active']) + fixture_add_user(u'moderator', + privileges=[u'moderator',u'active']) + fixture_add_user(u'regular', + privileges=[u'active',u'commenter']) + self.query_for_users() + + def login(self, username): + self.test_app.post( + '/auth/login/', { + 'username': username, + 'password': 'toast'}) + self.query_for_users() + + def logout(self): + self.test_app.get('/auth/logout/') + self.query_for_users() + + def query_for_users(self): + self.admin_user = User.query.filter(User.username==u'admin').first() + self.mod_user = User.query.filter(User.username==u'moderator').first() + self.user = User.query.filter(User.username==u'regular').first() + + def do_post(self, data, *context_keys, **kwargs): + url = kwargs.pop('url', '/submit/') + do_follow = kwargs.pop('do_follow', False) + template.clear_test_template_context() + response = self.test_app.post(url, data, **kwargs) + if do_follow: + response.follow() + context_data = template.TEMPLATE_TEST_CONTEXT + for key in context_keys: + context_data = context_data[key] + return response, context_data + + def testGiveOrTakeAwayPrivileges(self): + self.login(u'admin') + # First, test an admin taking away a privilege from a user + #---------------------------------------------------------------------- + response, context = self.do_post({'privilege_name':u'commenter'}, + url='/mod/users/{0}/privilege/'.format(self.user.username)) + assert response.status == '302 FOUND' + self.query_for_users() + assert not self.user.has_privilege(u'commenter') + + # Then, test an admin giving a privilege to a user + #---------------------------------------------------------------------- + response, context = self.do_post({'privilege_name':u'commenter'}, + url='/mod/users/{0}/privilege/'.format(self.user.username)) + assert response.status == '302 FOUND' + self.query_for_users() + assert self.user.has_privilege(u'commenter') + + # Then, test a mod trying to take away a privilege from a user + # they are not allowed to do this, so this will raise an error + #---------------------------------------------------------------------- + self.logout() + self.login(u'moderator') + + with pytest.raises(AppError) as excinfo: + response, context = self.do_post({'privilege_name':u'commenter'}, + url='/mod/users/{0}/privilege/'.format(self.user.username)) + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + self.query_for_users() + + assert self.user.has_privilege(u'commenter') + + def testReportResolution(self): + self.login(u'moderator') + + # First, test a moderators taking away a user's privilege in response + # to a reported comment + #---------------------------------------------------------------------- + fixture_add_comment_report(reported_user=self.user) + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.user).first() + + response = self.test_app.get('/mod/reports/{0}/'.format( + comment_report.id)) + assert response.status == '200 OK' + self.query_for_users() + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.user).first() + + response, context = self.do_post({'action_to_resolve':[u'takeaway'], + 'take_away_privileges':[u'commenter'], + 'targeted_user':self.user.id}, + url='/mod/reports/{0}/'.format(comment_report.id)) + + self.query_for_users() + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.user).first() + assert response.status == '302 FOUND' + assert not self.user.has_privilege(u'commenter') + assert comment_report.is_archived_report() is True + + fixture_add_comment_report(reported_user=self.user) + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.user).first() + + # Then, test a moderator sending an email to a user in response to a + # reported comment + #---------------------------------------------------------------------- + self.query_for_users() + + response, context = self.do_post({'action_to_resolve':[u'sendmessage'], + 'message_to_user':'This is your last warning, regular....', + 'targeted_user':self.user.id}, + url='/mod/reports/{0}/'.format(comment_report.id)) + + self.query_for_users() + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.user).first() + assert response.status == '302 FOUND' + assert mail.EMAIL_TEST_MBOX_INBOX == [{'to': [u'regular@example.com'], + 'message': 'Content-Type: text/plain; charset="utf-8"\n\ +MIME-Version: 1.0\nContent-Transfer-Encoding: base64\nSubject: Warning from- \ +moderator \nFrom: notice@mediagoblin.example.org\nTo: regular@example.com\n\n\ +VGhpcyBpcyB5b3VyIGxhc3Qgd2FybmluZywgcmVndWxhci4uLi4=\n', + 'from': 'notice@mediagoblin.example.org'}] + assert comment_report.is_archived_report() is True + + # Then test a moderator banning a user AND a moderator deleting the + # offending comment. This also serves as a test for taking multiple + # actions to resolve a report + #---------------------------------------------------------------------- + self.query_for_users() + fixture_add_comment(author=self.user.id, + comment=u'Comment will be removed') + test_comment = MediaComment.query.filter( + MediaComment.author==self.user.id).first() + fixture_add_comment_report(comment=test_comment, + reported_user=self.user) + comment_report = CommentReport.query.filter( + CommentReport.comment==test_comment).filter( + CommentReport.resolved==None).first() + + response, context = self.do_post( + {'action_to_resolve':[u'userban', u'delete'], + 'targeted_user':self.user.id, + 'why_user_was_banned':u'', + 'user_banned_until':u''}, + url='/mod/reports/{0}/'.format(comment_report.id)) + assert response.status == '302 FOUND' + self.query_for_users() + test_user_ban = UserBan.query.filter( + UserBan.user_id == self.user.id).first() + assert test_user_ban is not None + test_comment = MediaComment.query.filter( + MediaComment.author==self.user.id).first() + assert test_comment is None + + # Then, test what happens when a moderator attempts to punish an admin + # from a reported comment on an admin. + #---------------------------------------------------------------------- + fixture_add_comment_report(reported_user=self.admin_user) + comment_report = CommentReport.query.filter( + CommentReport.reported_user==self.admin_user).filter( + CommentReport.resolved==None).first() + + response, context = self.do_post({'action_to_resolve':[u'takeaway'], + 'take_away_privileges':[u'active'], + 'targeted_user':self.admin_user.id}, + url='/mod/reports/{0}/'.format(comment_report.id)) + self.query_for_users() + + assert response.status == '200 OK' + assert self.admin_user.has_privilege(u'active') + + def testAllModerationViews(self): + self.login(u'moderator') + username = self.user.username + self.query_for_users() + fixture_add_comment_report(reported_user=self.admin_user) + response = self.test_app.get('/mod/reports/') + assert response.status == "200 OK" + + response = self.test_app.get('/mod/reports/1/') + assert response.status == "200 OK" + + response = self.test_app.get('/mod/users/') + assert response.status == "200 OK" + + user_page_url = '/mod/users/{0}/'.format(username) + response = self.test_app.get(user_page_url) + assert response.status == "200 OK" + + self.test_app.get('/mod/media/') + assert response.status == "200 OK" + + def testBanUnBanUser(self): + self.login(u'admin') + username = self.user.username + user_id = self.user.id + ban_url = '/mod/users/{0}/ban/'.format(username) + response, context = self.do_post({ + 'user_banned_until':u'', + 'why_user_was_banned':u'Because I said so'}, + url=ban_url) + + assert response.status == "302 FOUND" + user_banned = UserBan.query.filter(UserBan.user_id==user_id).first() + assert user_banned is not None + assert user_banned.expiration_date is None + assert user_banned.reason == u'Because I said so' + + response, context = self.do_post({}, + url=ban_url) + + assert response.status == "302 FOUND" + user_banned = UserBan.query.filter(UserBan.user_id==user_id).first() + assert user_banned is None diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py index e075d475..3bf36f5f 100644 --- a/mediagoblin/tests/test_notifications.py +++ b/mediagoblin/tests/test_notifications.py @@ -38,7 +38,7 @@ class TestNotifications: # TODO: Possibly abstract into a decorator like: # @as_authenticated_user('chris') - self.test_user = fixture_add_user() + self.test_user = fixture_add_user(privileges=[u'active',u'commenter']) self.current_user = None @@ -75,7 +75,10 @@ class TestNotifications: ''' user = fixture_add_user('otherperson', password='nosreprehto', - wants_comment_notification=wants_email) + wants_comment_notification=wants_email, + privileges=[u'active',u'commenter']) + + assert user.wants_comment_notification == wants_email user_id = user.id @@ -124,6 +127,7 @@ otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyI else: assert mail.EMAIL_TEST_MBOX_INBOX == [] + # Save the ids temporarily because of DetachedInstanceError notification_id = notification.id comment_id = notification.subject.id @@ -153,7 +157,8 @@ otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyI def test_mark_all_comment_notifications_seen(self): """ Test that mark_all_comments_seen works""" - user = fixture_add_user('otherperson', password='nosreprehto') + user = fixture_add_user('otherperson', password='nosreprehto', + privileges=[u'active']) media_entry = fixture_media_entry(uploader=user.id, state=u'processed') diff --git a/mediagoblin/tests/test_oauth2.py b/mediagoblin/tests/test_oauth2.py index 86f9e8cc..957f4e65 100644 --- a/mediagoblin/tests/test_oauth2.py +++ b/mediagoblin/tests/test_oauth2.py @@ -38,7 +38,8 @@ class TestOAuth(object): self.pman = pluginapi.PluginManager() self.user_password = u'4cc355_70k3N' - self.user = fixture_add_user(u'joauth', self.user_password) + self.user = fixture_add_user(u'joauth', self.user_password, + privileges=[u'active']) self.login() diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py index 23a2290e..0424fdda 100644 --- a/mediagoblin/tests/test_openid.py +++ b/mediagoblin/tests/test_openid.py @@ -29,6 +29,7 @@ from mediagoblin.plugins.openid.models import OpenIDUserURL from mediagoblin.tests.tools import get_app, fixture_add_user from mediagoblin.tools import template + # App with plugin enabled @pytest.fixture() def openid_plugin_app(request): @@ -177,7 +178,7 @@ class TestOpenIDPlugin(object): # Correct place? assert urlparse.urlsplit(res.location)[2] == '/u/chris/' - assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT + assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT # No need to test if user is in logged in and verification email # awaits, since openid uses the register_user function which is @@ -237,7 +238,7 @@ class TestOpenIDPlugin(object): def test_add_delete(self, openid_plugin_app): """Test adding and deleting openids""" # Add user - test_user = fixture_add_user(password='') + test_user = fixture_add_user(password='', privileges=[u'active']) openid = OpenIDUserURL() openid.openid_url = 'http://real.myopenid.com' openid.user_id = test_user.id diff --git a/mediagoblin/tests/test_persona.py b/mediagoblin/tests/test_persona.py index 919877c9..a1cd30eb 100644 --- a/mediagoblin/tests/test_persona.py +++ b/mediagoblin/tests/test_persona.py @@ -22,6 +22,7 @@ pytest.importorskip("requests") from mediagoblin import mg_globals from mediagoblin.db.base import Session +from mediagoblin.db.models import Privilege from mediagoblin.tests.tools import get_app from mediagoblin.tools import template @@ -90,7 +91,7 @@ class TestPersonaPlugin(object): res.follow() assert urlparse.urlsplit(res.location)[2] == '/u/chris/' - assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT + assert 'mediagoblin/user_pages/user_nonactive.html' in template.TEMPLATE_TEST_CONTEXT # Try to register same Persona email address template.clear_test_template_context() @@ -112,8 +113,9 @@ class TestPersonaPlugin(object): # Get user and detach from session test_user = mg_globals.database.User.query.filter_by( username=u'chris').first() - test_user.email_verified = True - test_user.status = u'active' + active_privilege = Privilege.query.filter( + Privilege.privilege_name==u'active').first() + test_user.all_privileges.append(active_privilege) test_user.save() test_user = mg_globals.database.User.query.filter_by( username=u'chris').first() diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py new file mode 100644 index 00000000..05829b34 --- /dev/null +++ b/mediagoblin/tests/test_privileges.py @@ -0,0 +1,205 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import pytest +from datetime import date, timedelta +from webtest import AppError + +from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry + +from mediagoblin.db.models import User, UserBan +from mediagoblin.tools import template + +from .resources import GOOD_JPG + +class TestPrivilegeFunctionality: + + @pytest.fixture(autouse=True) + def _setup(self, test_app): + self.test_app = test_app + + fixture_add_user(u'alex', + privileges=[u'admin',u'active']) + fixture_add_user(u'meow', + privileges=[u'moderator',u'active',u'reporter']) + fixture_add_user(u'natalie', + privileges=[u'active']) + self.query_for_users() + + def login(self, username): + self.test_app.post( + '/auth/login/', { + 'username': username, + 'password': 'toast'}) + self.query_for_users() + + def logout(self): + self.test_app.get('/auth/logout/') + self.query_for_users() + + def do_post(self, data, *context_keys, **kwargs): + url = kwargs.pop('url', '/submit/') + do_follow = kwargs.pop('do_follow', False) + template.clear_test_template_context() + response = self.test_app.post(url, data, **kwargs) + if do_follow: + response.follow() + context_data = template.TEMPLATE_TEST_CONTEXT + for key in context_keys: + context_data = context_data[key] + return response, context_data + + def query_for_users(self): + self.admin_user = User.query.filter(User.username==u'alex').first() + self.mod_user = User.query.filter(User.username==u'meow').first() + self.user = User.query.filter(User.username==u'natalie').first() + + def testUserBanned(self): + self.login(u'natalie') + uid = self.user.id + # First, test what happens when a user is banned indefinitely + #---------------------------------------------------------------------- + user_ban = UserBan(user_id=uid, + reason=u'Testing whether user is banned', + expiration_date=None) + user_ban.save() + + response = self.test_app.get('/') + assert response.status == "200 OK" + assert "You are Banned" in response.body + # Then test what happens when that ban has an expiration date which + # hasn't happened yet + #---------------------------------------------------------------------- + user_ban = UserBan.query.get(uid) + user_ban.delete() + user_ban = UserBan(user_id=uid, + reason=u'Testing whether user is banned', + expiration_date= date.today() + timedelta(days=20)) + user_ban.save() + + response = self.test_app.get('/') + assert response.status == "200 OK" + assert "You are Banned" in response.body + + # Then test what happens when that ban has an expiration date which + # has already happened + #---------------------------------------------------------------------- + user_ban = UserBan.query.get(uid) + user_ban.delete() + exp_date = date.today() - timedelta(days=20) + user_ban = UserBan(user_id=uid, + reason=u'Testing whether user is banned', + expiration_date= exp_date) + user_ban.save() + + response = self.test_app.get('/') + assert response.status == "302 FOUND" + assert not "You are Banned" in response.body + + def testVariousPrivileges(self): + # The various actions that require privileges (ex. reporting, + # commenting, moderating...) are tested in other tests. This method + # will be used to ensure that those actions are impossible for someone + # without the proper privileges. + # For other tests that show what happens when a user has the proper + # privileges, check out: + # tests/test_moderation.py moderator + # tests/test_notifications.py commenter + # tests/test_reporting.py reporter + # tests/test_submission.py uploader + #---------------------------------------------------------------------- + self.login(u'natalie') + + # First test the get and post requests of submission/uploading + #---------------------------------------------------------------------- + with pytest.raises(AppError) as excinfo: + response = self.test_app.get('/submit/') + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + + with pytest.raises(AppError) as excinfo: + response = self.do_post({'upload_files':[('file',GOOD_JPG)], + 'title':u'Normal Upload 1'}, + url='/submit/') + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + # Test that a user cannot comment without the commenter privilege + #---------------------------------------------------------------------- + self.query_for_users() + + media_entry = fixture_media_entry(uploader=self.admin_user.id, + state=u'processed') + + media_entry_id = media_entry.id + media_uri_id = '/u/{0}/m/{1}/'.format(self.admin_user.username, + media_entry.id) + media_uri_slug = '/u/{0}/m/{1}/'.format(self.admin_user.username, + media_entry.slug) + response = self.test_app.get(media_uri_slug) + assert not "Add a comment" in response.body + + self.query_for_users() + with pytest.raises(AppError) as excinfo: + response = self.test_app.post( + media_uri_id + 'comment/add/', + {'comment_content': u'Test comment #42'}) + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + # Test that a user cannot report without the reporter privilege + #---------------------------------------------------------------------- + with pytest.raises(AppError) as excinfo: + response = self.test_app.get(media_uri_slug+"report/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + with pytest.raises(AppError) as excinfo: + response = self.do_post( + {'report_reason':u'Testing Reports #1', + 'reporter_id':u'3'}, + url=(media_uri_slug+"report/")) + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + # Test that a user cannot access the moderation pages w/o moderator + # or admin privileges + #---------------------------------------------------------------------- + with pytest.raises(AppError) as excinfo: + response = self.test_app.get("/mod/users/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + with pytest.raises(AppError) as excinfo: + response = self.test_app.get("/mod/reports/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + with pytest.raises(AppError) as excinfo: + response = self.test_app.get("/mod/media/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + with pytest.raises(AppError) as excinfo: + response = self.test_app.get("/mod/users/1/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + with pytest.raises(AppError) as excinfo: + response = self.test_app.get("/mod/reports/1/") + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) + + self.query_for_users() + + with pytest.raises(AppError) as excinfo: + response, context = self.do_post({'action_to_resolve':[u'takeaway'], + 'take_away_privileges':[u'active'], + 'targeted_user':self.admin_user.id}, + url='/mod/reports/1/') + self.query_for_users() + assert 'Bad response: 403 FORBIDDEN' in str(excinfo) diff --git a/mediagoblin/tests/test_reporting.py b/mediagoblin/tests/test_reporting.py new file mode 100644 index 00000000..a154a061 --- /dev/null +++ b/mediagoblin/tests/test_reporting.py @@ -0,0 +1,167 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +import pytest + +from mediagoblin.tools import template +from mediagoblin.tests.tools import (fixture_add_user, fixture_media_entry, + fixture_add_comment, fixture_add_comment_report) +from mediagoblin.db.models import (MediaReport, CommentReport, User, + MediaComment) + + +class TestReportFiling: + @pytest.fixture(autouse=True) + def _setup(self, test_app): + self.test_app = test_app + + fixture_add_user(u'allie', + privileges=[u'reporter',u'active']) + fixture_add_user(u'natalie', + privileges=[u'active', u'moderator']) + + def login(self, username): + self.test_app.post( + '/auth/login/', { + 'username': username, + 'password': 'toast'}) + + def logout(self): + self.test_app.get('/auth/logout/') + + def do_post(self, data, *context_keys, **kwargs): + url = kwargs.pop('url', '/submit/') + do_follow = kwargs.pop('do_follow', False) + template.clear_test_template_context() + response = self.test_app.post(url, data, **kwargs) + if do_follow: + response.follow() + context_data = template.TEMPLATE_TEST_CONTEXT + for key in context_keys: + context_data = context_data[key] + return response, context_data + + def query_for_users(self): + return (User.query.filter(User.username==u'allie').first(), + User.query.filter(User.username==u'natalie').first()) + + def testMediaReports(self): + self.login(u'allie') + allie_user, natalie_user = self.query_for_users() + allie_id = allie_user.id + + media_entry = fixture_media_entry(uploader=natalie_user.id, + state=u'processed') + + mid = media_entry.id + media_uri_slug = '/u/{0}/m/{1}/'.format(natalie_user.username, + media_entry.slug) + + response = self.test_app.get(media_uri_slug + "report/") + assert response.status == "200 OK" + + response, context = self.do_post( + {'report_reason':u'Testing Media Report', + 'reporter_id':unicode(allie_id)},url= media_uri_slug + "report/") + + assert response.status == "302 FOUND" + + media_report = MediaReport.query.first() + + allie_user, natalie_user = self.query_for_users() + assert media_report is not None + assert media_report.report_content == u'Testing Media Report' + assert media_report.reporter_id == allie_id + assert media_report.reported_user_id == natalie_user.id + assert media_report.created is not None + assert media_report.discriminator == 'media_report' + + def testCommentReports(self): + self.login(u'allie') + allie_user, natalie_user = self.query_for_users() + allie_id = allie_user.id + + media_entry = fixture_media_entry(uploader=natalie_user.id, + state=u'processed') + mid = media_entry.id + fixture_add_comment(media_entry=mid, + author=natalie_user.id) + comment = MediaComment.query.first() + + comment_uri_slug = '/u/{0}/m/{1}/c/{2}/'.format(natalie_user.username, + media_entry.slug, + comment.id) + + response = self.test_app.get(comment_uri_slug + "report/") + assert response.status == "200 OK" + + response, context = self.do_post({ + 'report_reason':u'Testing Comment Report', + 'reporter_id':unicode(allie_id)},url= comment_uri_slug + "report/") + + assert response.status == "302 FOUND" + + comment_report = CommentReport.query.first() + + allie_user, natalie_user = self.query_for_users() + assert comment_report is not None + assert comment_report.report_content == u'Testing Comment Report' + assert comment_report.reporter_id == allie_id + assert comment_report.reported_user_id == natalie_user.id + assert comment_report.created is not None + assert comment_report.discriminator == 'comment_report' + + def testArchivingReports(self): + self.login(u'natalie') + allie_user, natalie_user = self.query_for_users() + allie_id, natalie_id = allie_user.id, natalie_user.id + + fixture_add_comment(author=allie_user.id, + comment=u'Comment will be removed') + test_comment = MediaComment.query.filter( + MediaComment.author==allie_user.id).first() + fixture_add_comment_report(comment=test_comment, + reported_user=allie_user, + report_content=u'Testing Archived Reports #1', + reporter=natalie_user) + comment_report = CommentReport.query.filter( + CommentReport.reported_user==allie_user).first() + + assert comment_report.report_content == u'Testing Archived Reports #1' + response, context = self.do_post( + {'action_to_resolve':[u'userban', u'delete'], + 'targeted_user':allie_user.id, + 'resolution_content':u'This is a test of archiving reports.'}, + url='/mod/reports/{0}/'.format(comment_report.id)) + + assert response.status == "302 FOUND" + allie_user, natalie_user = self.query_for_users() + + archived_report = CommentReport.query.filter( + CommentReport.reported_user==allie_user).first() + + assert CommentReport.query.count() != 0 + assert archived_report is not None + assert archived_report.report_content == u'Testing Archived Reports #1' + assert archived_report.reporter_id == natalie_id + assert archived_report.reported_user_id == allie_id + assert archived_report.created is not None + assert archived_report.resolved is not None + assert archived_report.result == u'''This is a test of archiving reports. +natalie banned user allie indefinitely. +natalie deleted the comment.''' + assert archived_report.discriminator == 'comment_report' + diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 7f4e8086..b5b13ed3 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -47,12 +47,22 @@ class TestSubmission: # TODO: Possibly abstract into a decorator like: # @as_authenticated_user('chris') - test_user = fixture_add_user() - - self.test_user = test_user + fixture_add_user(privileges=[u'active',u'uploader', u'commenter']) self.login() + def our_user(self): + """ + Fetch the user we're submitting with. Every .get() or .post() + invalidates the session; this is a hacky workaround. + """ + #### FIXME: Pytest collects this as a test and runs this. + #### ... it shouldn't. At least it passes, but that's + #### totally stupid. + #### Also if we found a way to make this run it should be a + #### property. + return User.query.filter(User.username==u'chris').first() + def login(self): self.test_app.post( '/auth/login/', { @@ -98,10 +108,10 @@ class TestSubmission: def check_normal_upload(self, title, filename): response, context = self.do_post({'title': title}, do_follow=True, **self.upload_data(filename)) - self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + self.check_url(response, '/u/{0}/'.format(self.our_user().username)) assert 'mediagoblin/user_pages/user.html' in context # Make sure the media view is at least reachable, logged in... - url = '/u/{0}/m/{1}/'.format(self.test_user.username, + url = '/u/{0}/m/{1}/'.format(self.our_user().username, title.lower().replace(' ', '-')) self.test_app.get(url) # ... and logged out too. @@ -109,24 +119,19 @@ class TestSubmission: self.test_app.get(url) def user_upload_limits(self, uploaded=None, upload_limit=None): + our_user = self.our_user() + if uploaded: - self.test_user.uploaded = uploaded + our_user.uploaded = uploaded if upload_limit: - self.test_user.upload_limit = upload_limit - - self.test_user.save() + our_user.upload_limit = upload_limit - # Reload - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() - - # ... and detach from session: - Session.expunge(self.test_user) + our_user.save() + Session.expunge(our_user) def test_normal_jpg(self): # User uploaded should be 0 - assert self.test_user.uploaded == 0 + assert self.our_user().uploaded == 0 self.check_normal_upload(u'Normal upload 1', GOOD_JPG) @@ -135,10 +140,7 @@ class TestSubmission: file_size = float('{0:.2f}'.format(file_size)) # Reload user - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() - assert self.test_user.uploaded == file_size + assert self.our_user().uploaded == file_size def test_normal_png(self): self.check_normal_upload(u'Normal upload 2', GOOD_PNG) @@ -148,54 +150,44 @@ class TestSubmission: response, context = self.do_post({'title': u'Normal upload 3 (pdf)'}, do_follow=True, **self.upload_data(GOOD_PDF)) - self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + self.check_url(response, '/u/{0}/'.format(self.our_user().username)) assert 'mediagoblin/user_pages/user.html' in context def test_default_upload_limits(self): self.user_upload_limits(uploaded=500) # User uploaded should be 500 - assert self.test_user.uploaded == 500 + assert self.our_user().uploaded == 500 response, context = self.do_post({'title': u'Normal upload 4'}, do_follow=True, **self.upload_data(GOOD_JPG)) - self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + self.check_url(response, '/u/{0}/'.format(self.our_user().username)) assert 'mediagoblin/user_pages/user.html' in context - # Reload user - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() - # Shouldn't have uploaded - assert self.test_user.uploaded == 500 + assert self.our_user().uploaded == 500 def test_user_upload_limit(self): self.user_upload_limits(uploaded=25, upload_limit=25) # User uploaded should be 25 - assert self.test_user.uploaded == 25 + assert self.our_user().uploaded == 25 response, context = self.do_post({'title': u'Normal upload 5'}, do_follow=True, **self.upload_data(GOOD_JPG)) - self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + self.check_url(response, '/u/{0}/'.format(self.our_user().username)) assert 'mediagoblin/user_pages/user.html' in context - # Reload user - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() - # Shouldn't have uploaded - assert self.test_user.uploaded == 25 + assert self.our_user().uploaded == 25 def test_user_under_limit(self): self.user_upload_limits(uploaded=499) # User uploaded should be 499 - assert self.test_user.uploaded == 499 + assert self.our_user().uploaded == 499 response, context = self.do_post({'title': u'Normal upload 6'}, do_follow=False, @@ -204,13 +196,8 @@ class TestSubmission: assert form.file.errors == [u'Sorry, uploading this file will put you' ' over your upload limit.'] - # Reload user - self.test_user = User.query.filter_by( - username=self.test_user.username - ).first() - # Shouldn't have uploaded - assert self.test_user.uploaded == 499 + assert self.our_user().uploaded == 499 def test_big_file(self): response, context = self.do_post({'title': u'Normal upload 7'}, @@ -264,7 +251,7 @@ class TestSubmission: # render and post to the edit page. edit_url = request.urlgen( 'mediagoblin.edit.edit_media', - user=self.test_user.username, media_id=media_id) + user=self.our_user().username, media_id=media_id) self.test_app.get(edit_url) self.test_app.post(edit_url, {'title': u'Balanced Goblin', @@ -277,7 +264,7 @@ class TestSubmission: self.check_comments(request, media_id, 0) comment_url = request.urlgen( 'mediagoblin.user_pages.media_post_comment', - user=self.test_user.username, media_id=media_id) + user=self.our_user().username, media_id=media_id) response = self.do_post({'comment_content': 'i love this test'}, url=comment_url, do_follow=True)[0] self.check_comments(request, media_id, 1) @@ -286,7 +273,7 @@ class TestSubmission: # --------------------------------------------------- delete_url = request.urlgen( 'mediagoblin.user_pages.media_confirm_delete', - user=self.test_user.username, media_id=media_id) + user=self.our_user().username, media_id=media_id) # Empty data means don't confirm response = self.do_post({}, do_follow=True, url=delete_url)[0] media = self.check_media(request, {'title': u'Balanced Goblin'}, 1) @@ -299,13 +286,8 @@ class TestSubmission: self.check_media(request, {'id': media_id}, 0) self.check_comments(request, media_id, 0) - # Reload user - self.test_user = User.query.filter_by( - username = self.test_user.username - ).first() - # Check that user.uploaded is the same as before the upload - assert self.test_user.uploaded == 50 + assert self.our_user().uploaded == 50 def test_evil_file(self): # Test non-suppoerted file with non-supported extension @@ -359,7 +341,7 @@ class TestSubmission: # they'll be caught as failures during the processing step. response, context = self.do_post({'title': title}, do_follow=True, **self.upload_data(filename)) - self.check_url(response, '/u/{0}/'.format(self.test_user.username)) + self.check_url(response, '/u/{0}/'.format(self.our_user().username)) entry = mg_globals.database.MediaEntry.query.filter_by(title=title).first() assert entry.state == 'failed' assert entry.fail_error == u'mediagoblin.processing:BadMediaFail' diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 98361adc..060dfda9 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -25,7 +25,7 @@ from webtest import TestApp from mediagoblin import mg_globals from mediagoblin.db.models import User, MediaEntry, Collection, MediaComment, \ - CommentSubscription, CommentNotification + CommentSubscription, CommentNotification, Privilege, CommentReport from mediagoblin.tools import testing from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.db.base import Session @@ -33,6 +33,8 @@ from mediagoblin.meddleware import BaseMeddleware from mediagoblin.auth import gen_password_hash from mediagoblin.gmg_commands.dbupdate import run_dbupdate +from datetime import datetime + MEDIAGOBLIN_TEST_DB_NAME = u'__mediagoblin_tests__' TEST_SERVER_CONFIG = pkg_resources.resource_filename( @@ -133,7 +135,6 @@ def get_app(request, paste_config=None, mgoblin_config=None): mg_globals.app.meddleware.insert(0, TestingMeddleware(mg_globals.app)) app = TestApp(test_app) - return app @@ -170,7 +171,7 @@ def assert_db_meets_expected(db, expected): def fixture_add_user(username=u'chris', password=u'toast', - active_user=True, wants_comment_notification=True): + privileges=[], wants_comment_notification=True): # Reuse existing user or create a new one test_user = User.query.filter_by(username=username).first() if test_user is None: @@ -179,14 +180,13 @@ def fixture_add_user(username=u'chris', password=u'toast', test_user.email = username + u'@example.com' if password is not None: test_user.pw_hash = gen_password_hash(password) - if active_user: - test_user.email_verified = True - test_user.status = u'active' - test_user.wants_comment_notification = wants_comment_notification + for privilege in privileges: + query = Privilege.query.filter(Privilege.privilege_name==privilege) + if query.count(): + test_user.all_privileges.append(query.one()) test_user.save() - # Reload test_user = User.query.filter_by(username=username).first() @@ -314,3 +314,32 @@ def fixture_add_comment(author=None, media_entry=None, comment=None): return comment +def fixture_add_comment_report(comment=None, reported_user=None, + reporter=None, created=None, report_content=None): + if comment is None: + comment = fixture_add_comment() + + if reported_user is None: + reported_user = fixture_add_user() + + if reporter is None: + reporter = fixture_add_user() + + if created is None: + created=datetime.now() + + if report_content is None: + report_content = \ + 'Auto-generated test report' + + comment_report = CommentReport(comment=comment, + reported_user = reported_user, + reporter = reporter, + created = created, + report_content=report_content) + + comment_report.save() + + Session.expunge(comment_report) + + return comment_report diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index b0401e08..cd99a230 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -21,6 +21,8 @@ from werkzeug.wrappers import Response as wz_Response from mediagoblin.tools.template import render_template from mediagoblin.tools.translate import (lazy_pass_to_ugettext as _, pass_to_ugettext) +from mediagoblin.db.models import UserBan, User +from datetime import date class Response(wz_Response): """Set default response mimetype to HTML, otherwise we get text/plain""" @@ -50,7 +52,8 @@ def render_400(request, err_msg=None): _ = pass_to_ugettext title = _("Bad Request") if err_msg is None: - err_msg = _("The request sent to the server is invalid, please double check it") + err_msg = _("The request sent to the server is invalid, \ +please double check it") return render_error(request, 400, title, err_msg) @@ -71,6 +74,21 @@ def render_404(request): "you're looking for has been moved or deleted.") return render_error(request, 404, err_msg=err_msg) +def render_user_banned(request): + """Renders the page which tells a user they have been banned, for how long + and the reason why they have been banned" + """ + user_ban = UserBan.query.get(request.user.id) + if (user_ban.expiration_date is not None and + date.today()>user_ban.expiration_date): + + user_ban.delete() + return redirect(request, + 'index') + return render_to_response(request, + 'mediagoblin/banned.html', + {'reason':user_ban.reason, + 'expiration_date':user_ban.expiration_date}) def render_http_exception(request, exc, description): """Return Response() given a werkzeug.HTTPException @@ -126,7 +144,7 @@ def json_response(serializable, _disable_cors=False, *args, **kw): Any extra arguments and keyword arguments are passed to the Response.__init__ method. ''' - + response = wz_Response(json.dumps(serializable), *args, content_type='application/json', **kw) if not _disable_cors: diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py index ac8084c5..eb786f47 100644 --- a/mediagoblin/user_pages/forms.py +++ b/mediagoblin/user_pages/forms.py @@ -49,3 +49,15 @@ class MediaCollectForm(wtforms.Form): description=_("""You can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank"> Markdown</a> for formatting.""")) + +class CommentReportForm(wtforms.Form): + report_reason = wtforms.TextAreaField( + _('Reason for Reporting'), + [wtforms.validators.Required()]) + reporter_id = wtforms.HiddenField('') + +class MediaReportForm(wtforms.Form): + report_reason = wtforms.TextAreaField( + _('Reason for Reporting'), + [wtforms.validators.Required()]) + reporter_id = wtforms.HiddenField('') diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py index 2f47e4b1..e5c8defc 100644 --- a/mediagoblin/user_pages/lib.py +++ b/mediagoblin/user_pages/lib.py @@ -19,7 +19,9 @@ from mediagoblin.tools.template import render_template from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin import mg_globals from mediagoblin.db.base import Session -from mediagoblin.db.models import CollectionItem +from mediagoblin.db.models import (CollectionItem, MediaReport, CommentReport, + MediaComment, MediaEntry) +from mediagoblin.user_pages import forms as user_forms def send_comment_email(user, comment, media, request): @@ -69,9 +71,48 @@ def add_media_to_collection(collection, media, note=None, commit=True): collection.items = collection.items + 1 Session.add(collection) - - media.collected = media.collected + 1 Session.add(media) if commit: Session.commit() + +def build_report_object(report_form, media_entry=None, comment=None): + """ + This function is used to convert a form object (from a User filing a + report) into either a MediaReport or CommentReport object. + + :param report_form A MediaReportForm or a CommentReportForm object + with valid information from a POST request. + :param media_entry A MediaEntry object. The MediaEntry being repo- + -rted by a MediaReport. In a CommentReport, + this will be None. + :param comment A MediaComment object. The MediaComment being + reported by a CommentReport. In a MediaReport + this will be None. + + :returns A MediaReport object if a valid MediaReportForm is + passed as kwarg media_entry. This MediaReport has + not been saved. + :returns A CommentReport object if a valid CommentReportForm + is passed as kwarg comment. This CommentReport + has not been saved. + :returns None if the form_dict is invalid. + """ + + if report_form.validate() and comment is not None: + report_object = CommentReport() + report_object.comment_id = comment.id + report_object.reported_user_id = MediaComment.query.get( + comment.id).get_author.id + elif report_form.validate() and media_entry is not None: + report_object = MediaReport() + report_object.media_entry_id = media_entry.id + report_object.reported_user_id = MediaEntry.query.get( + media_entry.id).get_uploader.id + else: + return None + + report_object.report_content = report_form.report_reason.data + report_object.reporter_id = report_form.reporter_id.data + return report_object + diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index b1dde397..f0f4d8b7 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -23,6 +23,10 @@ add_route('mediagoblin.user_pages.media_home', '/u/<string:user>/m/<string:media>/', 'mediagoblin.user_pages.views:media_home') +add_route('mediagoblin.user_pages.media_home.report_media', + '/u/<string:user>/m/<string:media>/report/', + 'mediagoblin.user_pages.views:file_a_report') + add_route('mediagoblin.user_pages.media_confirm_delete', '/u/<string:user>/m/<int:media_id>/confirm-delete/', 'mediagoblin.user_pages.views:media_confirm_delete') @@ -44,6 +48,10 @@ add_route('mediagoblin.user_pages.media_home.view_comment', '/u/<string:user>/m/<string:media>/c/<int:comment>/', 'mediagoblin.user_pages.views:media_home') +add_route('mediagoblin.user_pages.media_home.report_comment', + '/u/<string:user>/m/<string:media>/c/<int:comment>/report/', + 'mediagoblin.user_pages.views:file_a_report') + # User's tags gallery add_route('mediagoblin.user_pages.user_tag_gallery', '/u/<string:user>/tag/<string:tag>/', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index cbb1ac26..c0553b18 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -27,13 +27,16 @@ from mediagoblin.tools.text import cleaned_markdown_conversion from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.pagination import Pagination from mediagoblin.user_pages import forms as user_forms -from mediagoblin.user_pages.lib import add_media_to_collection +from mediagoblin.user_pages.lib import (send_comment_email, + add_media_to_collection, build_report_object) from mediagoblin.notifications import trigger_notification, \ add_comment_subscription, mark_comment_notification_seen + from mediagoblin.decorators import (uses_pagination, get_user_media_entry, - get_media_entry_by_id, + get_media_entry_by_id, user_has_privilege, user_not_banned, require_active_login, user_may_delete_media, user_may_alter_collection, - get_user_collection, get_user_collection_item, active_user_from_url) + get_user_collection, get_user_collection_item, active_user_from_url, + get_optional_media_comment_by_id, allow_reporting) from werkzeug.contrib.atom import AtomFeed from werkzeug.exceptions import MethodNotAllowed @@ -43,20 +46,17 @@ from werkzeug.wrappers import Response _log = logging.getLogger(__name__) _log.setLevel(logging.DEBUG) - +@user_not_banned @uses_pagination def user_home(request, page): """'Homepage' of a User()""" - # TODO: decide if we only want homepages for active users, we can - # then use the @get_active_user decorator and also simplify the - # template html. user = User.query.filter_by(username=request.matchdict['user']).first() if not user: return render_404(request) - elif user.status != u'active': + elif not user.has_privilege(u'active'): return render_to_response( request, - 'mediagoblin/user_pages/user.html', + 'mediagoblin/user_pages/user_nonactive.html', {'user': user}) cursor = MediaEntry.query.\ @@ -82,7 +82,7 @@ def user_home(request, page): 'media_entries': media_entries, 'pagination': pagination}) - +@user_not_banned @active_user_from_url @uses_pagination def user_gallery(request, page, url_user=None): @@ -117,7 +117,7 @@ def user_gallery(request, page, url_user=None): MEDIA_COMMENTS_PER_PAGE = 50 - +@user_not_banned @get_user_media_entry @uses_pagination def media_home(request, media, page, **kwargs): @@ -157,7 +157,7 @@ def media_home(request, media, page, **kwargs): @get_media_entry_by_id -@require_active_login +@user_has_privilege(u'commenter') def media_post_comment(request, media): """ recieves POST from a MediaEntry() comment form, saves the comment. @@ -168,7 +168,6 @@ def media_post_comment(request, media): comment = request.db.MediaComment() comment.media_entry = media.id comment.author = request.user.id - print request.form['comment_content'] comment.content = unicode(request.form['comment_content']) # Show error message if commenting is disabled. @@ -208,6 +207,7 @@ def media_preview_comment(request): return Response(json.dumps(cleancomment)) +@user_not_banned @get_media_entry_by_id @require_active_login def media_collect(request, media): @@ -337,7 +337,7 @@ def media_confirm_delete(request): _("The media was not deleted because you didn't check that you were sure.")) return redirect_obj(request, media) - if ((request.user.is_admin and + if ((request.user.has_privilege(u'admin') and request.user.id != media.uploader)): messages.add_message( request, messages.WARNING, @@ -350,7 +350,7 @@ def media_confirm_delete(request): {'media': media, 'form': form}) - +@user_not_banned @active_user_from_url @uses_pagination def user_collection(request, page, url_user=None): @@ -380,7 +380,7 @@ def user_collection(request, page, url_user=None): 'collection_items': collection_items, 'pagination': pagination}) - +@user_not_banned @active_user_from_url def collection_list(request, url_user=None): """A User-defined Collection""" @@ -407,7 +407,6 @@ def collection_item_confirm_remove(request, collection_item): if form.confirm.data is True: entry = collection_item.get_media_entry - entry.collected = entry.collected - 1 entry.save() collection_item.delete() @@ -423,7 +422,7 @@ def collection_item_confirm_remove(request, collection_item): return redirect_obj(request, collection) - if ((request.user.is_admin and + if ((request.user.has_privilege(u'admin') and request.user.id != collection_item.in_collection.creator)): messages.add_message( request, messages.WARNING, @@ -454,7 +453,6 @@ def collection_confirm_delete(request, collection): # Delete all the associated collection items for item in collection.get_collection_items(): entry = item.get_media_entry - entry.collected = entry.collected - 1 entry.save() item.delete() @@ -471,7 +469,7 @@ def collection_confirm_delete(request, collection): return redirect_obj(request, collection) - if ((request.user.is_admin and + if ((request.user.has_privilege(u'admin') and request.user.id != collection.creator)): messages.add_message( request, messages.WARNING, @@ -493,9 +491,8 @@ def atom_feed(request): generates the atom feed with the newest images """ user = User.query.filter_by( - username = request.matchdict['user'], - status = u'active').first() - if not user: + username = request.matchdict['user']).first() + if not user or not user.has_privilege(u'active'): return render_404(request) cursor = MediaEntry.query.filter_by( @@ -556,9 +553,8 @@ def collection_atom_feed(request): generates the atom feed with the newest images from a collection """ user = User.query.filter_by( - username = request.matchdict['user'], - status = u'active').first() - if not user: + username = request.matchdict['user']).first() + if not user or not user.has_privilege(u'active'): return render_404(request) collection = Collection.query.filter_by( @@ -620,7 +616,6 @@ def collection_atom_feed(request): return feed.get_response() - @require_active_login def processing_panel(request): """ @@ -632,7 +627,7 @@ def processing_panel(request): # # Make sure we have permission to access this user's panel. Only # admins and this user herself should be able to do so. - if not (user.id == request.user.id or request.user.is_admin): + if not (user.id == request.user.id or request.user.has_privilege(u'admin')): # No? Simply redirect to this user's homepage. return redirect( request, 'mediagoblin.user_pages.user_home', @@ -664,3 +659,44 @@ def processing_panel(request): 'processing_entries': processing_entries, 'failed_entries': failed_entries, 'processed_entries': processed_entries}) + +@allow_reporting +@get_user_media_entry +@user_has_privilege(u'reporter') +@get_optional_media_comment_by_id +def file_a_report(request, media, comment): + """ + This view handles the filing of a MediaReport or a CommentReport. + """ + if comment is not None: + if not comment.get_media_entry.id == media.id: + return render_404(request) + + form = user_forms.CommentReportForm(request.form) + context = {'media': media, + 'comment':comment, + 'form':form} + else: + form = user_forms.MediaReportForm(request.form) + context = {'media': media, + 'form':form} + form.reporter_id.data = request.user.id + + + if request.method == "POST": + report_object = build_report_object(form, + media_entry=media, + comment=comment) + + # if the object was built successfully, report_table will not be None + if report_object: + report_object.save() + return redirect( + request, + 'index') + + + return render_to_response( + request, + 'mediagoblin/user_pages/report.html', + context) diff --git a/mediagoblin/views.py b/mediagoblin/views.py index 6acd7e96..4185c1b6 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -17,11 +17,11 @@ from mediagoblin import mg_globals from mediagoblin.db.models import MediaEntry from mediagoblin.tools.pagination import Pagination -from mediagoblin.tools.response import render_to_response -from mediagoblin.decorators import uses_pagination - +from mediagoblin.tools.response import render_to_response, render_404 +from mediagoblin.decorators import uses_pagination, user_not_banned +@user_not_banned @uses_pagination def root_view(request, page): cursor = MediaEntry.query.filter_by(state=u'processed').\ @@ -44,3 +44,10 @@ def simple_template_render(request): template_name = request.matchdict['template'] return render_to_response( request, template_name, {}) + +def terms_of_service(request): + if mg_globals.app_config["show_tos"] is False: + return render_404(request) + + return render_to_response(request, + 'mediagoblin/terms_of_service.html', {}) @@ -32,8 +32,8 @@ def get_version(): raise RuntimeError("Unable to find version string in %s." % VERSIONFILE) - -setup( +try: + setup( name="mediagoblin", version=get_version(), packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), @@ -42,6 +42,7 @@ setup( # scripts and dependencies install_requires=[ 'setuptools', + 'python-dateutil', 'PasteScript', 'wtforms', 'py-bcrypt', @@ -107,3 +108,17 @@ setup( "Topic :: Internet :: WWW/HTTP :: Dynamic Content" ], ) +except TypeError, e: + # Check if the problem is caused by the sqlalchemy/setuptools conflict + msg_as_str = str(e) + if not (msg_as_str == 'dist must be a Distribution instance'): + raise + + # If so, tell the user it is OK to just run the script again. + print "\n\n---------- NOTE ----------" + print "The setup.py command you ran failed." + print "" + print ("It is a known possible failure. Just run it again. It works the " + "second time.") + import sys + sys.exit(1) |
