diff options
131 files changed, 22924 insertions, 6913 deletions
@@ -4,5 +4,5 @@ source_file = mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po source_lang = en [main] -host = https://www.transifex.net +host = https://transifex.com @@ -18,11 +18,13 @@ Thank you! * András Veres-Szentkirályi * Bassam Kurdali * Bernhard Keller +* Brandon Invergo * Brett Smith * Caleb Forbes Davis V * Corey Farwell * Chris Moylan * Christopher Allan Webber +* Dan Callahan * David Thompson * Daniel Neel * Deb Nicholson @@ -41,11 +43,14 @@ Thank you! * Joar Wandborg * Jorge Araya Navarro * Karen Rustad +* Kenneth Dombrowski +* Kushal Kumaran * Kuno Woudt * Laura Arjona * Larisa Hoffenbecker * Luke Slater * Manuel Urbano Santos +* Marcel van der Boom * Mark Holmquist * Mats Sjöberg * Matt Lee @@ -61,20 +66,25 @@ Thank you! * Rodney Ewing * Runar Petursson * Sacha De'Angeli +* Sam Clegg * Sam Kleinman * Sam Tuke * Sebastian Spaeth * Shawn Khan * Simon Fondrie-Teitler * Stefano Zacchiroli +* sturm * Tiberiu C. Turbureanu * Tran Thanh Bao * Tryggvi Björgvinsson * Shawn Khan * Will Kahn-Greene -If you think your name should be on this list, let us know! +Special thanks to: + +* Starblessed of viewskew (lending server space!) +If you think your name should be on this list, let us know! We also are currently borrowing an image in mediagoblin/static/images/media_thumbs/image.png from the wonderful diff --git a/docs/Makefile b/docs/Makefile index 4461893f..0b97bf7c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ # # You can set these variables from the command line. -SPHINXOPTS = -W +SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = BUILDDIR = build diff --git a/docs/source/api/client_register.rst b/docs/source/api/client_register.rst index 4ad7908e..08f92c47 100644 --- a/docs/source/api/client_register.rst +++ b/docs/source/api/client_register.rst @@ -49,7 +49,7 @@ redirect_uri Response -------- -You will get back a response:: +You will get back a response: client_id This identifies a client diff --git a/docs/source/index.rst b/docs/source/index.rst index 777c4d26..e7fda4ad 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -56,7 +56,6 @@ Part 2: Core plugin documentation plugindocs/flatpagesfile plugindocs/sampleplugin - plugindocs/oauth plugindocs/trim_whitespace plugindocs/raven plugindocs/basic_auth diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 6123dc9e..de4ce1ac 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -203,18 +203,20 @@ Clone the MediaGoblin repository and set up the git submodules:: cd mediagoblin git submodule init && git submodule update -Set up the in-package virtualenv via make:: - ./bootstrap.sh && ./configure && make +And set up the in-package virtualenv:: + + (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop .. note:: - Prefer not to use make, or want to use the "old way" of installing - MediaGoblin (maybe you know how to use virtualenv and python - packaging)? You still can! All that the above make script is doing - is installing an in-package virtualenv and running + We presently have an experimental make-style deployment system. if + you'd like to try it, instead of the above command, you can run:: + + ./bootstrap.sh && ./configure && make - ./bin/python setup.py develop + This also includes a number of nice features, such as keeping your + viratualenv up to date by simply running `make update`. .. :: diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 72fcb3d4..8f34e145 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -22,6 +22,74 @@ If you're upgrading from a previous release, please read it carefully, or at least skim over it. +0.5.0 +===== + +**NOTE:** If using the API is important to you, we're in a state of +ransition towards a new API via the Pump API. As such, though the old +API still probably works, some changes have happened to the way oauth +works to make it more Pump-compatible. If you're heavily using +clients using the old API, you may wish to hold off on upgrading for +now. Otherwise, jump in and have fun! :) + +**Do this to upgrade** + +1. Make sure to run + ``./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate`` + after upgrading. + +.. mention something about new, experimental configure && make support + +2. Note that a couple of things have changed with ``mediagoblin.ini``. First + we have a new Authentication System. You need to add + ``[[mediagoblin.plugins.basic_auth]]`` under the ``[plugins]`` section of + your config file. Second, media types are now plugins, so you need to add + each media type under the ``[plugins]`` section of your config file. + + +3. We have made a script to transition your ``mediagoblin_local.ini`` file for + you. This script can be found at + +.. add a link to the script + +If you run into problems, don't hesitate to +`contact us <http://mediagoblin.org/pages/join.html>`_ +(IRC is often best). + +**New features** + +* As mentioned above, we now have a plugable Authentication system. You can + use any combination of the multiple authentication systems + (:ref:`basic_auth-chapter`, :ref:`persona-chapter`, :ref:`openid-chapter`) + or write your own! +* Media types are now plugins! This means that new media types will + be able to do new, fancy things they couldn't in the future. +* We now have notification support! This allows you to subscribe to media + comments and to be notified when someone comments on your media. +* New reprocessing framework! You can now reprocess failed uploads, and + send already processed media back to processing to re-transcode or resize + media. +* Comment preview! +* Users now have the ability to change their email associated with their + account. +* New oauth code as we move closer to federation support. +* Experimental pyconfigure support for GNU-style configue and makefile + deployment. +* Database foundations! You can now pre-populate the database models. +* Way faster unit test run-time via in-memory database. +* All mongokit stuff has been cleaned up. +* Fixes for non-ascii filenames. +* The option to stay logged in. +* Mediagoblin has been upgraded to use the latest `celery <http://celeryproject.org/>`_ + version. +* You can now add jinja2 extensions to your config file to use in custom + templates. +* Fixed video permission issues. +* Mediagoblin docs are now hosted with multiple versions. +* We removed redundent tooltips from the STL media display. +* We are now using itsdangerous for verification tokens. + + 0.4.1 ===== @@ -80,6 +148,7 @@ please note the following: **New features** + * PDF media type! * Improved plugin system. More flexible, better documented, with a new plugin authoring section of the docs. diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index 94629775..3594c909 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.5.0.dev" +__version__ = "0.6.0.dev" diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 5e2a2af0..6f343d0e 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -341,7 +341,7 @@ def verify_forgot_password(request): messages.add_message( request, messages.ERROR, _('You are no longer an active user. Please contact the system' - ' admin to reactivate your accoutn.')) + ' admin to reactivate your account.')) return redirect( request, 'index') diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 8f03509d..43e1898c 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -104,47 +104,6 @@ max_height = integer(default=640) max_width = integer(default=180) max_height = integer(default=180) -[media_type:mediagoblin.media_types.image] -# One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS -resize_filter = string(default="ANTIALIAS") -#level of compression used when resizing images -quality = integer(default=90) - -[media_type:mediagoblin.media_types.video] -# Should we keep the original file? -keep_original = boolean(default=False) - -# 0 means autodetect, autodetect means number_of_CPUs - 1 -vp8_threads = integer(default=0) -# Range: 0..10 -vp8_quality = integer(default=8) -# Range: -0.1..1 -vorbis_quality = float(default=0.3) - -# Autoplay the video when page is loaded? -auto_play = boolean(default=False) - -[[skip_transcode]] -mime_types = string_list(default=list("video/webm")) -container_formats = string_list(default=list("Matroska")) -video_codecs = string_list(default=list("VP8 video")) -audio_codecs = string_list(default=list("Vorbis")) -dimensions_match = boolean(default=True) - -[media_type:mediagoblin.media_types.audio] -keep_original = boolean(default=True) -# vorbisenc quality -quality = float(default=0.3) -create_spectrogram = boolean(default=True) -spectrogram_fft_size = integer(default=4096) - -[media_type:mediagoblin.media_types.ascii] -thumbnail_font = string(default=None) - -[media_type:mediagoblin.media_types.pdf] -pdf_js = boolean(default=True) - - [celery] # default result stuff CELERY_RESULT_BACKEND = string(default="database") diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index eb3f9880..2e05bf2a 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -301,7 +301,6 @@ def drop_token_related_User_columns(db): metadata = MetaData(bind=db.bind) user_table = inspect_table(metadata, 'core__users') - verification_key = user_table.columns['verification_key'] fp_verification_key = user_table.columns['fp_verification_key'] fp_token_expire = user_table.columns['fp_token_expire'] @@ -323,7 +322,6 @@ class CommentSubscription_v0(declarative_base()): user_id = Column(Integer, ForeignKey(User.id), nullable=False) - notify = Column(Boolean, nullable=False, default=True) send_email = Column(Boolean, nullable=False, default=True) @@ -369,6 +367,8 @@ def add_new_notification_tables(db): CommentNotification_v0.__table__.create(db.bind) ProcessingNotification_v0.__table__.create(db.bind) + db.commit() + @RegisterMigration(13, MIGRATIONS) def pw_hash_nullable(db): @@ -384,6 +384,9 @@ def pw_hash_nullable(db): constraint = UniqueConstraint('username', table=user_table) constraint.create() + db.commit() + + # oauth1 migrations class Client_v0(declarative_base()): """ @@ -462,6 +465,16 @@ def create_oauth1_tables(db): db.commit() + +@RegisterMigration(15, MIGRATIONS) +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() + class ReportBase_v0(declarative_base()): __tablename__ = 'core__reports' id = Column(Integer, primary_key=True) @@ -483,6 +496,8 @@ class CommentReport_v0(ReportBase_v0): primary_key=True) comment_id = Column(Integer, ForeignKey(MediaComment.id), nullable=False) + + class MediaReport_v0(ReportBase_v0): __tablename__ = 'core__reports_on_media' __mapper_args__ = {'polymorphic_identity': 'media_report'} @@ -515,7 +530,7 @@ class PrivilegeUserAssociation_v0(declarative_base()): ForeignKey(Privilege.id), primary_key=True) -@RegisterMigration(15, MIGRATIONS) +@RegisterMigration(16, MIGRATIONS) def create_moderation_tables(db): ReportBase_v0.__table__.create(db.bind) CommentReport_v0.__table__.create(db.bind) @@ -531,7 +546,7 @@ def create_moderation_tables(db): p.save() -@RegisterMigration(16, MIGRATIONS) +@RegisterMigration(17, MIGRATIONS) def update_user_privilege_columns(db): # first, create the privileges which would be created by foundations default_privileges = Privilege.query.filter( diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 3f9fde3a..cec311f2 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -70,6 +70,7 @@ class User(Base, UserMixin): # 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) #--column admin is VESTIGIAL with privileges and should not be used------------ #--should be dropped ASAP though a bug in sqlite3 prevents this atm------------ diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py index 85c243a0..388940b4 100644 --- a/mediagoblin/edit/forms.py +++ b/mediagoblin/edit/forms.py @@ -61,12 +61,10 @@ class EditProfileForm(wtforms.Form): class EditAccountForm(wtforms.Form): - new_email = wtforms.TextField( - _('New email address'), - [wtforms.validators.Optional(), - normalize_user_or_email_field(allow_user=False)]) wants_comment_notification = wtforms.BooleanField( description=_("Email me when others comment on my media")) + wants_notifications = wtforms.BooleanField( + description=_("Enable insite notifications about events.")) license_preference = wtforms.SelectField( _('License preference'), [ @@ -111,3 +109,15 @@ class ChangePassForm(wtforms.Form): [wtforms.validators.Required(), wtforms.validators.Length(min=6, max=30)], id="password") + + +class ChangeEmailForm(wtforms.Form): + new_email = wtforms.TextField( + _('New email address'), + [wtforms.validators.Required(), + normalize_user_or_email_field(allow_user=False)]) + password = wtforms.PasswordField( + _('Password'), + [wtforms.validators.Required()], + description=_( + "Enter your password to prove you own this account.")) diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py index 3592f708..75f5a6d8 100644 --- a/mediagoblin/edit/routing.py +++ b/mediagoblin/edit/routing.py @@ -28,3 +28,5 @@ 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/', + 'mediagoblin.edit.views:change_email') diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index c6c3c03e..28952fa0 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -228,24 +228,22 @@ def edit_account(request): user = request.user form = forms.EditAccountForm(request.form, wants_comment_notification=user.wants_comment_notification, - license_preference=user.license_preference) + license_preference=user.license_preference, + wants_notifications=user.wants_notifications) if request.method == 'POST' and form.validate(): user.wants_comment_notification = form.wants_comment_notification.data + user.wants_notifications = form.wants_notifications.data user.license_preference = form.license_preference.data - if form.new_email.data: - _update_email(request, form, user) - - if not form.errors: - user.save() - messages.add_message(request, - messages.SUCCESS, - _("Account settings saved")) - return redirect(request, - 'mediagoblin.user_pages.user_home', - user=user.username) + user.save() + messages.add_message(request, + messages.SUCCESS, + _("Account settings saved")) + return redirect(request, + 'mediagoblin.user_pages.user_home', + user=user.username) return render_to_response( request, @@ -425,30 +423,52 @@ def verify_email(request): user=user.username) -def _update_email(request, form, user): - new_email = form.new_email.data - users_with_email = User.query.filter_by( - email=new_email).count() - - if users_with_email: - form.new_email.errors.append( - _('Sorry, a user with that email address' - ' already exists.')) - - elif not users_with_email: - verification_key = get_timed_signer_url( - 'mail_verification_token').dumps({ - 'user': user.id, - 'email': new_email}) - - rendered_email = render_template( - request, 'mediagoblin/edit/verification.txt', - {'username': user.username, - 'verification_url': EMAIL_VERIFICATION_TEMPLATE.format( - uri=request.urlgen('mediagoblin.edit.verify_email', - qualified=True), - verification_key=verification_key)}) - - email_debug_message(request) - auth_tools.send_verification_email(user, request, new_email, - rendered_email) +def change_email(request): + """ View to change the user's email """ + form = forms.ChangeEmailForm(request.form) + user = request.user + + # If no password authentication, no need to enter a password + if 'pass_auth' not in request.template_env.globals or not user.pw_hash: + form.__delitem__('password') + + if request.method == 'POST' and form.validate(): + new_email = form.new_email.data + users_with_email = User.query.filter_by( + email=new_email).count() + + if users_with_email: + form.new_email.errors.append( + _('Sorry, a user with that email address' + ' already exists.')) + + if form.password and user.pw_hash and not auth.check_password( + form.password.data, user.pw_hash): + form.password.errors.append( + _('Wrong password')) + + if not form.errors: + verification_key = get_timed_signer_url( + 'mail_verification_token').dumps({ + 'user': user.id, + 'email': new_email}) + + rendered_email = render_template( + request, 'mediagoblin/edit/verification.txt', + {'username': user.username, + 'verification_url': EMAIL_VERIFICATION_TEMPLATE.format( + uri=request.urlgen('mediagoblin.edit.verify_email', + qualified=True), + verification_key=verification_key)}) + + email_debug_message(request) + auth_tools.send_verification_email(user, request, new_email, + rendered_email) + + return redirect(request, 'mediagoblin.edit.account') + + return render_to_response( + request, + 'mediagoblin/edit/change_email.html', + {'form': form, + 'user': user}) diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index d8156126..165a76fd 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -45,6 +45,10 @@ SUBCOMMAND_MAP = { 'setup': 'mediagoblin.gmg_commands.assetlink:assetlink_parser_setup', 'func': 'mediagoblin.gmg_commands.assetlink:assetlink', 'help': 'Link assets for themes and plugins for static serving'}, + 'reprocess': { + 'setup': 'mediagoblin.gmg_commands.reprocess:reprocess_parser_setup', + 'func': 'mediagoblin.gmg_commands.reprocess:reprocess', + '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/import_export.py b/mediagoblin/gmg_commands/import_export.py index 98ec617d..fbac09f6 100644 --- a/mediagoblin/gmg_commands/import_export.py +++ b/mediagoblin/gmg_commands/import_export.py @@ -16,6 +16,7 @@ from mediagoblin import mg_globals from mediagoblin.db.open import setup_connection_and_db_from_config +from mediagoblin.gmg_commands import util as commands_util from mediagoblin.storage.filestorage import BasicFileStorage from mediagoblin.init import setup_storage, setup_global_and_app_config @@ -223,6 +224,7 @@ def env_export(args): ''' Export database and media files to a tar archive ''' + commands_util.check_unrecognized_args(args) if args.cache_path: if os.path.exists(args.cache_path): _log.error('The cache directory must not exist ' diff --git a/mediagoblin/gmg_commands/reprocess.py b/mediagoblin/gmg_commands/reprocess.py new file mode 100644 index 00000000..e2f19ea3 --- /dev/null +++ b/mediagoblin/gmg_commands/reprocess.py @@ -0,0 +1,302 @@ +# 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 argparse +import os + +from mediagoblin import mg_globals +from mediagoblin.db.models import MediaEntry +from mediagoblin.gmg_commands import util as commands_util +from mediagoblin.submit.lib import run_process_media +from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ +from mediagoblin.tools.pluginapi import hook_handle +from mediagoblin.processing import ( + ProcessorDoesNotExist, ProcessorNotEligible, + get_entry_and_processing_manager, get_processing_manager_for_type, + ProcessingManagerDoesNotExist) + + +def reprocess_parser_setup(subparser): + subparser.add_argument( + '--celery', + action='store_true', + help="Don't process eagerly, pass off to celery") + + subparsers = subparser.add_subparsers(dest="reprocess_subcommand") + + ################### + # available command + ################### + available_parser = subparsers.add_parser( + "available", + help="Find out what actions are available for this media") + + available_parser.add_argument( + "id_or_type", + help="Media id or media type to check") + + available_parser.add_argument( + "--action-help", + action="store_true", + help="List argument help for each action available") + + available_parser.add_argument( + "--state", + help="The state of media you would like to reprocess") + + + ############# + # run command + ############# + + run_parser = subparsers.add_parser( + "run", + help="Run a reprocessing on one or more media") + + run_parser.add_argument( + 'media_id', + help="The media_entry id(s) you wish to reprocess.") + + run_parser.add_argument( + 'reprocess_command', + help="The reprocess command you intend to run") + + run_parser.add_argument( + 'reprocess_args', + nargs=argparse.REMAINDER, + help="rest of arguments to the reprocessing tool") + + + ################ + # thumbs command + ################ + thumbs = subparsers.add_parser( + 'thumbs', + help='Regenerate thumbs for all processed media') + + thumbs.add_argument( + '--size', + nargs=2, + type=int, + metavar=('max_width', 'max_height')) + + ################# + # initial command + ################# + subparsers.add_parser( + 'initial', + help='Reprocess all failed media') + + ################## + # bulk_run command + ################## + bulk_run_parser = subparsers.add_parser( + 'bulk_run', + help='Run reprocessing on a given media type or state') + + bulk_run_parser.add_argument( + 'type', + help='The type of media you would like to process') + + bulk_run_parser.add_argument( + '--state', + default='processed', + nargs='?', + help='The state of the media you would like to process. Defaults to' \ + " 'processed'") + + bulk_run_parser.add_argument( + 'reprocess_command', + help='The reprocess command you intend to run') + + bulk_run_parser.add_argument( + 'reprocess_args', + nargs=argparse.REMAINDER, + help='The rest of the arguments to the reprocessing tool') + + ############### + # help command? + ############### + + +def available(args): + # Get the media type, either by looking up media id, or by specific type + try: + media_id = int(args.id_or_type) + media_entry, manager = get_entry_and_processing_manager(media_id) + media_type = media_entry.media_type + except ValueError: + media_type = args.id_or_type + media_entry = None + manager = get_processing_manager_for_type(media_type) + except ProcessingManagerDoesNotExist: + entry = MediaEntry.query.filter_by(id=args.id_or_type).first() + print 'No such processing manager for {0}'.format(entry.media_type) + + if args.state: + processors = manager.list_all_processors_by_state(args.state) + elif media_entry is None: + processors = manager.list_all_processors() + else: + processors = manager.list_eligible_processors(media_entry) + + print "Available processors:" + print "=====================" + print "" + + if args.action_help: + for processor in processors: + print processor.name + print "-" * len(processor.name) + + parser = processor.generate_parser() + parser.print_help() + print "" + + else: + for processor in processors: + if processor.description: + print " - %s: %s" % (processor.name, processor.description) + else: + print " - %s" % processor.name + + +def run(args, media_id=None): + if not media_id: + media_id = args.media_id + try: + media_entry, manager = get_entry_and_processing_manager(media_id) + + # TODO: (maybe?) This could probably be handled entirely by the + # processor class... + try: + processor_class = manager.get_processor( + args.reprocess_command, media_entry) + except ProcessorDoesNotExist: + print 'No such processor "%s" for media with id "%s"' % ( + args.reprocess_command, media_entry.id) + return + except ProcessorNotEligible: + print 'Processor "%s" exists but media "%s" is not eligible' % ( + args.reprocess_command, media_entry.id) + return + + reprocess_parser = processor_class.generate_parser() + reprocess_args = reprocess_parser.parse_args(args.reprocess_args) + reprocess_request = processor_class.args_to_request(reprocess_args) + run_process_media( + media_entry, + reprocess_action=args.reprocess_command, + reprocess_info=reprocess_request) + + except ProcessingManagerDoesNotExist: + entry = MediaEntry.query.filter_by(id=media_id).first() + print 'No such processing manager for {0}'.format(entry.media_type) + + +def bulk_run(args): + """ + Bulk reprocessing of a given media_type + """ + query = MediaEntry.query.filter_by(media_type=args.type, + state=args.state) + + for entry in query: + run(args, entry.id) + + +def thumbs(args): + """ + Regenerate thumbs for all processed media + """ + query = MediaEntry.query.filter_by(state='processed') + + for entry in query: + try: + media_entry, manager = get_entry_and_processing_manager(entry.id) + + # TODO: (maybe?) This could probably be handled entirely by the + # processor class... + try: + processor_class = manager.get_processor( + 'resize', media_entry) + except ProcessorDoesNotExist: + print 'No such processor "%s" for media with id "%s"' % ( + 'resize', media_entry.id) + return + except ProcessorNotEligible: + print 'Processor "%s" exists but media "%s" is not eligible' % ( + 'resize', media_entry.id) + return + + reprocess_parser = processor_class.generate_parser() + + # prepare filetype and size to be passed into reprocess_parser + if args.size: + extra_args = 'thumb --{0} {1} {2}'.format( + processor_class.thumb_size, + args.size[0], + args.size[1]) + else: + extra_args = 'thumb' + + reprocess_args = reprocess_parser.parse_args(extra_args.split()) + reprocess_request = processor_class.args_to_request(reprocess_args) + run_process_media( + media_entry, + reprocess_action='resize', + reprocess_info=reprocess_request) + + except ProcessingManagerDoesNotExist: + print 'No such processing manager for {0}'.format(entry.media_type) + + +def initial(args): + """ + Reprocess all failed media + """ + query = MediaEntry.query.filter_by(state='failed') + + for entry in query: + try: + media_entry, manager = get_entry_and_processing_manager(entry.id) + run_process_media( + media_entry, + reprocess_action='initial') + except ProcessingManagerDoesNotExist: + print 'No such processing manager for {0}'.format(entry.media_type) + + +def reprocess(args): + # Run eagerly unless explicetly set not to + if not args.celery: + os.environ['CELERY_ALWAYS_EAGER'] = 'true' + + commands_util.setup_app(args) + + if args.reprocess_subcommand == "run": + run(args) + + elif args.reprocess_subcommand == "available": + available(args) + + elif args.reprocess_subcommand == "bulk_run": + bulk_run(args) + + elif args.reprocess_subcommand == "thumbs": + thumbs(args) + + elif args.reprocess_subcommand == "initial": + initial(args) diff --git a/mediagoblin/gmg_commands/util.py b/mediagoblin/gmg_commands/util.py index 6a6853d5..63e39ca9 100644 --- a/mediagoblin/gmg_commands/util.py +++ b/mediagoblin/gmg_commands/util.py @@ -36,5 +36,5 @@ def prompt_if_not_set(variable, text, password=False): variable=raw_input(text + u' ') else: variable=getpass.getpass(text + u' ') - + return variable diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo Binary files differindex 543830c8..e3888f1b 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 1f086613..efd7d170 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Arabic (http://www.transifex.com/projects/p/mediagoblin/language/ar/)\n" "MIME-Version: 1.0\n" @@ -23,250 +23,280 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "اسم المستخدم" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "كلمة السر" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "عنوان البريد الإلكتروني" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "عفوًا، التسجيل غير متاح هنا." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "اسم المستخدم او الايميل" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "اسم مستخدم او ايميل غير صحيح." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "هذا الحقل لا يأخذ ايميل." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "هذا الحقل يحتاج ايميل." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "عفوًا، التسجيل غير متاح هنا." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الايميل." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير ملفك الشخصي، ونشر الصور!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "مفتاح التحقق أو معرف المستخدم خاطئ" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "يجب عليك تسجيل الدخول لإرسال بريد الكترونى لك!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "لقد قمت بالفعل بالتحقق من عنوان البريد الإلكتروني الخاص بك!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "أعدنا إرسال رسالة التحقق." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "لم نتمكن من العثور على أحد له أسم المستخدم هذا." -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "لقد تم إرسال ايميل به تعليمات عن كيفية تغيير رقمك السري." -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "العنوان" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "وصف هذا العمل." -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "الوسوم" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "قم بفصل المحددات بفصلة." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "المسار" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "لا يمكن ترك المسار فارغًا" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "مقدمة عنوان هذه الميديا, غالبا لن تحتاج لتغيره." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "ترخيص" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "السيرة" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "الموقع الإلكتروني" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "العنوان يحتوي على اخطاء" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "ارسل لي رسالة عندما يقوم الاخرون بالتعليق على الميديا خاصتي" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "تفضيل رخصة" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "سوف تكون هذه رخصتك المبدئية في نماذج التحميل." -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "ارسل لي رسالة عندما يقوم الاخرون بالتعليق على الميديا خاصتي" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "لا يمكن ترك العنوان فارغًا" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "وصف هذه المجموعة" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "مقدمة عنوان هذه المجموعة, غالبا لن تحتاج لتغيره." -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr " كلمة السر القديمة" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "قم بإدخال رقمك السري القديم حتى تثبت انك صاحب هذا الحساب." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "رقم سري جديد" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "كلمة السر" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "لقد قمت بإضافة مرفقة %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "يمكنك فقط تعديل حسابك الخاص" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "تم حفظ تغيرات حسابك" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "تم حفظ خصائص حسابك" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "يجب عليك تأكيد إلغاء حسابك." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "أنت لديك مجموعة تدعى \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "توجد مجموعة اخرى بهذا المسار لهذا المستخدم." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "أنت تعدل مجموعة مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "كلمة سر خاطئة" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -301,19 +331,62 @@ msgid "" "domain." msgstr "CSRF كوكيز غير موجودة, وهذا من الممكن ان يكون نتيجة لمانع الكوكيز او شئ من هذا القبيل.<br/>تأكد من أنك قمت بالسماح لخصائص الكوكيز لهذا الميدان." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "عذرا, انا لا ادعم هذا النوع من الملفات :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "فشل في تحويل الفيديو" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "قام بالتعليق على مشاركتك" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "اسم المستخدم" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "عنوان البريد الإلكتروني" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "المكان" @@ -377,7 +450,7 @@ msgstr "الرابط الموجه للبرنامج, هذا الحقل\n<strong> msgid "This field is required for public clients" msgstr "هذا الحقل مطلوب لجمهور العملاء" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "العميل {0} تم تسجيله!" @@ -390,59 +463,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "اضف" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "إلغاء" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "تسجيل دخول" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "فشل الولوج!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "الملف المعطى لهذا النوع من الميديا غير صحيح." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "الملف" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "يجب أن تضع ملفًا." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "يا سلام! نُشرَت!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "تم إضافة المجموعة \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "تأكد من بريدك الإلكترونى!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "تسجيل خروج" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "تسجيل دخول" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "تغيير خصائص الحساب" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -450,16 +673,16 @@ msgstr "تغيير خصائص الحساب" msgid "Media processing panel" msgstr "لوحة معالجة الوسائط" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "تسجيل خروج" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "أضف وسائط" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "إنشاء مجموعة جديدة" @@ -506,6 +729,59 @@ msgstr "آخر 10 تحويلات ناجحة" msgid "No processed entries, yet!" msgstr "لا يوجد مداخل مُعالجة بعد! " +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -538,19 +814,15 @@ msgid "" "a happy goblin!" msgstr "مرحبًا يا %(username)s،\n\nإن أردت تغيير كلمة سرك في غنو ميدياغوبلن فافتح الوصلة التالية في متصفحك:\n\n%(verification_url)s\n\nإن كنت ترى أن هذه الرسالة وصلتك خطأً فتجاهلها واستمتع بحياتك!" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "فشل الولوج!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "ألا تملك حسابًا بعد؟" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "أنشئ حسابًا هنا!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "أنسيت كلمة سرك؟" @@ -559,7 +831,7 @@ msgstr "أنسيت كلمة سرك؟" msgid "Create an account!" msgstr "أنشئ حسابًا!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "أنشئ" @@ -593,7 +865,7 @@ msgstr "تم النشر وفقا ل <a href=\"http://www.fsf.org/licensing/licen msgid "Explore" msgstr "استكشف" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "اهلا, مرحبا بك في موقع MediaGoblin." @@ -603,22 +875,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "هذا الموقع يقوم بتشغيل <a href=\"http://mediagoblin.org\">MediaGoblin</a>, وهو برنامج استضافة ميديا فائق الروعة." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "لكي تضيف الميديا خاصتك, تضع التعليقات, والمزيد, يجب عليك الدخول بحساب MediaGoblin الخاص بك." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "ليس لديك واحد حتى الآن؟ انه سهل!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -633,13 +910,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "مرفقات" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "أضف مرفقة" @@ -656,22 +933,29 @@ msgstr "ألغِ" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "احفظ التغييرات" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -699,14 +983,14 @@ msgstr "تحرير %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "نغيير %(username)s خصائص الحساب" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "إلغِ حسابي" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -718,6 +1002,36 @@ msgstr "تحرير %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "تحرير ملف %(username)s الشخصي" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -728,8 +1042,7 @@ msgstr "يتم تحديد الميديا ب: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "تحميل" @@ -753,7 +1066,7 @@ msgid "" msgstr "تستطيع الحصول على متصفح حديث ⏎\n»يمكنه تشغيل الصوت في <a href=\"http://getfirefox.com\">⏎\n» http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "ملف أصلي" @@ -762,6 +1075,10 @@ msgstr "ملف أصلي" msgid "WebM file (Vorbis codec)" msgstr "ملف WebM (Vorbic كوديك)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -773,47 +1090,39 @@ msgstr "ملف WebM (Vorbic كوديك)" msgid "Image for %(media_title)s" msgstr "صورة ل%(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "تبديل التدوير" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "منظور" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "مقدمة" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "أعلى" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "جانب" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "تحميل نموذج" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "بنية الملف" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "طول الكائن" @@ -832,8 +1141,8 @@ msgid "" msgstr "تستطيع الحصول على متصفح حديث ⏎\n»يمكنه تشغيل هذا الفيديو في <a href=\"http://getfirefox.com\">⏎\n» http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM ملف (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -859,11 +1168,6 @@ msgstr "%(collection_title)s بواسطة <a href=\"%(user_url)s\">%(username)s< msgid "Edit" msgstr "تعديل" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "إلغاء" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -918,29 +1222,22 @@ msgstr "وسائط <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ اختيار الميديا بواسطة <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "أضف تعليق" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "اضف هذا التعليق" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1099,26 +1396,34 @@ msgstr "تحدد ب" msgid "Could not read the image file." msgstr "لم نستطيع قراءة هذه الصورة." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "ويحي!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "حدث خطأ" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "غير مسموح بهذه العملية" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1155,10 +1460,9 @@ msgstr "تعليق" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "بامكانك استخدام <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> للإدراج." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1180,77 +1484,80 @@ msgstr "-- إختار --" msgid "Include a note" msgstr "إدراج ملاحظة" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "قام بالتعليق على مشاركتك" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "عذرا, لقد قمت بادخال تعليق فارغ." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "لقد تم إرسال تعليقك!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "من فضلك قم بفحص المداخل وقم بالمحاولة مرة أخرى." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "يجب عليك إختيار أو إضافة مجموعة" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" توجد بالفعل في المجموعة \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" أُضيفت للمجموعة \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "لقد قمت بإلغاء الميديا." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "لم يتم إلغاء الميديا لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "أنت على وشك حذف وسائط مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "لقد قمت بإلغاء المادة من المجموعة." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "لم يتم إلغاء المادة لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "أنت على وشك حذف مادة من مجموعة مستخدم آخر. كن حذرا." -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "لقد قمت بإلغاء المجموعة \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "لم يتم إلغاء المجموعة لأنك لم تقم بإختيار انك متأكد من ذلك." -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 differnew file mode 100644 index 00000000..9ffae8c1 --- /dev/null +++ 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 new file mode 100644 index 00000000..e669285a --- /dev/null +++ b/mediagoblin/i18n/bg/LC_MESSAGES/mediagoblin.po @@ -0,0 +1,1559 @@ +# Translations template for PROJECT. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +# Yasen Pramatarov <yasen@lindeas.com>, 2013 +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" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mediagoblin/language/bg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mediagoblin/decorators.py:252 +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." +msgstr "" + +#: mediagoblin/auth/forms.py:25 +msgid "Username or email" +msgstr "Потребителско име или е-поща" + +#: mediagoblin/auth/tools.py:41 +msgid "Invalid User name or email address." +msgstr "Неправилно потребителско име или е-поща." + +#: mediagoblin/auth/tools.py:42 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/tools.py:43 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/tools.py:146 +msgid "Sorry, a user with that name already exists." +msgstr "" + +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +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 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "" + +#: mediagoblin/auth/views.py:167 +msgid "The verification key or user id is incorrect" +msgstr "" + +#: mediagoblin/auth/views.py:185 +msgid "You must be logged in so we know who to send the email to!" +msgstr "" + +#: mediagoblin/auth/views.py:193 +msgid "You've already verified your email address!" +msgstr "" + +#: mediagoblin/auth/views.py:203 +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/user_pages/forms.py:45 +msgid "Title" +msgstr "Заглавие" + +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +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 +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 +msgid "Tags" +msgstr "Етикети" + +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +msgid "Separate tags by commas." +msgstr "" + +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +msgid "Slug" +msgstr "" + +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +msgid "The slug can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:42 +msgid "" +"The title part of this media's address. You usually don't need to change " +"this." +msgstr "" + +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/templates/mediagoblin/utils/license.html:20 +msgid "License" +msgstr "Лиценз" + +#: mediagoblin/edit/forms.py:52 +msgid "Bio" +msgstr "Биография" + +#: mediagoblin/edit/forms.py:58 +msgid "Website" +msgstr "" + +#: mediagoblin/edit/forms.py:60 +msgid "This address contains errors" +msgstr "Адресът съдържа грешки" + +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:87 +msgid "The title can't be empty" +msgstr "Заглавието е задължително" + +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/user_pages/forms.py:48 +msgid "Description of this collection" +msgstr "Описание на колекцията" + +#: mediagoblin/edit/forms.py:96 +msgid "" +"The title part of this collection's address. You usually don't need to " +"change this." +msgstr "" + +#: mediagoblin/edit/forms.py:103 +msgid "Old password" +msgstr "Стара парола" + +#: mediagoblin/edit/forms.py:105 +msgid "Enter your old password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/forms.py:108 +msgid "New password" +msgstr "Нова парола" + +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Нов адрес на е-поща" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Парола" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 +msgid "An entry with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:91 +msgid "You are editing another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:161 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:188 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:194 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:210 +msgid "Profile changes saved" +msgstr "Промените в профила са запазени" + +#: mediagoblin/edit/views.py:243 +msgid "Account settings saved" +msgstr "Настройките на профила са запазени" + +#: mediagoblin/edit/views.py:277 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 +#, python-format +msgid "You already have a collection called \"%s\"!" +msgstr "" + +#: mediagoblin/edit/views.py:317 +msgid "A collection with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:332 +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 +msgid "Your email address has been verified." +msgstr "Адресът на е-пощата ви е проверен." + +#: mediagoblin/gmg_commands/assetlink.py:60 +msgid "Cannot link theme... no theme set\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:73 +msgid "No asset directory for this theme\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:76 +msgid "However, old link directory symlink found; removed.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:112 +#, python-format +msgid "Could not link \"%s\": %s exists and is not a symlink\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:119 +#, python-format +msgid "Skipping \"%s\"; already set up.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:124 +#, python-format +msgid "Old link found for \"%s\"; removing.\n" +msgstr "" + +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.<br/>Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 +msgid "Sorry, I don't support that file type :(" +msgstr "" + +#: mediagoblin/media_types/pdf/processing.py:142 +msgid "unoconv failing to run, check log file" +msgstr "" + +#: mediagoblin/media_types/video/processing.py:44 +msgid "Video transcoding failed" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Потребителско име" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Адрес на е-поща" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Потребителско име или е-поща" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +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>" + +#: mediagoblin/plugins/oauth/forms.py:29 +msgid "Allow" +msgstr "Позволение" + +#: mediagoblin/plugins/oauth/forms.py:30 +msgid "Deny" +msgstr "Забрана" + +#: mediagoblin/plugins/oauth/forms.py:34 +msgid "Name" +msgstr "Име" + +#: mediagoblin/plugins/oauth/forms.py:35 +msgid "The name of the OAuth client" +msgstr "Име на OAuth клиента" + +#: mediagoblin/plugins/oauth/forms.py:36 +msgid "Description" +msgstr "Описание" + +#: mediagoblin/plugins/oauth/forms.py:38 +msgid "" +"This will be visible to users allowing your\n" +" application to authenticate as them." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:40 +msgid "Type" +msgstr "Вид" + +#: mediagoblin/plugins/oauth/forms.py:45 +msgid "" +"<strong>Confidential</strong> - The client can\n" +" make requests to the GNU MediaGoblin instance that can not be\n" +" intercepted by the user agent (e.g. server-side client).<br />\n" +" <strong>Public</strong> - The client can't make confidential\n" +" requests to the GNU MediaGoblin instance (e.g. client-side\n" +" JavaScript client)." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:52 +msgid "Redirect URI" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:54 +msgid "" +"The redirect URI for the applications, this field\n" +" is <strong>required</strong> for public clients." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:66 +msgid "This field is required for public clients" +msgstr "" + +#: mediagoblin/plugins/oauth/views.py:55 +msgid "The client {0} has been registered!" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +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/user_pages/media_collect.html:68 +msgid "Add" +msgstr "Добавяне" + +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "Грешка при проверката на %s: %s" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Проверката е отменена" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "Добавяне на 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 "Изтриване на 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 "Изтриване" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Вход" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Грешка при влизането" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 +msgid "Invalid file given for media type." +msgstr "" + +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + +#: mediagoblin/submit/forms.py:26 +msgid "File" +msgstr "Файл" + +#: mediagoblin/submit/views.py:52 +msgid "You must provide a file." +msgstr "Трябва да предоставите файл" + +#: mediagoblin/submit/views.py:101 +msgid "Woohoo! Submitted!" +msgstr "" + +#: mediagoblin/submit/views.py:154 +#, python-format +msgid "Collection \"%s\" added!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "Verify your email!" +msgstr "Проверете е-пощата си!" + +#: mediagoblin/templates/mediagoblin/base.html:86 +msgid "log out" +msgstr "изход" + +#: mediagoblin/templates/mediagoblin/base.html:105 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:112 +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/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 +msgid "Log out" +msgstr "Изход" + +#: mediagoblin/templates/mediagoblin/base.html:128 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:131 +#: 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:" +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 "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Влезли сте като" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Промяна на данните ви" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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 "" + +#: 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!" +msgstr "Създаване на профил" + +#: mediagoblin/templates/mediagoblin/auth/register.html:41 +msgid "Create" +msgstr "Създаване" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" + +#: 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 "Задвижвано от <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, проект на <a href=\"http://gnu.org/\">GNU</a>." + +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 +#, python-format +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 "Публикувано съгласно <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Изходният код</a> е наличен." + +#: 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!" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:24 +msgid "" +"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " +"extraordinarily great piece of media hosting software." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 +msgid "" +"To add your own media, place comments, and more, you can log in with your " +"MediaGoblin account." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 +msgid "Don't have one yet? It's easy!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Лого на MediaGoblin" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:23 +#: mediagoblin/templates/mediagoblin/edit/attachments.html:35 +#, python-format +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 +msgid "Attachments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +msgid "Add attachment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:61 +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42 +#: mediagoblin/templates/mediagoblin/edit/edit.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 +msgid "Cancel" +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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 +msgid "Save changes" +msgstr "Запазване на промените" + +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 +#, python-format +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?" +msgstr "Наистина ли да се изтрие потребителят '%(user_name)s' и всички прилежащи файлове и коментари?" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "Да, наистина да се изтрие профилът ми" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit.html:35 +#, python-format +msgid "Editing %(media_title)s" +msgstr "Редактиране на %(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 "Промяна настройките на профила на %(username)s" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" +msgstr "Изтриване на профила ми" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Е-поща" + +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 +#, python-format +msgid "Editing %(collection_title)s" +msgstr "Редактиране на %(collection_title)s" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "Редактиране профила на %(username)s" + +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Нови коментари" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Отбелязване на всички като прочетени" + +#: mediagoblin/templates/mediagoblin/listings/collection.html:30 +#: mediagoblin/templates/mediagoblin/listings/collection.html:35 +#: mediagoblin/templates/mediagoblin/listings/tag.html:30 +#: mediagoblin/templates/mediagoblin/listings/tag.html:35 +#, python-format +msgid "Media tagged with: %(tag_name)s" +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 +msgid "Download" +msgstr "Изтегляне" + +#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 +msgid "Original" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44 +msgid "" +"Sorry, this audio will not work because \n" +"\tyour web browser does not support HTML5 \n" +"\taudio." +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +msgid "Original file" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 +msgid "WebM file (Vorbis codec)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Създадено" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:65 +#, python-format +msgid "Image for %(media_title)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 +msgid "PDF file" +msgstr "Файл PDF" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 +msgid "File Format" +msgstr "Файлов формат" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 +msgid "Object Height" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +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 +msgid "WebM file (VP8/Vorbis)" +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 +msgid "Add your media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 +#, python-format +msgid "%(collection_title)s (%(username)s's collection)" +msgstr "%(collection_title)s (колекция на %(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 "%(collection_title)s от <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 "Редактиране" + +#: 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 "Наистина ли да се изтрие %(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 "Наистина ли да се премахне %(media_title)s от %(collection_title)s?" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +msgid "Remove" +msgstr "Премахване" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 +#, python-format +msgid "%(username)s's media" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 +#, python-format +msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 +msgid "Add a comment" +msgstr "Добавяне на коментар" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 +msgid "Add this comment" +msgstr "Добавяне на коментара" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Преглед на коментара" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +msgid "Added" +msgstr "Добавено" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 +#, python-format +msgid "Add “%(media_title)s” to a collection" +msgstr "Добавяне на “%(media_title)s” към колекция" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 +msgid "+" +msgstr "+" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 +msgid "Add a new collection" +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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 +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." +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 "" + +#: 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/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 +#, 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/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 "" + +#: 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 "(премахване)" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:40 +msgid "Add to a collection" +msgstr "Добавяне към колекция" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 +msgid "feed icon" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 +msgid "Atom feed" +msgstr "Емисия Atom" + +#: mediagoblin/templates/mediagoblin/utils/license.html:25 +msgid "All rights reserved" +msgstr "Всички права запазени" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:39 +msgid "← Newer" +msgstr "← По-ново" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:45 +msgid "Older →" +msgstr "По-старо →" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:48 +msgid "Go to page:" +msgstr "Отиване на страница:" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 +msgid "newer" +msgstr "по-ново" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 +msgid "older" +msgstr "по-старо" + +#: mediagoblin/templates/mediagoblin/utils/tags.html:20 +msgid "Tagged with" +msgstr "" + +#: mediagoblin/tools/exif.py:83 +msgid "Could not read the image file." +msgstr "" + +#: mediagoblin/tools/response.py:36 +msgid "Oops!" +msgstr "Опа!" + +#: mediagoblin/tools/response.py:37 +msgid "An error occured" +msgstr "Възникна грешка" + +#: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Неправилна заявка" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 +msgid "Operation not allowed" +msgstr "Действието не е позволено" + +#: mediagoblin/tools/response.py:61 +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 +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 "" + +#: mediagoblin/tools/timesince.py:62 +msgid "year" +msgstr "година" + +#: mediagoblin/tools/timesince.py:63 +msgid "month" +msgstr "месец" + +#: mediagoblin/tools/timesince.py:64 +msgid "week" +msgstr "седмица" + +#: mediagoblin/tools/timesince.py:65 +msgid "day" +msgstr "ден" + +#: mediagoblin/tools/timesince.py:66 +msgid "hour" +msgstr "час" + +#: mediagoblin/tools/timesince.py:67 +msgid "minute" +msgstr "минута" + +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "Коментар" + +#: 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 "Може да ползвате <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" +msgstr "" + +#: mediagoblin/user_pages/forms.py:35 +msgid "I am sure I want to remove this item from the collection" +msgstr "Наистина искам да премахна този запис от колекцията" + +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "Колекция" + +#: mediagoblin/user_pages/forms.py:40 +msgid "-- Select --" +msgstr "" + +#: mediagoblin/user_pages/forms.py:42 +msgid "Include a note" +msgstr "Добавяне на бележка" + +#: 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 "Може да ползвате\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> за форматиране." + +#: mediagoblin/user_pages/views.py:179 +msgid "Sorry, comments are disabled." +msgstr "" + +#: mediagoblin/user_pages/views.py:184 +msgid "Oops, your comment was empty." +msgstr "" + +#: mediagoblin/user_pages/views.py:190 +msgid "Your comment has been posted!" +msgstr "Коментарът ви е публикуван." + +#: mediagoblin/user_pages/views.py:225 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:265 +msgid "You have to select or add a collection" +msgstr "Трябва да изберете или добавите колекция" + +#: mediagoblin/user_pages/views.py:276 +#, python-format +msgid "\"%s\" already in collection \"%s\"" +msgstr "\"%s\" вече е в колекцията \"%s\"" + +#: mediagoblin/user_pages/views.py:282 +#, python-format +msgid "\"%s\" added to collection \"%s\"" +msgstr "\"%s\" е добавено към колекцията \"%s\"" + +#: mediagoblin/user_pages/views.py:302 +msgid "You deleted the media." +msgstr "" + +#: mediagoblin/user_pages/views.py:314 +msgid "The media was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:321 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:395 +msgid "You deleted the item from the collection." +msgstr "Изтрихте запис от колекцията." + +#: mediagoblin/user_pages/views.py:399 +msgid "The item was not removed because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:407 +msgid "" +"You are about to delete an item from another user's collection. Proceed with" +" caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:440 +#, python-format +msgid "You deleted the collection \"%s\"" +msgstr "Изтрихте колекцията \"%s\"" + +#: mediagoblin/user_pages/views.py:447 +msgid "" +"The collection was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:455 +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 ec01d7f7..3611ec56 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 9ebbdf18..b061407a 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Catalan (http://www.transifex.com/projects/p/mediagoblin/language/ca/)\n" "MIME-Version: 1.0\n" @@ -21,250 +21,280 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nom d'usuari" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Contrasenya" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adreça electrònica" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Ho sentim, el registre està desactivat en aquest cas." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Nom d'usuari o correu" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Ho sentim, el registre està desactivat en aquest cas." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Lamentablement aquest usuari ja existeix." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Ja s'ha verificat la vostra adreça electrònica. Ara podeu entrar, editar el vostre perfil i penjar imatge!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "La clau de verificació o la identificació de l'usuari no són correctes." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Has d'estar conectat per saber a qui hem d'enviar el correu!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Ja has verificat la teva adreça de correu!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Torna'm a enviar el correu de verificació" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Títol" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descripció d'aquest treball." -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiquetes" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separa els tags amb comes." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Llimac" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "El llimac no pot ésser buit" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "El títol de l'adreça d'aquest mitjà. Normalment no necessites modificar això." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Llicència" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biografia" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Lloc web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Aquesta adreça conté errors" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Envia'm correu quan d'altres comentin al meu mitjà" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Envia'm correu quan d'altres comentin al meu mitjà" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "El títol no pot ser buit" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descripció d'aquesta col.lecció" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Contrasenya antiga" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte és teu." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nova contrasenya" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Contrasenya" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Ja existeix una entrada amb aquest llimac per aquest usuari" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Esteu editant fitxers d'un altre usuari. Aneu amb compte." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Els canvis al perfil s'han guardat" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Els detalls del compte s'han guardat" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ja tens una col.lecció anomenada \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Contrasenya errònia" -#: mediagoblin/edit/views.py:363 +#: 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 "No es pot enllaçar el tema... no hi ha tema establert\n" @@ -299,19 +329,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "La transformació del vídeo ha fallat" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "comentat al teu post" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nom d'usuari" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adreça electrònica" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Ubicació" @@ -375,7 +448,7 @@ msgstr "La URI de redirecció per les aplicacions, aquest camp\n és msgid "This field is required for public clients" msgstr "Aquest camp és requeriment per a clients públics" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "El client {0} ha sigut enregistrat!" @@ -388,59 +461,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Afegir" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Esborrar" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Entra" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Inici de sessió ha fallat!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és vàlid." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fitxer" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Heu d'escollir un fitxer." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Visca! S'ha enviat!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "S'ha afegit la col.leccio \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Entra" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Modificar els ajustaments del compte" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -448,16 +671,16 @@ msgstr "Modificar els ajustaments del compte" msgid "Media processing panel" msgstr "Quadre de processament de fitxers" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Tots els fitxers" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -504,6 +727,59 @@ msgstr "Les últimes 10 pujades correctes" msgid "No processed entries, yet!" msgstr "Encara no hi ha entrades processades!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -536,19 +812,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Inici de sessió ha fallat!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Creeu-ne un aquí!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Has oblidat la teva contrasenya?" @@ -557,7 +829,7 @@ msgstr "Has oblidat la teva contrasenya?" msgid "Create an account!" msgstr "Creeu un compte!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Crea" @@ -591,7 +863,7 @@ msgstr "Alliberat segons la <a href=\"http://www.fsf.org/licensing/licenses/agpl msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hola, una benvinguda al MediaGoblin!" @@ -601,22 +873,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "El lloc esta usant <a href=\"http://mediagoblin.org\">MediaGoblin</a>, una gran i extraordinària peça de software per allotjar mitjans." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Per afegir el teu propi mitjà, col.locar comentaris, i més, pots conectar-te amb el teu compte MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "No en tens una encara? Es fàcil!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -631,13 +908,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -654,22 +931,29 @@ msgstr "Cancel·la" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Desa els canvis" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -697,12 +981,12 @@ 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:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -716,6 +1000,36 @@ msgstr "Editant %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Editant perfil de %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -726,8 +1040,7 @@ msgstr "Mitjà marcat amb: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Descarregar" @@ -751,7 +1064,7 @@ msgid "" msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'àudio, a <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Arxiu original" @@ -760,6 +1073,10 @@ msgstr "Arxiu original" msgid "WebM file (Vorbis codec)" msgstr "Arxiu WebM (Vorbis codec)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -771,47 +1088,39 @@ msgstr "Arxiu WebM (Vorbis codec)" msgid "Image for %(media_title)s" msgstr "Imatge per %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -830,8 +1139,8 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "Arxiu WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -857,11 +1166,6 @@ msgstr "%(collection_title)s per a <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Editar" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Esborrar" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,29 +1220,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Navegant mitjà per a <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Afegeix un comentari" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Afegir aquest comentari" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1097,26 +1394,34 @@ msgstr "" msgid "Could not read the image file." msgstr "No s'ha pogut llegir l'arxiu d'imatge" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1153,10 +1458,9 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Pots usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> per donar format." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1178,77 +1482,80 @@ msgstr "-- Sel.leccionar --" msgid "Include a note" msgstr "Incluir una nota" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "comentat al teu post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Si et plau, comprova les teves entrades i intenta-ho de nou." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Has de sel.leccionar o afegir una col.lecció" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" ja és a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" afegir a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Has esborrat el mitjà" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Has esborrat l'element de la col.lecció" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Has esborrat la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 53e3fedf..b524a104 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 c78c08ac..b5b546fd 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Danish (http://www.transifex.com/projects/p/mediagoblin/language/da/)\n" "MIME-Version: 1.0\n" @@ -21,250 +21,280 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Brugernavn" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Kodeord" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Email adresse" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Desværre, registrering er ikke muligt på denne instans" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Brugernavn eller email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Desværre, registrering er ikke muligt på denne instans" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Desværre, det brugernavn er allerede brugt" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Din email adresse er blevet bekræftet. Du kan nu logge på, ændre din profil, og indsende billeder!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Bekræftelsesnøglen eller brugerid er forkert" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Du er nødt til at være logget ind, så vi ved hvem vi skal emaile!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Du har allerede bekræftet din email adresse!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Email til godkendelse sendt igen." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Beskrivelse af arbejdet" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separer tags med kommaer." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Titeldelen af dette medie's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licens" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Websted" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Denne adresse indeholder fejl" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Email mig når andre kommenterer på mine medier" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Email mig når andre kommenterer på mine medier" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Titlen kan ikke være tom" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Beskrivelse af denne samling" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Gammelt kodeord" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Skriv dit gamle kodeord for at bevise det er din konto." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Ny kodeord" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Kodeord" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Du er ved at ændre en anden brugers' medier. Pas på." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Du er ved at ændre en bruger's profil. Pas på." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontoindstillinger gemt" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -299,19 +329,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Brugernavn" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Email adresse" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -375,7 +448,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "Dette felt er nødvendigt for offentlige klienter" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Klienten {0} er blevet registreret!" @@ -388,59 +461,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Du må give mig en fil" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Juhuu! Delt!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Log ind" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -448,16 +671,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -504,6 +727,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -536,19 +812,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Opret en her!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -557,7 +829,7 @@ msgstr "" msgid "Create an account!" msgstr "Opret en konto!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -591,7 +863,7 @@ msgstr "" msgid "Explore" msgstr "Udforsk" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hey, velkommen til denne MediaGoblin side!" @@ -601,22 +873,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Har du ikke en endnu? Det er let!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -631,13 +908,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -654,22 +931,29 @@ msgstr "Afbryd" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Gem ændringer" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -697,12 +981,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -716,6 +1000,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "Redigerer %(username)s profil" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -726,8 +1040,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -751,7 +1064,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -760,6 +1073,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -771,47 +1088,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -830,7 +1139,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -857,11 +1166,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,29 +1220,22 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1097,26 +1394,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1153,9 +1458,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1178,77 +1482,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo Binary files differindex e2fcf85d..f9036b92 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 e2147070..7ca48ab7 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -15,15 +15,15 @@ # Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011 # Art O. Pal <artopal@fastmail.fm>, 2011 # spaetz <sebastian@sspaeth.de>, 2012 -# Vinzenz Vietzke <vinz@vinzv.de>, 2012 -# Vinzenz Vietzke <vinz@vinzv.de>, 2011 +# vinzv Vietzke <vinz@vinzv.de>, 2012 +# vinzv Vietzke <vinz@vinzv.de>, 2011 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-28 10:43+0000\n" -"Last-Translator: Elrond <elrond+mediagoblin.org@samba-tng.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" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,250 +32,280 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Benutzername" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Passwort" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "E-Mail-Adresse" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Benutzername oder E-Mail-Adresse" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Benutzername oder E-Mail-Adresse" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Ungültiger Benutzername oder E-Mail-Adresse." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Dieses Feld akzeptiert keine E-Mail-Adressen." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Dieses Feld benötigt eine E-Mail-Adresse." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Dein GNU MediaGoblin Konto wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Medien hochladen." -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Der Aktivierungsschlüssel oder die Nutzerkennung ist falsch." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Du musst angemeldet sein, damit wir wissen, wer die Email bekommt." -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Deine E-Mail-Adresse wurde bereits aktiviert." -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Aktivierungsmail wurde erneut versandt." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Beschreibung des Werkes" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Schlagwörter" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Kommaseparierte Schlagwörter" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Kurztitel" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Bitte gib einen Kurztitel ein" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert werden." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Lizenz" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biographie" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Webseite" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Diese Adresse ist fehlerhaft" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Bevorzugte Lizenz" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "Dies wird Deine Standardlizenz in den Upload-Forumularen sein." -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Mir eine E-Mail schicken, wenn andere meine Medien kommentieren" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Der Titel kann nicht leer sein" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Beschreibung dieser Sammlung" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Altes Passwort" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du dieses Konto besitzt." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Neues Passwort" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Passwort" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Diesen Kurztitel hast du bereits vergeben." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Du bearbeitest die Medien eines anderen Nutzers. Sei bitte vorsichtig." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Sie haben den Anhang %s hinzugefügt!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Du kannst nur dein eigenes Profil bearbeiten." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Das Profil wurde aktualisiert" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontoeinstellungen gespeichert" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Du musst die Löschung deines Kontos bestätigen." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du hast bereits eine Sammlung mit Namen »%s«!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Eine Sammlung mit diesem Kurztitel existiert bereits für diesen Benutzer." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Falsches Passwort" -#: mediagoblin/edit/views.py:363 +#: 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 "Theme kann nicht verknüpft werden … Kein Theme gesetzt\n" @@ -310,19 +340,62 @@ msgid "" "domain." msgstr "Das CSRF cookie ist nicht vorhanden. Das liegt vermutlich an einem Cookie-Blocker oder ähnlichem.<br/>Bitte stelle sicher, dass Cookies von dieser Domäne erlaubt sind." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt." -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Videokonvertierung fehlgeschlagen" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "hat dein Medium kommentiert" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Benutzername" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "E-Mail-Adresse" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Benutzername oder E-Mail-Adresse" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Aufnahmeort" @@ -386,7 +459,7 @@ msgstr "Die Weiterleitungs-URI für die Anwendung, dieses Feld\n ist msgid "This field is required for public clients" msgstr "Dieses Feld ist Pflicht für öffentliche Clients" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Client {0} wurde registriert!" @@ -399,59 +472,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Hinzufügen" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Löschen" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Anmelden" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Anmeldevorgang fehlgeschlagen!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Datei" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Du musst eine Datei angeben." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "JAAA! Geschafft!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Sammlung »%s« hinzugefügt!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Bitte bestätige Deine E-Mail-Adresse!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "abmelden" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Anmelden" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Kontoeinstellungen ändern" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -459,16 +682,16 @@ msgstr "Kontoeinstellungen ändern" msgid "Media processing panel" msgstr "Medienverarbeitung" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Abmelden" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Medien hinzufügen" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Neues Album erstellen" @@ -515,6 +738,59 @@ msgstr "Die letzten zehn erfolgreichen Uploads" msgid "No processed entries, yet!" msgstr "Noch keine verarbeiteten Einträge!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -547,19 +823,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Anmeldevorgang fehlgeschlagen!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Registriere dich einfach hier!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Passwort vergessen?" @@ -568,7 +840,7 @@ msgstr "Passwort vergessen?" msgid "Create an account!" msgstr "Neues Nutzerkonto registrieren!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Registrieren" @@ -602,7 +874,7 @@ msgstr "Veröffentlicht unter der <a href=\"http://www.fsf.org/licensing/license msgid "Explore" msgstr "Entdecken" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!" @@ -612,23 +884,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Diese Webseite setzt <a href=\"http://mediagoblin.org\">MediaGoblin</a> ein, eine großartige Software für Medienhosting." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Melde Dich mit Deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, andere zu kommentieren und vieles mehr." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Hast du noch keinen? Das geht ganz einfach!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Registriere dich auf dieser Seite</a> oder <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installiere MediaGoblin auf deinem eigenen Server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" +msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -642,13 +919,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Anhänge" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Anhang hinzufügen" @@ -665,22 +942,29 @@ msgstr "Abbrechen" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Änderungen speichern" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -708,14 +992,14 @@ msgstr "%(media_title)s bearbeiten" msgid "Changing %(username)s's account settings" msgstr "%(username)ss Kontoeinstellungen ändern" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Mein Konto löschen" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -727,6 +1011,36 @@ msgstr "Bearbeite %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "%(username)ss Profil bearbeiten" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -737,8 +1051,7 @@ msgstr "Medien mit Schlagwort: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Download" @@ -762,7 +1075,7 @@ msgid "" msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> einen modernen Webbrowser, der dieses Audiostück abspielen kann!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Originaldatei" @@ -771,6 +1084,10 @@ msgstr "Originaldatei" msgid "WebM file (Vorbis codec)" msgstr "WebM-Datei (Vorbis-Codec)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Originaldatum" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -782,47 +1099,39 @@ msgstr "WebM-Datei (Vorbis-Codec)" msgid "Image for %(media_title)s" msgstr "Bild für %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF-Datei" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspektive" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Vorderseite" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Modell herunterladen" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Dateiformat" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Objekthöhe" @@ -841,8 +1150,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM-Datei (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -868,11 +1177,6 @@ msgstr "%(collection_title)s von <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Bearbeiten" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Löschen" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -927,29 +1231,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Medien von <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Einen Kommentar schreiben" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Kommentar absenden" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Hinzugefügt" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Originaldatum" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1108,26 +1405,34 @@ msgstr "Schlagwörter" msgid "Could not read the image file." msgstr "Die Bilddatei konnte nicht gelesen werden." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Hoppla!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Ein Fehler trat auf" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Funktion nicht erlaubt" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1164,10 +1469,9 @@ msgstr "Kommentar" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Die Texte lassen sich durch <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> formatieren." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1189,77 +1493,80 @@ msgstr "-- Auswählen --" msgid "Include a note" msgstr "Notiz anfügen" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "hat dein Medium kommentiert" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Hoppla, der Kommentartext fehlte." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Dein Kommentar wurde angenommen!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Bitte prüfe deinen Einträge und versuche erneut." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Du musst eine Sammlung auswählen oder hinzufügen" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "»%s« ist bereits in der Sammlung »%s«" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "»%s« zur Sammlung »%s« hinzugefügt" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Du hast das Medium gelöscht." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Du hast das Objekt aus der Sammlung gelöscht." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Du hast die Sammlung »%s« gelöscht" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 1b22b786..bc5baccb 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-06-16 20:06-0500\n" +"POT-Creation-Date: 2013-09-04 16:07-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,110 +17,117 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: mediagoblin/auth/forms.py:25 -msgid "Username" -msgstr "" - -#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:44 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "" - -#: mediagoblin/auth/forms.py:33 -msgid "Email address" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:40 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:42 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:43 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:44 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/tools.py:109 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/tools.py:113 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:43 -msgid "Sorry, registration is disabled on this instance." +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." msgstr "" -#: mediagoblin/auth/views.py:133 +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your " "profile, and submit images!" msgstr "" -#: mediagoblin/auth/views.py:139 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:157 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:165 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:178 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:209 +#: 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:220 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:223 +#: mediagoblin/auth/views.py:251 msgid "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:230 +#: 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:287 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a " @@ -128,139 +135,162 @@ msgid "" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -295,19 +325,62 @@ msgid "" "this domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -375,7 +448,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -388,59 +461,208 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a " +"password set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -448,16 +670,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -503,6 +725,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -556,7 +827,7 @@ msgstr "" msgid "Create an account!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -591,7 +862,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -601,25 +872,29 @@ msgid "" "an extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your" " MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an " -"account at this site</a>\n" -" or\n" -" <a class=\"button_action\" " -"href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on " -"your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -634,13 +909,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:193 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -657,22 +932,29 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -700,12 +982,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -719,6 +1001,38 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then" +" \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can " +"ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -729,8 +1043,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -754,7 +1067,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -767,13 +1080,6 @@ msgstr "" msgid "Created" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "" - #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -785,47 +1091,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -844,7 +1142,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -871,11 +1169,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -931,15 +1224,19 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" @@ -1099,26 +1396,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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 " @@ -1156,8 +1461,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" "You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> " -"for formatting." +"href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1180,78 +1485,83 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed " "with caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were " "sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 645af16b..067d4f4f 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 873869f0..4510069d 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-01 21:16+0000\n" -"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\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" "Language-Team: Esperanto (http://www.transifex.com/projects/p/mediagoblin/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,250 +22,280 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Uzantnomo" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Pasvorto" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Retpoŝtadreso" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Uzantonomo aŭ retpoŝtadreso" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Salutnomo aŭ retpoŝtadreso" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nevalida ensalutnomo aŭ retpoŝtadreso." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Ĉi tiu kampo ne akceptas retpoŝtadresojn." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Ĉi tiu kampo postulas retpoŝtadreson." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Bedaŭrinde, uzanto kun tiu nomo jam ekzistas." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Via retpoŝtadreso estas konfirmita. Vi povas nun ensaluti, redakti vian profilon, kaj alŝuti bildojn!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "La kontrol-kodo aŭ la uzantonomo ne estas korekta" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Vi devas esti ensalutita, por ke ni sciu, al kiu sendi la retleteron!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Vi jam konfirmis vian retpoŝtadreson!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Resendi vian kontrol-mesaĝon." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "Trovitas neniu kun tiu ensalutnomo." -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Priskribo de ĉi tiu verko" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etikedoj" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Dividu la etikedojn per komoj." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "La distingiga adresparto" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "La distingiga adresparto ne povas esti malplena" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "La dosiertitol-bazita parto de la dosieradreso. Ordinare ne necesas ĝin ŝanĝi." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Permesilo" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Retejo" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Ĉi tiu adreso enhavas erarojn" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Retpoŝtu min kiam aliaj komentas pri miaj alŝutaĵoj." + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Permesila prefero" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Retpoŝtu min kiam aliaj komentas pri miaj alŝutaĵoj." - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "La titolo ne povas malpleni." -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Priskribo de la kolekto" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "La malnova pasvorto" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "La nova pasvorto" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Pasvorto" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Vi aldonis la kundosieron %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Vi povas redakti nur vian propran profilon." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Profilŝanĝoj estis konservitaj" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Kontagordoj estis konservitaj" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Vi bezonas konfirmi la forigon de via konto." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vi jam havas kolekton kun la nomo «%s»!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas kolekton kun tiu distingiga adresparto." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Malĝusta pasvorto" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Via pasvorto estas sukcese ŝanĝita" +#: 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 "Alligo de etoso ne eblas… ne estas elektita ekzistanta etoso\n" @@ -300,19 +330,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Malsukcesis transkodado de filmo" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "komentis je via afiŝo" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Uzantnomo" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Retpoŝtadreso" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Uzantonomo aŭ retpoŝtadreso" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Loko" @@ -376,7 +449,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -389,59 +462,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Aldoni" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Forigi" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Ensaluti" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Ensaluto malsukcesis!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Dosiero" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Vi devas provizi dosieron." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Hura! Alŝutitas!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekto «%s» aldonitas!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoŝtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "elsaluti" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Ensaluti" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Ŝanĝi kontagordojn" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -449,16 +672,16 @@ msgstr "Ŝanĝi kontagordojn" msgid "Media processing panel" msgstr "Kontrolejo pri dosierpreparado." -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Elsaluti" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Aldoni dosieron" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Krei novan kolekton" @@ -505,6 +728,59 @@ msgstr "La dek lastaj sukcesaj alŝutoj" msgid "No processed entries, yet!" msgstr "Ankoraŭ ne ekzistas eroj prilaboritaj!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -537,19 +813,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Ensaluto malsukcesis!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Kreu ĝin ĉi tie!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Ĉu vi forgesis vian pasvorton?" @@ -558,7 +830,7 @@ msgstr "Ĉu vi forgesis vian pasvorton?" msgid "Create an account!" msgstr "Kreu konton!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Krei" @@ -592,7 +864,7 @@ msgstr "Disponigita laŭ la permesilo <a href=\"http://www.fsf.org/licensing/lic msgid "Explore" msgstr "Ĉirkaŭrigardi" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Saluton, kaj bonvenon al ĉi tiu MediaGoblina retpaĝaro!" @@ -602,22 +874,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Ĉi tiu retpaĝaro funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eksterordinare bonega programaro por gastigado de aŭd‐vid‐dosieroj." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Por aldoni viajn proprajn dosierojn, afiŝi komentariojn ktp, vi povas ensaluti je via MediaGoblina konto." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Ĉu vi ankoraŭ ne havas tian? Ne malĝoju!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -632,13 +909,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Kundosieroj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Aldoni kundosieron" @@ -655,22 +932,29 @@ msgstr "Nuligi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Konservi ŝanĝojn" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Ŝanĝado de pasvorto de %(username)s" +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?" @@ -698,14 +982,14 @@ 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:46 -msgid "Change your password." -msgstr "Ŝanĝi la pasvorton" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Forigi mian konton." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -717,6 +1001,36 @@ msgstr "Redaktado de %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Redaktado de l’profilo de %(username)s'" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "antaŭ %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -727,8 +1041,7 @@ msgstr "Dosieroj kun etikedo: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Elŝuti" @@ -752,7 +1065,7 @@ msgid "" msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon ĉe <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "originalan dosieron" @@ -761,6 +1074,10 @@ msgstr "originalan dosieron" msgid "WebM file (Vorbis codec)" msgstr "WebMan dosieron (kun Vorbisa kodaĵo)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Kreita" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -772,47 +1089,39 @@ msgstr "WebMan dosieron (kun Vorbisa kodaĵo)" msgid "Image for %(media_title)s" msgstr "Bildo de «%(media_title)s»" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF-dosiero" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Deantaŭe" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Desupre" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Deflanke" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Elŝuti la modelon" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Informaranĝo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Alto de la objekto" @@ -831,8 +1140,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "la WebM-dosieron (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -858,11 +1167,6 @@ msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Ŝanĝi" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Forigi" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -917,29 +1221,22 @@ msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Aldoni komenton" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Aldoni ĉi tiun komenton" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "antaŭ %(formatted_time)s" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Aldonita" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Kreita" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1098,26 +1395,34 @@ msgstr "Markita per" msgid "Could not read the image file." msgstr "Malsukcesis lego de la bildodosiero" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oj!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Okazis eraro" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1154,10 +1459,9 @@ msgstr "Komenti" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Vi povas uzi por markado la lingvon «<a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>»." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1179,77 +1483,80 @@ msgstr "-- Elektu --" msgid "Include a note" msgstr "Rimarko" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "komentis je via afiŝo" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Ve, komentado estas malebligita." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Via komento estis afiŝita!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Bonvolu kontroli vian enigitaĵon kaj reprovi." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Necesas elekti aŭ aldoni kolekton" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» jam estas en la kolekto «%s»" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» estis aldonita al la kolekto «%s»" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Vi forigis la dosieron el la kolekto." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vi forigis la kolekton «%s»" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 c5e50f53..c9965ccf 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 8c2f046f..934fdad6 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-02 21:23+0000\n" -"Last-Translator: larjona <larjona99@gmail.com>\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" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,250 +30,280 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nombre de usuario" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Contraseña" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Dirección de correo electrónico" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Lo sentimos, el registro está deshabilitado en este momento." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Nombre de usuario o correo electrónico" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: 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:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Nombre de usuario o email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nombre de usuario o correo electrónico inválido." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Este campo no acepta direcciones de correo." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Este campo requiere una dirección de correo." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Lo sentimos, el registro está deshabilitado en este momento." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Lo sentimos, ya existe un usuario con ese nombre." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "La clave de verificación o el identificador de usuario son incorrectos." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes iniciar sesión, editar tu perfil, y enviar imágenes!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "La clave de verificación o la identificación de usuario son incorrectas" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "¡Debes iniciar sesión para que podamos saber a quién le enviamos el correo electrónico!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "¡Ya has verificado tu dirección de correo!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Se reenvió tu correo electrónico de verificación." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Título" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descripción de esta obra" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiquetas" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separa las etiquetas por comas." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Ficha" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "La ficha no puede estar vacía" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "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:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencia" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Sitio web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "La dirección contiene errores" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Envíame un correo cuando otros escriban comentarios sobre mi contenido" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Preferencias de licencia" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Envíame un correo cuando otros escriban comentarios sobre mi contenido" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "El título no puede estar vacío" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descripción de esta colección" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Vieja contraseña" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te pertenece." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nueva contraseña" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +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/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Contraseña" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "Introduce tu contraseña para probar que posees la cuenta." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Una entrada con esa ficha ya existe para este usuario." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Estás editando el contenido de otro usuario. Procede con precaución." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "¡Has añadido el adjunto %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Sólo puedes editar tu propio perfil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Estás editando un perfil de usuario. Procede con precaución." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Los cambios de perfil fueron salvados" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "las configuraciones de cuenta fueron salvadas" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Necesitas confirmar el borrado de tu cuenta." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "¡Ya tienes una colección llamada \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Una colección con esa ficha ya existe para este usuario/a." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Contraseña incorrecta" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Se ha cambiado la contraseña correctamente" +#: mediagoblin/edit/views.py:413 +msgid "Your email address has been verified." +msgstr "Tu dirección de correo electrónico ha sido verificada." + #: 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" @@ -308,19 +338,62 @@ msgid "" "domain." msgstr "No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de cookies o similar.<br/> Por favor asegúrate de permitir las cookies para este dominio." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Lo sentidos, No soportamos ese tipo de archivo :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "ha fallado la ejecución de unoconv, comprueba el fichero de registro (log)" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Ha fallado la conversión de vídeo" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "comentó tu publicación" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "¡Suscrito a comentarios sobre %s!" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "No recibirás notificaciones de comentarios sobre %s." + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "Se debe proporcionar un código (token) de OAuth." + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "No se ha encontrado el código (token) de petición." + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nombre de usuario" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Dirección de correo electrónico" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Nombre de usuario o correo electrónico" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Mantener iniciada la sesión" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locación" @@ -384,7 +457,7 @@ msgstr "La URI para redireccionar las aplicaciones, este campo es <strong>requer msgid "This field is required for public clients" msgstr "Este campo es requerido para los clientes públicos" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "¡El cliente {0} ha sido registrado!" @@ -397,59 +470,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Añadir " -#: mediagoblin/processing/__init__.py:193 +#: 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 "Lo siento, ya hay registrada una cuenta con esa OpenID." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Lo siento, no se ha encontrado el servidor OpenID" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "No se ha encontrado el servicio OpenID para %s" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "Falló la verificación de %s: %s" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Verificación cancelada" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "Tu url de OpenID se ha guardado correctamente." + +#: 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 "No puedes borrar tu única url de OpenID a menos que tengas establecida una contraseña" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "Esa OpenID no está registrada para esta cuenta." + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "Se ha eliminado correctamente la 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 "Agregar una 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 "Eliminar una 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 "Borrar" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Iniciar sesión" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "¡Hubo un fallo al iniciar sesión!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "¡Inicia sesión para crear una cuenta!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "¡O inicia sesión con contraseña!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "¡O inicia sesión con OpenID!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "¡O regístrate con OpenID!" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "Lo siento, ya hay una cuenta registrada para ese correo electrónico de Persona." + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "La dirección de correo electrónico de Persona se ha eliminado correctamente." + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "No puedes borrar tu única dirección de correo electrónico de Persona a menos que tengas establecida una contraseña." + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "Esa dirección de correo electrónico de Persona no está registrada para esta cuenta." + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "Lo siento, ya hay una cuenta registrada con esa dirección de correo electrónico de Persona." + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "Se ha guardado correctamente tu dirección de correo electrónico de Persona." + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "Eliminar una dirección de correo electrónico de Persona" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "¡O inicia sesión con Persona!" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "¡O regístrate con Persona!" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Archivo inválido para el formato seleccionado." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "La copia al almacenamiento público ha fallado." + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "No se ha encontrado un fichero de procesamiento aceptable" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Archivo" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Debes proporcionar un archivo." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "¡Yuju! ¡Enviado!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "¡Colección \"%s\" añadida!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "¡Verifica tu email!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "cerrar sesión" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Iniciar sesión" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Cambiar la configuración de la cuenta" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -457,16 +680,16 @@ msgstr "Cambiar la configuración de la cuenta" msgid "Media processing panel" msgstr "Panel de procesamiento de contenido" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Cerrar sesión" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Añadir contenido" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Crear nueva colección" @@ -513,6 +736,59 @@ msgstr "Últimos 10 envíos con éxito" msgid "No processed entries, yet!" msgstr "¡Aún no hay entradas procesadas!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "Autorización" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "Autorizar" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Has iniciado sesión como" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "¿Quieres autorizar a" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "una aplicación desconocida" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "para que acceda a tu cuenta?" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "Las aplicaciones con acceso a tu cuenta pueden:" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "Publicar nuevos contenidos por tí" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Ver tu información (p.ej. perfil, contenidos, etc...)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Cambiar tu información" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "Autorización finalizada" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "Autorización completa" + +#: mediagoblin/templates/mediagoblin/api/oob.html:28 +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" @@ -545,19 +821,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "¡Hubo un fallo al iniciar sesión!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "¡Crea una aquí!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -566,7 +838,7 @@ msgstr "¿Olvidaste tu contraseña?" msgid "Create an account!" msgstr "¡Crea una cuenta!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Crear" @@ -600,7 +872,7 @@ msgstr "Publicado bajo la <a href=\"http://www.fsf.org/licensing/licenses/agpl-3 msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!" @@ -610,23 +882,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Este sitio está montado con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Para añadir tus propios contenidos, dejar comentarios y más, puedes iniciar sesión con tu cuenta de MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "¿Aún no tienes una? ¡Es fácil!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "\n >Crear una cuenta en este sitio</a>\n o" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crear una cuenta en este sitio</a>\n o\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instalar MediaGoblin en tu propio servidor</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" +msgstr "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Instalar MediaGoblin en tu propio servidor</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -640,13 +917,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Adjuntos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Agregar adjunto" @@ -663,22 +940,29 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Guardar cambios" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Cambiando la contraseña de %(username)s" +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?" @@ -706,14 +990,14 @@ 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:46 -msgid "Change your password." -msgstr "Cambiar tu contraseña." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Borrar mi cuenta" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Correo electrónico" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -725,6 +1009,36 @@ msgstr "Editando %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Editando el perfil de %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "Hola,\n\nQueríamos verificar que eres %(username)s. Si ése es el caso, entonces \npor favor sigue el enlace de abajo para verificar tu nueva dirección de correo electrónico.\n\n%(verification_url)s\n\nSi no eres %(username)s o no solicitaste un cambio de dirección de correo electrónico,\npuedes ignorar este correo." + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Nuevos comentarios" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "hace %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Marcar todo como leído" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -735,8 +1049,7 @@ msgstr "Contenido etiquetado con: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Descargar" @@ -760,7 +1073,7 @@ msgid "" msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el audio <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Archivo original" @@ -769,6 +1082,10 @@ msgstr "Archivo original" msgid "WebM file (Vorbis codec)" msgstr "Archivo WebM (códec Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Creado" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -780,47 +1097,39 @@ msgstr "Archivo WebM (códec Vorbis)" msgid "Image for %(media_title)s" msgstr "Imágenes para %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "Fichero PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Alternar Rotar" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspectiva" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Frente" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Arriba" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Lateral" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Descargar modelo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Formato de Archivo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Altura del Objeto" @@ -839,8 +1148,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "Archivo WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "Archivo WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -866,11 +1175,6 @@ msgstr "%(collection_title)s por <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Editar" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Borrar" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -925,29 +1229,22 @@ msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Explorando contenido de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Añadir un comentario" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Añade un comentario " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "hace %(formatted_time)s" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Previsualización del comentario" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Agregado" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Creado" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1106,26 +1403,34 @@ msgstr "Marcado con" msgid "Could not read the image file." msgstr "No se pudo leer el archivo de imagen." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "¡Ups!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Ha ocurrido un error" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Petición errónea" + +#: mediagoblin/tools/response.py:53 +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 msgid "Operation not allowed" msgstr "Operación no permitida" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1162,10 +1467,9 @@ msgstr "Comentario" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para el formato." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> para dar formato." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1187,77 +1491,80 @@ msgstr "-- Selecciona --" msgid "Include a note" msgstr "Incluir una nota" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "comentó tu publicación" +#: 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 "Puedes usar\n <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n Markdown</a> para dar formato." -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Lo siento, los comentarios están desactivados." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Ups, tu comentario estaba vacío." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "¡Tu comentario ha sido publicado!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Por favor, revisa tus entradas e inténtalo de nuevo." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Tienes que seleccionar o añadir una colección" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "%s\" ya está en la colección \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" añadido a la colección \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Eliminaste el contenido" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Borraste el ítem de la colección." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Borraste la colección \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 3422ad97..533a29bb 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 08e73e1a..c1a16616 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Persian (http://www.transifex.com/projects/p/mediagoblin/language/fa/)\n" "MIME-Version: 1.0\n" @@ -19,250 +19,280 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "نام کاربری" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "گذرواٰژه" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "آدرس ایمیل" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "متاسفانه،ثبتنام به طور موقت غیر فعال است." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "متاسفانه،ثبتنام به طور موقت غیر فعال است." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "متاسفانه کاربری با این نام کاربری وجود دارد." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "ایمیل شما تایید شد.شما می توانید حالا وارد شوید،نمایه خود را ویرایش کنید و تصاویر خود را ثبت کنید!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "این کد تاییدیه یا شناسه کاربری صحیح نیست." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "ایمیل تاییدیه باز ارسال شد." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "عنوان" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "برچسب" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "زندگینامه" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "وبسایت" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "گذرواٰژه" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "شما در حال ویرایش رسانه کاربر دیگری هستید.با احتیاط عمل کنید" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -297,19 +327,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "نام کاربری" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "آدرس ایمیل" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -373,7 +446,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -386,59 +459,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "ورود" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "ورود با خطا انجام شد!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "فایلی نا معتبر برای نوع رسانه داده شده." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "فایل" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "شما باید فایلی ارايه بدهید." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "هورا!ثبت شد!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "ورود" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -446,16 +669,16 @@ msgstr "" msgid "Media processing panel" msgstr "پنل رسیدگی به رسانه ها" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -502,6 +725,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -534,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "ورود با خطا انجام شد!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "آیا حساب کاربری ندارید؟" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "در اینجا یکی بسازید!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -555,7 +827,7 @@ msgstr "" msgid "Create an account!" msgstr "ساخت یک حساب کاربری!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "ساختن" @@ -589,7 +861,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -599,22 +871,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -652,22 +929,29 @@ msgstr "انصراف" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "ذخیره تغییرات" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -695,12 +979,12 @@ msgstr "ویرایش %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -714,6 +998,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "در حال ویرایش نمایه %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -724,8 +1038,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -749,7 +1062,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -758,6 +1071,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -769,47 +1086,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -828,7 +1137,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -855,11 +1164,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,29 +1218,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s رسانه های" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1095,26 +1392,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "اوه" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1151,9 +1456,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1176,77 +1480,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 7bc860a0..9eb5dc65 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 6103c439..9d596861 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -7,6 +7,7 @@ # alcazar <alexispay@gmail.com>, 2012 # chesuidayeur <chesuidayeur@yahoo.fr>, 2011 # Bibit <crash_bibit@hotmail.com>, 2013 +# Fubik, 2013 # joehillen <joehillen@gmail.com>, 2011 # hellpe <hell_pe@no-log.org>, 2013 # MarkTraceur <marktraceur@gmail.com>, 2011 @@ -17,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -28,249 +29,279 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nom d'utilisateur" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Mot de passe" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adresse e-mail" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "L'inscription n'est pas activée sur ce serveur, désolé." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -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." +msgstr "Désolé, l'authentification est désactivée sur ce serveur." -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Nom d'utilisateur ou email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nom d'utilisateur ou adresse de courriel invalide." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." -msgstr "" +msgstr "Ce champ n'accepte pas les adresses email." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." -msgstr "" +msgstr "Ce champ nécessite une adresse email." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "L'inscription n'est pas activée sur ce serveur, désolé." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Un utilisateur existe déjà avec ce nom, désolé." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "La clé de vérification ou l'identifiant de l'utilisateur est incorrect." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Votre adresse e-mail a bien été vérifiée. Vous pouvez maintenant vous identifier, modifier votre profil, et soumettre des images !" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "La clé de vérification ou le nom d'utilisateur est incorrect." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Vous devez être authentifié afin que nous sachions à qui envoyer l'e-mail !" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Votre adresse e-mail a déjà été vérifiée !" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "E-mail de vérification renvoyé." -#: mediagoblin/auth/views.py:258 +#: 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 "" +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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "Nom d'utilisateur introuvable." -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titre" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descriptif pour ce travail" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Séparez les champs avec des virgules." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Légende" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "La légende ne peut pas être laissée vide." -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "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:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licence" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Site web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Cette adresse contiens des erreurs" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Me prévenir par email lorsque d'autres commentent mes médias" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." -msgstr "" +msgid "License preference" +msgstr "Préférence de licence" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Me prévenir par email lorsque d'autres commentent mes médias" +#: mediagoblin/edit/forms.py:75 +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:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Le titre ne peut être vide" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Description de cette collection" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Ancien mot de passe." -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le propriétaire de ce compte." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nouveau mot de passe" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Nouvelle adresse email" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Mot de passe" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "Entrez votre mot de passe pour prouver que vous possédez ce compte." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." -msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende." +msgstr "Une entrée avec la même légende existe déjà pour cet utilisateur." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez prendre garde." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Vous avez ajouté la pièce jointe %s !" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Vous ne pouvez modifier que votre propre profil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre garde." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Les changements apportés au profile ont étés sauvegardés" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Les changements des préférences du compte ont étés sauvegardés" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Vous devez confirmer la suppression de votre compte." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vous avez déjà une collection appelée \"%s\" !" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "Une collection avec la même légende existe déjà pour cet utilisateur." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" -msgstr "" +msgstr "Votre mot de passe a correctement été changé" + +#: mediagoblin/edit/views.py:413 +msgid "Your email address has been verified." +msgstr "Votre adresse email a bien été validée." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -287,38 +318,81 @@ msgstr "" #: mediagoblin/gmg_commands/assetlink.py:112 #, python-format msgid "Could not link \"%s\": %s exists and is not a symlink\n" -msgstr "" +msgstr "Ne peut pas lier \"%s\" : %s existe et n'est pas un lien symbolique\n" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format msgid "Skipping \"%s\"; already set up.\n" -msgstr "" +msgstr "Saute \"%s\"; déjà défini.\n" #: mediagoblin/gmg_commands/assetlink.py:124 #, python-format msgid "Old link found for \"%s\"; removing.\n" -msgstr "" +msgstr "Vieux lien trouvé pour \"%s\"; suppression.\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 "Cookie CSRF non présent. Cela est vraisemblablement l’œuvre d'un bloqueur de cookies ou autres.<br/>Veuillez vous assurer d'autoriser les cookies pour ce domaine." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" -msgstr "" +msgstr "unoconv n'arrive pas à s'exécuter, vérifiez le fichier log" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "L'encodage de la vidéo à échoué" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "a commenté votre post" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "Inscrit aux commentaires sur %s !" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "Vous ne recevrez pas de notifications pour les commentaires sur %s." + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "Doit fournir un oauth_token." + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adresse e-mail" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Nom d'utilisateur ou email" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Rester connecter" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Position" @@ -342,7 +416,7 @@ msgstr "Nom" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" -msgstr "" +msgstr "Le nom du client OAuth" #: mediagoblin/plugins/oauth/forms.py:36 msgid "Description" @@ -366,7 +440,7 @@ 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>Confidentiel</strong> - Le client peut envoyer des requêtes à l'instance de GNU MediaGoblin qui ne peuvent pas être interceptées par le user agent (un client côté serveur par exemple).<br />\n<strong>Public</strong> - Le client ne peut pas envoyer des requêtes confidentielles à l'instance de GNU MediaGoblin (un client JavaScript côté client par exemple)." #: mediagoblin/plugins/oauth/forms.py:52 msgid "Redirect URI" @@ -382,7 +456,7 @@ msgstr "L'URI de redirection pour l'application, ce champ est <strong>requis</st msgid "This field is required for public clients" msgstr "Ce champ est requis pour les clients publics" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Le client {0} as été enregistré !" @@ -392,62 +466,212 @@ msgstr "" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +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/user_pages/media_collect.html:68 msgid "Add" msgstr "Ajouter" -#: mediagoblin/processing/__init__.py:193 +#: 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 "Désolé, un compte est déjà enregistré avec cet OpenID." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Désolé, le serveur OpenID n'a pas pu être trouvé." + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "Aucun service OpenID n'a été trouvé pour %s" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "La vérification de %s a échoué : %s" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Vérification annulée" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "Votre url OpenID a été correctement enregistrée." + +#: 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 "Vous ne pouvez pas supprimer votre seul URL OpenID sauf si vous avez défini un mot de passe" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "Cet OpenID n'est pas relié à ce compte." + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "OpenID a été correctement supprimé." + +#: 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 "Ajouter 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 "Supprimer un 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 "Effacer" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "S'identifier" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "La connexion a échoué!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "Ou se connecter avec un mot de passe !" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "Ou se connecter avec OpenID !" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "Ou s'enregistrer avec OpenID !" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "Désolé, un compte est déjà enregistré avec cet email Persona." + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "L'adresse email Persona a correctement été supprimée." + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "Vous ne pouvez pas supprimer votre seul email Persona sauf si vous avez défini un mot de passe." + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "Cette adresse email Persona n'est pas liée à ce compte." + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "Désolé, un compte est déjà enregistré avec cette adresse email Persona." + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "Votre adresse email Persona a bien été enregistrée." + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "Supprimer une adresse email Persona" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "Ou se connecter avec Persona !" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "Ou s'enregistrer avec Persona !" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Le fichier envoyé ne correspond pas au type de média." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "La copie vers le stockage public a échoué." + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fichier" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Il vous faut fournir un fichier." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Youhou, c'est envoyé !" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Collection \"%s\" ajoutée !" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "Déconnexion" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "S'identifier" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "" +msgstr "Compte de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Changer les paramètres du compte" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -455,16 +679,16 @@ msgstr "Changer les paramètres du compte" msgid "Media processing panel" msgstr "Panneau pour le traitement des médias" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" -msgstr "" +msgstr "Se déconnecter" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Ajouter des médias" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Créer une nouvelle collection" @@ -511,6 +735,59 @@ msgstr "10 derniers envois terminés" 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" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "Autoriser" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Vous êtes connecté en tant que" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "Voulez-vous autoriser" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "une application inconnue" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "pour accéder à votre compte ?" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "Les applications ayant accès à votre compte peuvent :" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "Poster un nouveau média sous votre nom" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Voir vos informations (profile, médias, etc...)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Modifier vos informations" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:28 +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" @@ -543,19 +820,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "La connexion a échoué!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Créez-en un ici !" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Vous avez oublié votre mot de passe ?" @@ -564,7 +837,7 @@ msgstr "Vous avez oublié votre mot de passe ?" msgid "Create an account!" msgstr "Créer un compte !" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Créer" @@ -584,7 +857,7 @@ msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin, 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 "Propulsé par <a href=\"http://mediagoblin.org/\" title='Version %(version)s'>MediaGoblin</a>, un projet <a href=\"http://gnu.org/\">GNU</a>." #: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 #, python-format @@ -598,7 +871,7 @@ msgstr "Disponible sous la licence <a href=\"http://www.fsf.org/licensing/licens msgid "Explore" msgstr "Explorer" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Bonjour, et bienvenue sur ce site MediaGoblin !" @@ -608,23 +881,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Ce site fait tourner <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un logiciel d'hébergement de média extraordinairement génial." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Pour ajouter vos propres médias, commenter, et bien plus encore, vous pouvez vous connecter avec votre compte MediaGoblin" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Vous n'en avez pas ? C'est facile !" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "\n>Créer un compte sur ce site</a>\nou" + +#: 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 "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Installer MediaGoblin sur votre propre serveur</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -638,13 +916,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Pièces jointes" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Ajouter une pièce jointe" @@ -661,30 +939,37 @@ msgstr "Annuler" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Enregistrer les modifications" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "" +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 "" +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?" -msgstr "" +msgstr "Réellement supprimer l'utilisateur \"%(user_name)s\" et tous les médias/commentaires liés ?" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 msgid "Yes, really delete my account" -msgstr "" +msgstr "Oui, supprimer réellement mon compte" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:48 @@ -704,13 +989,13 @@ 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:46 -msgid "Change your password." -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" -msgstr "" +msgstr "Supprimer mon compte" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Email" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -723,6 +1008,36 @@ msgstr "Modification de %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Modification du profil de %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "Bonjour,\n\nNous voulons vérifier que vous êtes %(username)s. Si cela est bien le cas, veuillez suivre le lien ci-dessous pour vérifier votre nouvelle adresse email.\n\n%(verification_url)s\n\nSi vous n'êtes pas %(username)s ou n'avez pas demandé un changement d'adresse email, vous pouvez ignorer cet email." + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Nouveaux commentaires" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "Il y a %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Marquer tous lus" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -733,8 +1048,7 @@ msgstr "Médias taggés avec : %(tag_name)s " #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Télécharger" @@ -758,7 +1072,7 @@ msgid "" msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Fichier original" @@ -767,6 +1081,10 @@ msgstr "Fichier original" msgid "WebM file (Vorbis codec)" msgstr "fichier WebM (codec Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Créé" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -778,67 +1096,59 @@ msgstr "fichier WebM (codec Vorbis)" msgid "Image for %(media_title)s" msgstr "Image de %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "Fichier PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" -msgstr "" +msgstr "Haut" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" -msgstr "" +msgstr "Côté" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" -msgstr "" +msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" -msgstr "" +msgstr "Télécharger le modèle" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" -msgstr "" +msgstr "Format de fichier" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" -msgstr "" +msgstr "Hauteur de l'objet" #: mediagoblin/templates/mediagoblin/media_displays/video.html:44 msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +msgstr "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 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 "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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "fichier WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "Fichier WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -852,7 +1162,7 @@ msgstr "Ajoutez votre média" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (collection de %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format @@ -864,11 +1174,6 @@ msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Éditer" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Effacer" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -887,12 +1192,12 @@ msgstr "Retirer" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Collections de %(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 "Collections de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -911,7 +1216,7 @@ msgstr "Medias de %(username)s" msgid "" "<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " "href=\"%(tag_url)s\">%(tag)s</a>" -msgstr "" +msgstr "Media de <a href=\"%(user_url)s\">%(username)s</a> avec le tag <a href=\"%(tag_url)s\">%(tag)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format @@ -923,34 +1228,27 @@ msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Parcourir les médias de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Ajouter un commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Ajouter ce commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Prévisualisation du commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" +msgstr "Ajouté" #: 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 "Ajouter “%(media_title)s” à une collection" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" @@ -1029,7 +1327,7 @@ msgstr "Cet utilisateur n'a pas (encore) rempli son profil." #: mediagoblin/templates/mediagoblin/user_pages/user.html:124 msgid "Browse collections" -msgstr "" +msgstr "Parcourir les collections" #: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format @@ -1050,7 +1348,7 @@ msgstr "Il ne semble pas y avoir de média là, pour l'instant ..." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(supprimer)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" @@ -1058,7 +1356,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" -msgstr "" +msgstr "Ajouter à une collection" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 #: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 @@ -1104,26 +1402,34 @@ msgstr "Taggé avec" msgid "Could not read the image file." msgstr "Impossible de lire l'image." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Zut !" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Une erreur est survenue" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Mauvaise requête" + +#: mediagoblin/tools/response.py:53 +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 msgid "Operation not allowed" msgstr "Opération non autorisée" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1132,38 +1438,37 @@ msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé ! </p><p>Si #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "année" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "mois" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "semaine" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "jour" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "heure" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minute" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Commenter" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Vous pouvez utilisez les <a href=\"http://daringfireball.net/projects/markdown/basics\">Balises</a> pour la mise en page." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "Vous pouvez utiliser <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> pour le formatage." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1175,7 +1480,7 @@ msgstr "Je suis certain de vouloir retirer cet élément de la collection" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Collection" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" @@ -1185,77 +1490,80 @@ msgstr "-- Sélectionner --" msgid "Include a note" msgstr "Inclure une note" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "a commenté votre post" +#: 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 "Vous pouvez utiliser\n<a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\nMarkdown</a> pour le formatage." -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Désolé, les commentaires sont désactivés." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Veuillez vérifier vos entrées et réessayer." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Vous devez sélectionner ou ajouter une collection" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" est déjà dans la collection \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" as été ajouté à la collection \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Vous avez supprimé cet élément de la collection." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vous avez supprimé la collection \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 09412b0a..487668e1 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 4a5c2b52..251b528d 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-01 07:11+0000\n" -"Last-Translator: GenghisKhan <genghiskhan@gmx.ca>\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" "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,250 +21,280 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "שם משתמש" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "סיסמה" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "כתובת דוא״ל" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "לצערנו, רישום הינו מנוטרל על שרת זה." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -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." +msgstr "לצערנו, אימות הינו מנוטרל על שרת זה." -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "שם משתמש או דוא״ל" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "שם משתמש או דוא״ל שגוי." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "שדה זה לא לוקח כתובות דוא״ל." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "שדה זה מצריך כתובת דוא״ל." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "צר לי, רישום הינו מנוטרל על שרת זה." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." -msgstr "צר לי, משתמש עם שם זה כבר קיים." +msgstr "לצערנו, משתמש עם שם זה כבר קיים." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." -msgstr "צר לי, משתמש עם דוא״ל זה כבר קיים." +msgstr "לצערנו, משתמש עם דוא״ל זה כבר קיים." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "מפתח האימות או מזהה המשתמש אינו מדויק." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "כתובת הדוא״ל שלך אומתה. כעת באפשרותך להתחבר, לערוך את דיוקנך, ולשלוח תמונות!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "מפתח האימות או זהות משתמש הינם שגויים" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "עליך להתחבר על מנת שנדע אל מי לשלוח את הדוא״ל!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "כבר אימתת את כתובת הדוא״ל שלך!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "שלח שוב את דוא״ל האימות שלך." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "לא היה ניתן למצוא מישהו עם שם משתמש זה." -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "דוא״ל נשלח בצירוף הוראות בנוגע לכיצד ניתן לשנות את סיסמתך." -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "כותרת" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "תיאור של מלאכה זו" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "תגיות" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "הפרד תגיות בעזרת פסיקים." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "חשופית" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "החשופית לא יכולה להיות ריקה" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "אזור הכותרת של כתובת מדיה זו. לרוב אין הכרח לשנות את חלק זה." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "רשיון" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "ביו" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "אתר רשת" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "כתובת זו מכילה שגיאות" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "שלח לי דוא״ל כאשר אחרים מגיבים על המדיה שלי" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "עדיפות רשיון" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "זה יהיה הרשיוןן המשתמט (ברירת מחדל) שלך בטופסי העלאה." -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "שלח לי דוא״ל כאשר אחרים מגיבים על המדיה שלי" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "הכותרת לא יכולה להיות ריקה" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "תיאור אוסף זה" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "אזור הכותרת של כתובת אוסף זה. לרוב אין הכרח לשנות את חלק זה." -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "סיסמה ישנה" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "הזן את סיסמתך הישנה כדי להוכיח שאתה הבעלים של חשבון זה." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "סיסמה חדשה" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "כתובת דוא״ל חדשה" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "סיסמה" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "רשומה עם חשופית זו כבר קיימת עבור משתמש זה." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "אתה עורך מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "הוספת את התצריף %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "באפשרותך לערוך רק את הדיוקן שלך." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "אתה עורך דיוקן של משתמש. המשך בזהירות." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "שינויי דיוקן נשמרו" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "הגדרות חשבון נשמרו" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "עליך לאמת את המחיקה של חשבונך." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "כבר יש לך אוסף שקרוי בשם \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "אוסף עם חשופית זו כבר קיים עבור משתמש זה." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "סיסמה שגויה" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -299,19 +329,62 @@ msgid "" "domain." msgstr "עוגיית CSRF לא נוכחת. זה קרוב לוודאי נובע משום חוסם עוגייה או משהו בסגנון.<br/>הבטח קביעה של עוגיות עבור תחום זה." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" -msgstr "צר לי, אינני תומך בטיפוס קובץ זה :(" +msgstr "לצערנו, אינני תומך בטיפוס קובץ זה :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "unoconv נכשל לפעול, בדוק קובץ יומן" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "המרת וידאו נכשלה" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "הגיב/ה על פרסומך" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "הירשם אל תגובות בתוך %s!" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "שם משתמש" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "כתובת דוא״ל" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "שם משתמש או דוא״ל" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "הישאר מחובר" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "מיקום" @@ -375,7 +448,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "שדה זה הינו דרוש עבור לקוחות פומביים" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "הלקוח {0} נרשם!" @@ -388,59 +461,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "הוסף" -#: mediagoblin/processing/__init__.py:193 +#: 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 "לצערנו, קיים כבר חשבון אשר רשום עם OpenID." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "לצערנו, שרת OpenID לא היה יכול להימצא" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "לא נמצא שירות OpenID עבור %s" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "הוסף 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 "מחק 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 "מחק" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "התחברות" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "התחברות נכשלה!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "התחבר כדי ליצור חשבון!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "או התחבר בעזרת סיסמה!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "או התחבר עם OpenID!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "או הירשם בעזרת OpenID!" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "לצערנו, קיים כבר חשבון אשר רשום לאישיות דוא״ל זו." + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "לצערנו, קיים כבר חשבון אשר רשום עם אישיות כתובת דוא״ל זו." + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "ניתן קובץ שגוי עבור טיפוס מדיה." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "קובץ" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "עליך לספק קובץ." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "הידד! נשלח!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "אוסף \"%s\" התווסף!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "אמת את הדוא״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "התנתקות" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "התחברות" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "שנה הגדרות חשבון" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -448,16 +671,16 @@ msgstr "שנה הגדרות חשבון" msgid "Media processing panel" msgstr "לוח עיבוד מדיה" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "התנתקות" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "הוספת מדיה" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "צור אוסף חדש" @@ -504,6 +727,59 @@ msgstr "10 העלאות מוצלחות אחרונות" msgid "No processed entries, yet!" msgstr "אין רישומים מעובדים, עדיין!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -536,19 +812,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "התחברות נכשלה!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "אין לך חשבון עדיין?" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "צור חשבון כאן!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "שכחת את סיסמתך?" @@ -557,7 +829,7 @@ msgstr "שכחת את סיסמתך?" msgid "Create an account!" msgstr "צור חשבון!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "צור" @@ -591,7 +863,7 @@ msgstr "משוחרר תחת הרשיון <a href=\"http://www.fsf.org/licensing/ msgid "Explore" msgstr "לחקור" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "שלום לך, ברוך בואך אל אתר MediaGoblin זה!" @@ -601,23 +873,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "אתר זה מריץ <a href=\"http://mediagoblin.org\">MediaGoblin</a>, חתיכת תוכנת אירוח מדיה יוצאת מן הכלל." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "בכדי להוסיף את המדיה שלך, להשים תגובות, ועוד, ביכולתך להתחבר עם חשבון MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "אין ברשותך חשבון עדיין? זה קל!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">צור חשבון באתר זה</a>\n או\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">התקן את MediaGoblin על שרתך</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" +msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -631,13 +908,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "תצריפים" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "הוספת תצריף" @@ -654,22 +931,29 @@ msgstr "ביטול" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "שמור שינויים" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "משנה כעת את הסיסמה של %(username)s'" +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?" @@ -697,14 +981,14 @@ msgstr "ערוך %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "שינוי הגדרות חשבון עבור %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "שנה את סיסמתך." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "מחק את החשבון שלי" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -716,6 +1000,36 @@ msgstr "עריכת %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "עריכת דיוקן עבור %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "מלפני %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -726,8 +1040,7 @@ msgstr "מדיה מתויגת עם: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "הורד" @@ -741,7 +1054,7 @@ msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "צר לי, אודיו זה לא יעבוד מכיוון \n\tשדפדפן הרשת שלך לא תומך \n\tאודיו של HTML5." +msgstr "לצערנו, אודיו זה לא יעבוד מכיוון \n\tשדפדפן הרשת שלך לא תומך \n\tאודיו של HTML5." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47 msgid "" @@ -751,7 +1064,7 @@ msgid "" 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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "קובץ מקורי" @@ -760,6 +1073,10 @@ msgstr "קובץ מקורי" msgid "WebM file (Vorbis codec)" msgstr "קובץ WebM (קודק Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "נוצר" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -771,47 +1088,39 @@ msgstr "קובץ WebM (קודק Vorbis)" msgid "Image for %(media_title)s" msgstr "תמונה עבור %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "קובץ PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "החלף סיבוב" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "נקודת מבט" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "לפנים" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "ראש" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "צד" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "הורד מודל" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "פורמט קובץ" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "גובה אובייקט" @@ -820,7 +1129,7 @@ msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "צר לי, וידאו זה לא יעבוד מכיוון \n שדפדפן הרשת שלך לא תומך \n וידאו של HTML5." +msgstr "לצערנו, וידאו זה לא יעבוד מכיוון \n שדפדפן הרשת שלך לא תומך \n וידאו של HTML5." #: mediagoblin/templates/mediagoblin/media_displays/video.html:47 msgid "" @@ -830,8 +1139,8 @@ msgid "" msgstr "ביכולתך להשיג דפדפן רשת מודרני \n שכן מסוגל לנגן את וידאו זה אצל <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "קובץ WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -857,11 +1166,6 @@ msgstr "%(collection_title)s מאת <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "ערוך" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "מחק" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,29 +1220,22 @@ msgstr "המדיה של <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ עיון במדיה מאת <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "הוסף תגובה" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "הוסף את תגובה זו" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "מלפני %(formatted_time)s" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "התווסף" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "נוצר" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -970,7 +1267,7 @@ msgstr "הדיוקן של %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/user.html:43 msgid "Sorry, no such user found." -msgstr "צר לי, משתמש נתון לא נמצא." +msgstr "לצערנו, משתמש נתון לא נמצא." #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 @@ -1097,31 +1394,39 @@ msgstr "מתויגת עם" msgid "Could not read the image file." msgstr "לא היה ניתן לקרוא את קובץ התמונה." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "אופס!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "אירעה שגיאה" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "פעולה לא מורשית" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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>ניסית לבצע פעולה שאינך מורשה לעשות. האם ניסית למחוק את כל החשבונות של המשתמשים שוב?" +msgstr "צר לי דייב, אני לא יכול להתיר לך לעשות זאת!</p><p>ניסית לבצע פעולה שאינך מורשה לעשות. האם ניסית למחוק את כל החשבונות של המשתמשים שוב?" -#: mediagoblin/tools/response.py:60 +#: mediagoblin/tools/response.py:69 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 "לא נראה שקיים עמוד בכתובת זו. צר לי!</p><p>אם אתה בטוח שהכתובת הינה מדויקת, ייתכן שהעמוד שאתה מחפש כעת הועבר או נמחק." +msgstr "לא נראה כי קיים עמוד בכתובת זו. צר לי!</p><p>אם אתה בטוח שהכתובת הינה מדויקת, ייתכן שהעמוד שאתה מחפש כעת הועבר או נמחק." #: mediagoblin/tools/timesince.py:62 msgid "year" @@ -1153,10 +1458,9 @@ msgstr "תגובה" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "ביכולתך לעשות שימוש בתחביר <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> לעיצוב." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1178,77 +1482,80 @@ msgstr "-- בחר --" msgid "Include a note" msgstr "הכללת פתק" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "הגיב/ה על פרסומך" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "מצטערים, תגובות מנוטרלות." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "אופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "אנא בדוק את רשומותיך ונסה שוב." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "עליך לבחור או להוסיף אוסף" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" כבר קיים באוסף \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" התווסף אל האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "מחקת את מדיה זו." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "המדיה לא נמחקה מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "בחרת למחוק מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "מחקת את הפריט מן אוסף זה." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "הפריט לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "בחרת למחוק פריט מן אוסף של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת את האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "האוסף לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 d22f6ee6..53444ef4 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 c9f814fc..84801f32 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po @@ -4,13 +4,13 @@ # # Translators: # Aleksandr Brezhnev <abrezhnev@gmail.com>, 2012 -# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2011 +# Emilio Sepúlveda, 2011 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Interlingua (http://www.transifex.com/projects/p/mediagoblin/language/ia/)\n" "MIME-Version: 1.0\n" @@ -20,250 +20,280 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nomine de usator" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Contrasigno" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adresse de e-posta" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titulo" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiquettas" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Sito web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Contrasigno" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nomine de usator" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adresse de e-posta" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -374,7 +447,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Initiar session" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Initiar session" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -503,6 +726,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -556,7 +828,7 @@ msgstr "" msgid "Create an account!" msgstr "Crear un conto!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -590,7 +862,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -600,22 +872,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -653,22 +930,29 @@ msgstr "Cancellar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -696,12 +980,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -715,6 +999,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -750,7 +1063,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -759,6 +1072,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -829,7 +1138,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -856,11 +1165,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,9 +1457,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1177,77 +1481,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 596ab843..fb1674f0 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 77896b87..83322047 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po @@ -3,14 +3,16 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# Sveinn í Felli <sveinki@nett.is>, 2013 # tryggvib <tryggvib@fsfi.is>, 2012 # tryggvib <tryggvib@fsfi.is>, 2013 +# tryggvib <tryggvib@fsfi.is>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-05 22:51+0000\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" "Language-Team: Icelandic (Iceland) (http://www.transifex.com/projects/p/mediagoblin/language/is_IS/)\n" "MIME-Version: 1.0\n" @@ -20,253 +22,283 @@ msgstr "" "Language: is_IS\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Notandanafn" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Lykilorð" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Netfang" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Því miður er nýskráning ekki leyfð á þessu svæði." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Notandanafn eða tölvupóstur" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: 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:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Notandanafn eða netfang" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Ógilt notandanafn eða netfang" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Þessi reitur tekur ekki við netföngum." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." -msgstr "í þennan reit verður að slá inn netfang." - -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Því miður er nýskráning ekki leyfð á þessu svæði." +msgstr "í þennan reit verður að slá inn tölvupóstfang." -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Því miður er nú þegar til notandi með þetta nafn." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Netfangið þitt hefur verið staðfest. Þú getur núna innskráð þig, breytt kenniskránni þinni og sent inn efni!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Staðfestingarlykillinn eða notendaauðkennið er rangt" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Þú verður að hafa innskráð þig svo við vitum hvert á að senda tölvupóstinn!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Þú hefur staðfest netfangið þitt!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Endursendi staðfestingartölvupóst" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titill" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Lýsing á þessu efni" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Efnisorð" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Aðskildu efnisorðin með kommum." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Vefslóðarormur" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Vefslóðarormurinn getur ekki verið tómur" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Titilhlutinn í vefslóð þessa efnis. Þú þarft vanalega ekki að breyta þessu." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" -msgstr "Leyfi" +msgstr "Notkunarleyfi" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Lýsing" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Vefsíða" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Þetta netfang inniheldur villur" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" -msgstr "Leyfiskjörstilling" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "Virkja innri tilkynningar um viðburði." #: mediagoblin/edit/forms.py:69 +msgid "License preference" +msgstr "Stilling á notkunarleyfi" + +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Þessi titill getur verið innihaldslaus" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Lýsing á þessu albúmi" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Gamla lykilorðið" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Skráðu gamla lykilorðið þitt til að sanna að þú átt þennan aðgang." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nýtt lykilorð" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Nýtt netfang" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Lykilorð" + +#: mediagoblin/edit/forms.py:122 +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." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Efni merkt með þessum vefslóðarormi er nú þegar til fyrir þennan notanda." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Þú ert að breyta efni annars notanda. Farðu mjög varlega." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Þú bættir við viðhenginu %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Þú getur bara breytt þinni eigin kenniskrá." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Þú ert að breyta kenniskrá notanda. Farðu mjög varlega." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Breytingar á kenniskrá vistaðar" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Aðgangsstillingar vistaðar" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 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:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Þú hefur nú þegar albúm sem kallast \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Albúm með þessu vefslóðarormi er nú þegar til fyrir þennan notanda." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" -msgstr "Vitlaust lykilorð" +msgstr "Rangt lykilorð" -#: mediagoblin/edit/views.py:363 +#: 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 +msgid "Your email address has been verified." +msgstr "Netfangið þitt hefur verið staðfest." + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" -msgstr "Get ekki hlekkjað í þema... ekkert þema stillt\n" +msgstr "Get ekki tengt þema... ekkert þema stillt\n" #: mediagoblin/gmg_commands/assetlink.py:73 msgid "No asset directory for this theme\n" @@ -274,12 +306,12 @@ msgstr "Engin eignamappa fyrir þetta þema\n" #: mediagoblin/gmg_commands/assetlink.py:76 msgid "However, old link directory symlink found; removed.\n" -msgstr "Fann samt gamlan táknrænan tengil á möppu; fjarlægður.\n" +msgstr "Fann samt gamlan tákntengil á möppu; fjarlægður.\n" #: mediagoblin/gmg_commands/assetlink.py:112 #, python-format msgid "Could not link \"%s\": %s exists and is not a symlink\n" -msgstr "Gat ekki tengt \"%s\": %s er til og er ekki sýndartengill\n" +msgstr "Gat ekki tengt \"%s\": %s er til og er ekki tákntengill\n" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format @@ -296,20 +328,63 @@ 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 "CSRF smygildi ekki til staðar. Þetta er líklegast orsakað af smygildishindrara eða einhverju þess háttar.<br/>Athugaðu hvort þú leyfir ekki alveg örugglega smygildi fyrir þetta lén." +msgstr "CSRF smákaka ekki til staðar. Þetta er líklegast orsakað af smákökugildru eða einhverju þess háttar.<br/>Athugaðu hvort þú leyfir ekki alveg örugglega smákökur fyrir þetta lén." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Ég styð því miður ekki þessa gerð af skrám :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "tekst ekki að keyra unoconv, athugaðu annálsskrá" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" -msgstr "Myndbandsþverkótun mistókst" +msgstr "Þverkóðun myndskeiðs mistókst" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "skrifaði athugasemd við færsluna þína" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "Þú ert nú áskrifandi að athugasemdum „%s“!" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "Þú færð tilkynningar þegar einhver skrifar athugasemd við „%s“." + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "Þú verður að gefa upp OAuth tóka (oauth_token)." + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "Engin beiðni fannst." + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Notandanafn" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Tölvupóstfang" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Notandanafn eða tölvupóstur" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Muna eftir mér" #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" @@ -330,7 +405,7 @@ msgstr "Banna" #: mediagoblin/plugins/oauth/forms.py:34 msgid "Name" -msgstr "Nafn" +msgstr "Heiti" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" @@ -374,7 +449,7 @@ msgstr "Áframsendingarvefslóðin fyrir forritin, þessi reitur\n er msgid "This field is required for public clients" msgstr "Þessi reitur er nauðsynlegur fyrir opinbera biðlara" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Biðlarinn {0} hefur verið skráður!" @@ -387,59 +462,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Bæta við" -#: mediagoblin/processing/__init__.py:193 +#: 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 "Því miður er annar aðgangur nú þegar skráður fyrir þetta OpenID auðkenni." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID auðkenni" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Því miður fannst OpenID netþjónninn ekki" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "Engin OpenID þjónusta fannst fyrir „%s“" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "Staðfesting á „%s“ mistóksts: „%s“" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Hætt við staðfestingu" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "Það tókst að vista OpenID vefslóðina þína." + +#: 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 "Þú getur ekki eytt einu OpenID vefslóðinni nema þú hafir skráð lykilorð" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "Þetta OpenID auðkenni er ekki skráð á þennan aðgang." + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "Það tókst að fjarlægja OpenID auðkennið." + +#: 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 "Bæta við OpenID auðkenni" + +#: 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 "Eyða OpenID auðkenni" + +#: 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 "Eyða" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Innskrá" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Mistókst að skrá þig inn." + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "Skráðu þig inn til að búa til nýjan aðgang!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "...eða skráðu þig inn með lykilorði!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "...eða skráðu þig inn með OpenID auðkenni!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "...eða nýskráðu þig með OpenID auðkenni!" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang." + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "Það tókst að fjarlægja „Persona“ netfangið." + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "Þú getur ekki eytt eina „Persona“ netfanginu þínu nema þú hafir skráð lykilorð." + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "Þetta „Persona“ netfang er ekki skráð fyrir þennan aðgang." + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "Því miður er annar aðgangur nú þegar skráður fyrir þetta „Persona“ netfang." + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "Það tókst að vista „Persona“ netfangið þitt." + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "Eyða „Persona“ netfangi" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "...eða skráðu þig inn með „Persona“!" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "...eða nýskráðu þig með „Persona“!" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "Það tókst ekki að afrita yfir í almennu geymsluna." + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "Nothæf keyrsluskrá fannst ekki" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Skrá" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Þú verður að gefa upp skrá." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Jibbí jei! Það tókst að senda inn!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Albúmið \"%s\" var búið til!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "útskrá" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Innskrá" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Breyta stillingum notandaaðgangs" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +672,16 @@ msgstr "Breyta stillingum notandaaðgangs" msgid "Media processing panel" msgstr "Margmiðlunarvinnsluskiki" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Skrá út" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Senda inn efni" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Búa til nýtt albúm" @@ -503,6 +728,59 @@ msgstr "Síðustu 10 árangursríku innsendingarnar" msgid "No processed entries, yet!" msgstr "Ekkert fullunnið efni enn!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "Heimilun" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "Heimila" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Þú ert" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "Viltu heimila" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "óþekktu forriti" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "að fá aðgang að aðganginum þínum?" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "Forrit með aðgang að notendaaðganginum þínum geta:" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "Sent inn nýtt margmiðlunarefni sem þú" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Skoða upplýsingarnar þínar (t.d. kenniskrá, margmiðlunarefni o.s.frv.)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Breytt upplýsingunum þínum" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "Heimilun lokið" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "Heimild klár" + +#: mediagoblin/templates/mediagoblin/api/oob.html:28 +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" @@ -535,19 +813,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Mistókst að skrá þig inn." - #: 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:45 +#: 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:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Gleymdirðu lykilorðinu þínu?" @@ -556,7 +830,7 @@ msgstr "Gleymdirðu lykilorðinu þínu?" msgid "Create an account!" msgstr "Búðu til nýjan aðgang!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Búa til" @@ -590,7 +864,7 @@ msgstr "Gefið út undir <a href=\"http://www.fsf.org/licensing/licenses/agpl-3. msgid "Explore" msgstr "Skoða" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hæ! Gakktu í bæinn á þetta MediaGoblin vefsvæði!" @@ -600,23 +874,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Þetta vefsvæði keyrir á <a href=\"http://mediagoblin.org\">MediaGoblin</a> sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Til að senda inn þitt efni, gera athugasemdir og fleira getur þú skráð þig inn með þínum MediaGoblin aðgangi." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Ertu ekki með aðgang? Það er auðvelt að búa til!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Búa til aðgang á þessari síðu</a>\neða\n<a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Settu upp þinn eigin margmiðlunarþjón</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "\n>Búa til aðgang á þessari síðu</a>\neða" + +#: 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 "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">settu upp þinn eigin margmiðlunarþjón</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +909,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Viðhengi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Bæta við viðhengi" @@ -653,22 +932,29 @@ 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:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Vista breytingar" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Breyti lykilorði fyrir notandann: %(username)s" +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?" @@ -696,14 +982,14 @@ msgstr "Breyti %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Breyti notandaaðgangsstillingum fyrir: %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "Breyta lykilorðinu þínu." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Eyða aðganginum mínum" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Netfang" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +1001,36 @@ msgstr "Breyti %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Breyti kenniskrá notandans: %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "Hi,\n\nVið vildum staðfesta að þú værir notandinn „%(username)s“. Ef það er rétt,\nvinsamlegast smelltu á tengilinn hér fyrir neðan til að staðfesta nýja netfangið þitt.\n\n%(verification_url)s\n\nEf þú ert ekki „%(username)s“ or baðst ekki um að breytan netfanginu getur þú hunsað\nþennan tölvupóst." + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Nýjar athugasemdir" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "Fyrir %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Merkja allt lesið" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,11 +1041,10 @@ msgstr "Efni merkt með: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" -msgstr "Sækja af Netinu" +msgstr "Sækja" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -750,7 +1065,7 @@ msgid "" msgstr "Þú getur náð í nýlegan vafra sem \n\tgetur spilað hljóðskrár á <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Upphaflega skráin" @@ -759,6 +1074,10 @@ msgstr "Upphaflega skráin" msgid "WebM file (Vorbis codec)" msgstr "WebM skrá (Vorbis víxlþjöppun)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Búið til" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1089,39 @@ msgstr "WebM skrá (Vorbis víxlþjöppun)" msgid "Image for %(media_title)s" msgstr "Mynd fyrir %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF skrá" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Stilla snúning af eða á" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" -msgstr "Sjónhorf" +msgstr "Fjarvídd" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Framhlið" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Toppur" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Hlið" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Hala niður líkani" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Skráarsnið" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Hæð hlutar" @@ -819,18 +1130,18 @@ msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "Því miður mun þetta myndband ekki virka því\n vafrinn þinn styður ekki HTML5 \n myndbönd." +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 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ð myndbandið á <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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM skrá (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "WebM skrá (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1167,6 @@ msgstr "%(collection_title)s sem <a href=\"%(user_url)s\">%(username)s</a> bjó msgid "Edit" msgstr "Breyta" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Eyða" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1221,22 @@ msgstr "Efni sem <a href=\"%(user_url)s\">%(username)s</a> á" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Skoða efnið sem <a href=\"%(user_url)s\">%(username)s</a> setti inn" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Bæta við athugasemd" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Senda inn þessa athugasemd" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "Fyrir %(formatted_time)s" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Útlit athugasemdar" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Bætt við" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Skapað" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1395,34 @@ msgstr "Merkt með" msgid "Could not read the image file." msgstr "Gat ekki lesið myndskrána." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Obbosí!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Villa kom upp" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Ekki nógu góð beiðni" + +#: mediagoblin/tools/response.py:53 +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 msgid "Operation not allowed" msgstr "Aðgerð ekki leyfileg" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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>Þú hefur reynt að framkvæma aðger sem þú hefur ekki leyfi til. Varstu að reyna að eyða öllum notendunum aftur?" +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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1459,9 @@ msgstr "Athugasemd" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Þú getur notað <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til að stílgera textann" +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "Þú getur notað <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> til að stílgera textann." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1483,80 @@ msgstr "-- Velja --" msgid "Include a note" msgstr "Bæta við minnispunktum" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "skrifaði athugasemd við færsluna þína" +#: 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 "Þú 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:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Því miður, athugasemdir eru óvirkar." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Obbosí! Athugasemdin þín var innihaldslaus." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Athugasemdin þín var skráð!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." -msgstr "Vinsamlegast kíktu á innsendingarnar þínar og reyndu aftur." +msgstr "Vinsamlegast kíktu á færslurnar þínar og reyndu aftur." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Þú verður að velja eða búa til albúm" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" er nú þegar í albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" sett í albúmið \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Þú tókst þetta efni úr albúminu." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 62575b62..74176ccf 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 c782fc62..2e73b622 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Italian (http://www.transifex.com/projects/p/mediagoblin/language/it/)\n" "MIME-Version: 1.0\n" @@ -23,250 +23,280 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nome utente" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Password" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Indirizzo email" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Spiacente, la registrazione è disabilitata su questa istanza." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Nome utente o indirizzo email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Spiacente, la registrazione è disabilitata su questa istanza." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Spiacente, esiste già un utente con quel nome." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Il tuo indirizzo email è stato verificato. Ora puoi accedere, modificare il tuo profilo e caricare immagini!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "La chiave di verifica o l'id utente è sbagliato" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Devi effettuare l'accesso così possiamo sapere a chi inviare l'email!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Hai già verificato il tuo indirizzo email!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Rispedisci email di verifica" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descrizione di questo lavoro" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Tags" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separa le tags con la virgola." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: 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." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licenza" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biografia" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Sito web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Questo indirizzo contiene errori" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: 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" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Inviami messaggi email quando altre persone commentano i miei files multimediali" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Password vecchia" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario dell'account." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nuova password" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Password" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: 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." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Stai modificando il profilo di un utente. Procedi con attenzione." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Cambiamenti del profilo salvati" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Impostazioni del profilo salvate" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Password errata" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -301,19 +331,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Mi dispiace, non supporto questo tipo di file :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Transcodifica video fallita" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "ha commentato il tuo post" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nome utente" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Indirizzo email" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Posizione" @@ -377,7 +450,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -390,59 +463,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Aggiungi" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Elimina" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Accedi" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Accesso fallito!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Devi specificare un file." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Evviva! Caricato!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Accedi" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Cambia le impostazioni dell'account" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -450,16 +673,16 @@ msgstr "Cambia le impostazioni dell'account" msgid "Media processing panel" msgstr "Pannello di elaborazione files multimediali" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Aggiungi files multimediali" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -506,6 +729,59 @@ msgstr "Ultimi 10 caricamenti riusciti" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -538,19 +814,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Accesso fallito!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Creane uno qui!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Hai dimenticato la tua password?" @@ -559,7 +831,7 @@ msgstr "Hai dimenticato la tua password?" msgid "Create an account!" msgstr "Crea un account!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Crea" @@ -593,7 +865,7 @@ msgstr "Rilasciato con licenza <a href=\"http://www.fsf.org/licensing/licenses/a msgid "Explore" msgstr "Esplora" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Ciao, benvenuto in questo sito MediaGoblin!" @@ -603,22 +875,27 @@ msgid "" "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." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Per aggiungere i tuoi file multimediali, scrivere commenti e altro puoi accedere con il tuo account MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Non ne hai già uno? E' semplice!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -633,13 +910,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Allegati" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Aggiungi allegato" @@ -656,22 +933,29 @@ msgstr "Annulla" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salva i cambiamenti" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -699,12 +983,12 @@ 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:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -718,6 +1002,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "Stai modificando il profilo di %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -728,8 +1042,7 @@ msgstr "File taggato con: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Scarica" @@ -753,7 +1066,7 @@ msgid "" msgstr "Puoi scaricare un browser web moderno,\n\t in grado di leggere questo file audio, qui <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "File originario" @@ -762,6 +1075,10 @@ msgstr "File originario" msgid "WebM file (Vorbis codec)" msgstr "File WebM (codec Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -773,47 +1090,39 @@ msgstr "File WebM (codec Vorbis)" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -832,8 +1141,8 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "File WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -859,11 +1168,6 @@ msgstr "" msgid "Edit" msgstr "Modifica" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Elimina" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -918,29 +1222,22 @@ msgstr "Files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" 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>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Aggiungi un commento" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Aggiungi questo commento" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1099,26 +1396,34 @@ msgstr "Taggato con" msgid "Could not read the image file." msgstr "Impossibile leggere il file immagine." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oops!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1155,10 +1460,9 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Puoi usare il <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> per la formattazione." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1180,77 +1484,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "ha commentato il tuo post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo Binary files differindex 3c82d1ff..841f0219 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 97d68127..88a8ddc8 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Japanese (http://www.transifex.com/projects/p/mediagoblin/language/ja/)\n" "MIME-Version: 1.0\n" @@ -20,250 +20,280 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "ユーザネーム" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "パスワード" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "メールアドレス" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "メアドが確認されています。これで、ログインしてプロファイルを編集し、画像を提出することができます！" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "検証キーまたはユーザーIDが間違っています" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "検証メールを再送しました。" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "タイトル" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "タグ" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "スラグ" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "スラグは必要です。" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "自己紹介" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "URL" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "パスワード" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "ユーザネーム" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "メールアドレス" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -374,7 +447,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "追加" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "削除" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "ログイン" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "ファイル" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "ファイルを提供する必要があります。" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "投稿終了！" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "ログイン" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -503,6 +726,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "まだアカウントを持っていませんか？" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "ここで作成！" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "パスワードを忘れましたか？" @@ -556,7 +828,7 @@ msgstr "パスワードを忘れましたか？" msgid "Create an account!" msgstr "アカウントを作成！" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -590,7 +862,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "こんにちは、このMediaGoblinサイトへようこそ！" @@ -600,22 +872,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -653,22 +930,29 @@ msgstr "キャンセル" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "投稿する" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -696,12 +980,12 @@ msgstr "%(media_title)sを編集中" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -715,6 +999,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "%(username)sさんのプロフィールを編集中" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "ダウンロード" @@ -750,7 +1063,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -759,6 +1072,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -829,7 +1138,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -856,11 +1165,6 @@ msgstr "" msgid "Edit" msgstr "編集" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "削除" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>さんのコンテンツ" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,9 +1457,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1177,77 +1481,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 7d37ab7c..dec0d936 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 5333de02..b192f7ab 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/mediagoblin/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -19,250 +19,280 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "사용자 이름" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "비밀번호" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "email 주소" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "죄송합니다. 지금은 가입 하실 수 없습니다." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "사용자 이름 또는 email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "죄송합니다. 지금은 가입 하실 수 없습니다." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "죄송합니다. 해당 사용자 이름이 이미 존재 합니다." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "죄송합니다. 사용자와 해당 이메일은 이미 등록되어 있습니다." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "해당 email 주소가 이미 인증 되어 있습니다. 지금 로그인하시고 계정 정보를 수정하고 사진을 전송해 보세요!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "인증 키 또는 사용자 ID가 올바르지 않습니다." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "로그인을 하셔야 고블린에서 메일을 보낼 수 있습니다!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "이미 인증받은 email 주소를 가지고 있습니다!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "인증 메일을 다시 보내 주세요." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "비밀번호를 변경하는 방법에 대한 설명서가 메일로 전송 되었습니다." -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "제목" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "이 작업에 대한 설명" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "태그" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "태그는 , 로 구분 됩니다." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "'슬러그'" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "'슬러그'는 공백일 수 없습니다." -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "제목은 미디어 주소의 일부분 입니다. 수정하지 않아도 됩니다." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "License" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "소개" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "웹 주소" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "주소에 에러가 있습니다." -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "제 미디어에 대한 컨텍을 원한다면, 메일을 보내주세요." + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "제 미디어에 대한 컨텍을 원한다면, 메일을 보내주세요." +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "제목은 공백일 수 없습니다." -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "모음집에 대한 설명" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "예전 비밀번호" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "계정 확인을 위해, 이전 비밀 번호를 입력해 주세요." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "새로운 비밀번호" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "비밀번호" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "해당 유저에 대한 '슬러그'가 이미 존재합니다." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "다른 사용자의 미디어를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "사용자의 계정 정보를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "계정 정보가 저장 되었습니다." -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "계정 설정이 저장 되었습니다." -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "\"%s\" 모음집을 이미 가지고 있습니다!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 유저의 모음집을 수정 중 입니다. 주의하세요." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "잘못된 비밀번호" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -297,19 +327,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "죄송합니다. 해당 타입의 파일은 지원하지 않아요 :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "비디오 변환에 실패 했습니다." +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "게시물에 덧글이 달렸습니다." + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "사용자 이름" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "email 주소" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "장소" @@ -373,7 +446,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "이 항목은 공개 사용자들을 위해 꼭 필요 합니다." -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "사용자 {0}님이 등록 되었습니다!" @@ -386,59 +459,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "추가" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "삭제" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "로그인" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "로그인에 실패 했습니다!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "알수없는 미디어 파일 입니다." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "파일" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "파일을 등록하셔야 합니다." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "이햐!! 등록했습니다!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "\"%s\" 모음집이 추가되었습니다!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "메일을 확인하세요!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "로그인" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "계정 설정 변경" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -446,16 +669,16 @@ msgstr "계정 설정 변경" msgid "Media processing panel" msgstr "미디어 작업 패널" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "미디어 추가" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -502,6 +725,59 @@ msgstr "지난 10개의 업로드 목록" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -534,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "안녕하세요 %(username)s,\n\nGNU MediaGoblin의 사용자 계정 비밀번호를 바꾸시려면, 인터넷 창을 여시고 아래 URL을 통해 접속 하세요. :\n\n%(verification_url)s\n\n오류라고 생각 된다면, 이 메일을 무시하시고 고블린을 즐기세요!" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "로그인에 실패 했습니다!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "아직 계정이 없으세요?" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "이곳에서 새로 만드세요!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "비밀번호를 잊으셨나요?" @@ -555,7 +827,7 @@ msgstr "비밀번호를 잊으셨나요?" msgid "Create an account!" msgstr "계정을 새로 만듭니다!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "생성" @@ -589,7 +861,7 @@ msgstr "Released under the <a href=\"http://www.fsf.org/licensing/licenses/agpl- msgid "Explore" msgstr "탐색" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "안녕하세요! 미디어 고블린 사이트에 온걸 환영 합니다!" @@ -599,22 +871,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "이사이트는 <a href=\"http://mediagoblin.org\">MediaGoblin</a>으로 작동 중입니다. 이는 특이한 미디어 호스팅 소프트웨어중 하나 입니다." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "자신의 미디어를 추가하고, 댓글을 남기세요! 미디어 고블린 계정으로 내역을 확인 하실 수 있습니다!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "아직 아무것도 없으시다구요? 매우 쉽습니다!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -629,13 +906,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "첨부" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "첨부 추가" @@ -652,22 +929,29 @@ msgstr "취소" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "저장" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -695,12 +979,12 @@ msgstr "%(media_title)s 편집중..." msgid "Changing %(username)s's account settings" msgstr "%(username)s'의 계정 설정 변경중..." -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -714,6 +998,36 @@ msgstr "%(collection_title)s 편집 중" msgid "Editing %(username)s's profile" msgstr "%(username)s의 계정 정보 수정중..." +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -724,8 +1038,7 @@ msgstr "미디어는 다음으로 태그 되었습니다.: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "다운로드" @@ -749,7 +1062,7 @@ msgid "" 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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "원본 파일" @@ -758,6 +1071,10 @@ msgstr "원본 파일" msgid "WebM file (Vorbis codec)" msgstr "WebM 파일 (Vorbis 코덱)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -769,47 +1086,39 @@ msgstr "WebM 파일 (Vorbis 코덱)" msgid "Image for %(media_title)s" msgstr "%(media_title)s 이미지" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -828,8 +1137,8 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM 파일 (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -855,11 +1164,6 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>의 %(collection_title)s" msgid "Edit" msgstr "수정" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "삭제" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,29 +1218,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>의 미디어" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ <a href=\"%(user_url)s\">%(username)s</a>의 미디어를 보고 있습니다." -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "덧글 달기" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "덧글 추가" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1095,26 +1392,34 @@ msgstr "태그 정보" msgid "Could not read the image file." msgstr "이미지 파일을 읽을 수 없습니다." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "웁스!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1151,10 +1456,9 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "포멧팅을 위해 <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 을 사용할 수 있습니다.." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1176,77 +1480,80 @@ msgstr "-- 선택 --" msgid "Include a note" msgstr "노트 추가" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "게시물에 덧글이 달렸습니다." +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "오우, 댓글이 비었습니다." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "댓글이 등록 되었습니다!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "확인을 하시고 다시 시도하세요." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "모음집을 추가하거나 기존 모음집을 선택하세요." -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" 모음집이 이미 존재 합니다. \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" 모음집을 추가했습니다. \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "미디어를 삭제 했습니다." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "확인 체크를 하지 않았습니다. 미디어는 삭제되지 않았습니다." -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "다른 사람의 미디어를 삭제하려고 합니다. 다시 한번 확인하세요." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "모음집에 있는 항목을 삭제 했습니다." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 항목은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "다른 사용자의 모음집에 있는 항목을 삭제하였습니다. 주의하세요." -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%s\" 모음집을 삭제하셨습니다." -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 모음집은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 4e6e51ce..2b6c247d 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 14e4fb33..7853ec7c 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Dutch (http://www.transifex.com/projects/p/mediagoblin/language/nl/)\n" "MIME-Version: 1.0\n" @@ -20,250 +20,280 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Gebruikersnaam" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Wachtwoord" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "E-mail adres" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Sorry, registratie is uitgeschakeld op deze instantie." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Gebruikersnaam of email-adres" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Sorry, registratie is uitgeschakeld op deze instantie." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Sorry, er bestaat al een gebruiker met die naam." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en afbeeldingen toevoegen!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "De verificatie sleutel of gebruikers-ID is onjuist" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Je moet ingelogd zijn, anders weten we niet waar we de e-mail naartoe moeten sturen!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Je hebt je e-mailadres al geverifieerd!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Verificatie e-mail opnieuw opgestuurd." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Beschrijving van dit werk" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiket" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Hou labels gescheiden met komma's." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "De slug kan niet leeg zijn" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Het titelgedeelte van het adres van deze media. Normaal gesproken hoef je deze niet te veranderen." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licentie" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Website" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Dit adres bevat fouten" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Oud wachtwoord" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nieuw wachtwoord" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Wachtwoord" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Er bestaat al een met die slug voor deze gebruiker." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig te werk." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Profielaanpassingen opgeslagen" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Accountinstellingen opgeslagen" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Verkeerd wachtwoord" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Sorry, dat bestandstype wordt niet ondersteunt." -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Gebruikersnaam" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "E-mail adres" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locatie" @@ -374,7 +447,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Voeg toe" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Verwijderen" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Inloggen" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Inloggen is mislukt!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Bestand" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "U moet een bestand aangeven." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Mooizo! Toegevoegd!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Inloggen" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Accountinstellingen aanpassen" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "Accountinstellingen aanpassen" msgid "Media processing panel" msgstr "Mediaverwerkingspaneel" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Voeg media toe" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -503,6 +726,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Inloggen is mislukt!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Maak er hier een!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Wachtwoord vergeten?" @@ -556,7 +828,7 @@ msgstr "Wachtwoord vergeten?" msgid "Create an account!" msgstr "Maak een account aan!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Creëer" @@ -590,7 +862,7 @@ msgstr "Uitgegeven onder de <a href=\"http://www.fsf.org/licensing/licenses/agpl msgid "Explore" msgstr "Verkennen" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hoi, welkom op deze MediaGoblin website!" @@ -600,22 +872,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Deze website draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een buitengewoon goed stuk software voor mediahosting." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Heb je er nog geen? Het is heel eenvoudig!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -653,22 +930,29 @@ msgstr "Annuleren" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Wijzigingen opslaan" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -696,12 +980,12 @@ msgstr "%(media_title)s aanpassen" msgid "Changing %(username)s's account settings" msgstr "%(username)ss accountinstellingen aanpassen" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -715,6 +999,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "Het profiel aanpassen van %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Media met het label: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -750,7 +1063,7 @@ msgid "" msgstr "U kunt een moderne web-browser die \n\taudio kan afspelen vinden op <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -759,6 +1072,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "Afbeelding voor %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -829,7 +1138,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -856,11 +1165,6 @@ msgstr "" msgid "Edit" msgstr "Pas aan" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Verwijderen" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Blader door media van <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Geef een reactie" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Voeg dit bericht toe" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "Getagged met" msgid "Could not read the image file." msgstr "Kon het afbeeldingsbestand niet lezen." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oeps!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1457,9 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1481,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 9cbd03b2..4b2e7815 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 6a11d5da..261713fb 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-31 15:40+0000\n" -"Last-Translator: velmont <odin.omdal@gmail.com>\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" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,250 +20,280 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Brukarnamn" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Passord" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Epost" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Registrering er slege av. Orsak." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Brukarnamn eller epost" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "Autentisering er slege av. Orsak." -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Brukarnamn eller epost" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Ugyldig brukarnamn eller passord." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Dette feltet tek ikkje epostadresser." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Dette feltet krev ei epostadresse." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Registrering er slege av. Orsak." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Ein konto med dette brukarnamnet finst allereide." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Ein brukar med den epostadressa finst allereie." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta opp filer." -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Du må vera innlogga, slik me veit kven som skal ha eposten." -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Du har allereie verifisiert epostadressa." -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." -msgstr "Send ein ny stadfestingsepost." +msgstr "Stadfestingsepost sendt." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "Fann ingen med det brukarnamnet." -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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 uverifisert." +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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Tittel" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Skildring av verk" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Merkelappar" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separer merkelappar med komma." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Nettnamn" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Nettnamnet kan ikkje vera tomt" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Nettnamnet (adressetittel) for verket di. Trengst ikkje endrast." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Lisens" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Presentasjon" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Heimeside" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Adressa inneheld feil" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Send meg epost når andre kjem med innspel på verka mine." + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Lisens-val" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "Dette vil vera standardvalet ditt for lisens." -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Send meg epost når andre kjem med innspel på verka mine." - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Tittelen kjan ikkje vera tom" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Forklaringa til denne samlinga" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Gamalt passort" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kontoen." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nytt passord" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Ny epostadresse" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Passord" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "Skriv inn passordet som prov på at dette er din konto." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Eit innlegg med denne adressetittelen finst allereie." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Trå varsamt, du endrar nokon andre sine verk." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "La til vedlegg %s." -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Du kan berre enda din eigen profil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Trå varsamt, du endrar nokon andre sin profil." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Lagra endring av profilen" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Lagra kontoinstellingar" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Du må stadfesta slettinga av kontoen din." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allereie ei samling med namn «%s»." -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ei samling med den nettadressa finst allereie for denne brukaren." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Feil passord" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Endra passord" +#: mediagoblin/edit/views.py:413 +msgid "Your email address has been verified." +msgstr "Epostadressa di er bekrefta." + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Cannot link theme... no theme set\n" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "Finn ikkje CSRF-cookien. Dette er truleg grunna ein cookie-blokkar.<br/>\nSjå til at du tillet cookies for dette domenet." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Orsak, stør ikkje den filtypen :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "klarte ikkje køyra unoconv, sjekk logg-fil" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Skjedde noko gale med video transkodinga" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "kom med innspel på innlegget ditt" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "Tingar innspel frå %s." + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "Du vil ikkje få notifikasjonar for innspel på %s." + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "Treng oauth_token (must provide oath_token)." + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "Noko gjekk gale :( (no request token found)." + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Brukarnamn" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Epost" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Brukarnamn eller epost" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Hald meg innlogga" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Stad" @@ -374,7 +447,7 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet <strong>krevst</stron msgid "This field is required for public clients" msgstr "Dette feltet krevst for opne (public) klientar" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Klienten {0} er registrert." @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Legg til" -#: mediagoblin/processing/__init__.py:193 +#: 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 "Ein konto er allereie registrert til den OpenID-en." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Fann ikkje OpenID-tenaren." + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "Ingen OpenID funne for %s." + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "Stadfesting av %s feila: %s" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Stadfesting avbrutt" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "Lagra 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 "Kan ikkje sletta den einaste OpenID-urlen utan at du har eit passord satt." + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "Den OpenID-en er ikkje registrert til denne kontoen." + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "Fjerna OpenID-en." + +#: 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 "Legg til 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 "Slett ein 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 "Slett" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Logg inn" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Innlogging feila" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "Logg inn for å oppretta ein konto" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "Eller logg inn med passord." + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "Eller logg inn med OpenID." + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "Eller registrer med OpenID." + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "Ein konto er allereie registrert til den Persona-eposten." + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "Persone-eposten fjerna." + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "Du kan ikkje sletta din einaste Persona-epostadresse utan eit passord satt." + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "Den Persona-epostadressa er ikkje registrert til denne kontoen." + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "Ein konto med den Persona-epostadressa finst allereie." + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "Persone-epostadressa lagra." + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "Fjern ei Persona-epostadresse" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "Eller logg inn med Persona." + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "Eller registrer med Persona." + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ugyldig fil for medietypen." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "Klarte ikkje kopiera til «public storage»." + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "Fann ingen akseptable filar for prosessering." + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Du må velja ei fil." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Johoo! Opplasta!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "La til samlinga «%s»." -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" -msgstr "Verifiser epostadressa di." +msgstr "Stadfest epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "Logg ut" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Logg inn" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Endra kontoinstellingar" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "Endra kontoinstellingar" msgid "Media processing panel" msgstr "Verkprosesseringspanel" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Logg ut" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Legg til verk" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Lag ny samling" @@ -503,6 +726,59 @@ msgstr "Dei siste ti opplastningane" msgid "No processed entries, yet!" msgstr "Ingenting prossesert, enno." +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "Godkjenning" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "Godkjenn" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Du er innlogga som" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "Vil du godkjenna" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "som ukjend applikasjon" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "å få tilgang til kontoen din?" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "Applikasjonar med tilgang til kontoen din kan:" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "Leggja til media som deg" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Sjå informasjonen din (t.d. profil, bilete, osb...)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Endra informasjonen din" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "Godkjenning ferdig" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "Godkjenning ferdig" + +#: mediagoblin/templates/mediagoblin/api/oob.html:28 +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" @@ -535,28 +811,24 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Innlogging feila" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "Har du ingen konto?" +msgstr "Manglar du konto?" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" -msgstr "Lag ein!" +msgstr "Opprett ein!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: 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!" -msgstr "Lag ein konto." +msgstr "Opprett ein konto." -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Opprett" @@ -590,7 +862,7 @@ msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Explore" msgstr "Utforsk" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Heihei, velkomen til denne MediaGoblin-sida." @@ -600,23 +872,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Denne sida køyrer <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit superbra program for å visa fram dine kreative verk." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Har du ikkje ein enno? Det er enkelt!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Opprett ein konto på denne sida</a>\n eller\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set opp din eigen MediaGoblin-server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "\n>Opprett ein konto på denne sida</a>\neller" + +#: 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 "\n <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set opp din eigen MediaGoblin-server</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Vedlegg" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Legg ved vedlegg" @@ -653,22 +930,29 @@ msgstr "Bryt av" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Lagra" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Endrar passordet til %(username)s" +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?" @@ -696,14 +980,14 @@ 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:46 -msgid "Change your password." -msgstr "Endra passordet ditt." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Slett kontoen min" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Epost" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +999,36 @@ msgstr "Endrar %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Endrar profilen til %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "Hei!\n\nMe ynskjer å stadfesta at du er %(username)s. Dersom du er\nfylg denne lenkja for å stadfesta epostadressa di:\n\n%(verification_url)s\n\nDersom du ikkje er %(username)s eller ikkje ynskjer ei epost-endring kan du\nberre ignorera denne eposten." + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Nye innspel" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s sidan" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Marker alt lese" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Verk merka med: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Last ned" @@ -750,7 +1063,7 @@ msgid "" msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Opphavleg fil" @@ -759,6 +1072,10 @@ msgstr "Opphavleg fil" msgid "WebM file (Vorbis codec)" msgstr "WebM-fil (Vorbis-kodek)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Oppretta" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "WebM-fil (Vorbis-kodek)" msgid "Image for %(media_title)s" msgstr "Bilete for %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF-fil" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Slå av/på rotering" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspektiv" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Front" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Topp" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Side" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Last ned modell" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Filformat" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Objekthøgd" @@ -829,8 +1138,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM fil (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "WebM-fil (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1165,6 @@ msgstr "%(collection_title)s av <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Endra" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Slett" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Ser på <a href=\"%(user_url)s\">%(username)s</a> sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Legg att innspel" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Legg til dette innspelet" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s sidan" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Førehandsvisning av innspel" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Lagt til" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Oppretta" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -974,7 +1271,7 @@ 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 "Epostverifisering trengst." +msgstr "Treng stadfesting av epostadressa" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." @@ -991,7 +1288,7 @@ msgstr "I tilfelle det ikkje skjer:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:65 msgid "Resend verification email" -msgstr "Send ein ny epost" +msgstr "Send ein ny stadfestingsepost" #: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "" @@ -1096,26 +1393,34 @@ msgstr "Merka med" msgid "Could not read the image file." msgstr "Klarte ikkje lesa biletefila." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oops." -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Noko gjekk gale" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Bad Request (noko gjekk gale)" + +#: mediagoblin/tools/response.py:53 +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 msgid "Operation not allowed" msgstr "Ulovleg operasjon" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1457,9 @@ msgstr "Innspel" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formatterring." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formatterring." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1481,80 @@ msgstr "-- Vel --" msgid "Include a note" msgstr "Legg ved eit notat" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "kom med innspel på innlegget ditt" +#: 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 bruka <a href=\"http://daringfireball.net/projects/markdown/basics\" target=_blank>Markdown</a> til formattering." -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Innspel er avslege" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Sjekk filene dine og prøv omatt." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Du må velja eller laga ei samling" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» er allereie i samling «%s»" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» lagt til samling «%s»" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Du sletta verket." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje verket." -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Du fjerna fila frå samlinga." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje samlinga." -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 8b318329..238b025c 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 78ab219a..cf82c6b5 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# Daniel Koć <kocio@aster.pl>, 2012 +# Daniel Koć <daniel@xn--ko-wla.pl>, 2012 # Sergiusz Pawlowicz <transifex@pawlowicz.name>, 2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-28 13:51+0000\n" -"Last-Translator: Sergiusz Pawlowicz <transifex@pawlowicz.name>\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" "Language-Team: Polish (http://www.transifex.com/projects/p/mediagoblin/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,250 +20,280 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Użytkownik" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Hasło" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adres e-mail" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Niestety rejestracja w tym serwisie jest wyłączona." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Nazwa konta lub adres poczty elektronicznej" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Użytkownik lub adres e-mail" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nieprawidłowa nazwa konta albo niewłaściwy adres poczty elektronicznej." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Niniejsze pole nie jest przeznaczone na adres poczty elektronicznej." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Niniejsze pole wymaga podania adresu poczty elektronicznej." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Niestety rejestracja w tym serwisie jest wyłączona." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Niestety użytkownik o takiej nazwie już istnieje." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "Klucz kontrolny albo identyfikator użytkownika jest nieprawidłowy." + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Twój adres e-mail został zweryfikowany. Możesz się teraz zalogować, wypełnić opis swojego profilu i wysyłać grafiki!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Nieprawidłowy klucz weryfikacji lub identyfikator użytkownika." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Musisz się zalogować żebyśmy wiedzieli do kogo wysłać e-mail!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Twój adres e-mail już został zweryfikowany!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Wyślij ponownie e-mail weryfikujący." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Tytuł" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Opis tej pracy" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Znaczniki" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Rozdzielaj znaczniki przecinkami." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Slug nie może być pusty" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Fragment adresu mediów zawierający tytuł. Zwykle nie ma potrzeby aby go zmieniać." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencja" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biogram" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Strona internetowa" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Ten adres zawiera błędy" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Ulubiona licencja" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Powiadamiaj mnie e-mailem o komentarzach do moich mediów" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Tytuł nie może być pusty" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Opis tej kolekcji" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Stare hasło" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Wprowadź swoje stare hasło aby udowodnić, że to twoje konto." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nowe hasło" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Nowy adres poczty elektronicznej" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Hasło" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Adres z tym slugiem dla tego użytkownika już istnieje." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Dodałeś załącznik %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Masz możliwość edycji tylko własnego profilu." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Zapisano zmiany profilu" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Zapisano ustawienia konta" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Musisz potwierdzić, że chcesz skasować swoje konto." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Kolekcja \"%s\" już istnieje!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Kolekcja tego użytkownika z takim slugiem już istnieje." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Edytujesz kolekcję innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Nieprawidłowe hasło" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Twoje hasło zostało zmienione" +#: mediagoblin/edit/views.py:413 +msgid "Your email address has been verified." +msgstr "Twój adres poczty elektronicznej został potwierdzony." + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "Nie można podlinkować motywu... nie wybrano motywu\n" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "Ciasteczko CSFR nie jest dostępne. Najprawdopodobniej stosujesz jakąś formę blokowania ciasteczek.<br/>Upewnij się, że nasz serwer może zakładać ciasteczka w twojej przeglądarce." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "NIestety, nie obsługujemy tego typu plików :-(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "nie dało się uruchomić unoconv, sprawdź log" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Konwersja wideo nie powiodła się" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "komentarze do twojego wpisu" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "Musisz podać oauth_token." + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Użytkownik" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adres e-mail" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Nazwa konta lub adres poczty elektronicznej" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Pozostań zalogowany" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Położenie" @@ -374,7 +447,7 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n jest <strong>wyma msgid "This field is required for public clients" msgstr "To pole jest wymagane dla klientów publicznych" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Klient {0} został zarejestrowany!" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Dodaj" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Przepraszamy, serwer OpenID nie został znaleziony" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Potwierdzenie anulowane" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "Konto OpenID zostało pomyślnie usunięte." + +#: 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 "Dodaj konto 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 "Usuń konto 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 "Usuń" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Zaloguj się" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Logowanie nie powiodło się!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "Zaloguj się, aby utworzyć konto!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "Albo zaloguj się hasłem!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "Albo zaloguj się kontem OpenID!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Niewłaściwy plik dla tego rodzaju mediów." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Plik" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Musisz podać plik." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Hura! Wysłano!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekcja \"%s\" została dodana!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "wyloguj się" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Zaloguj się" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Zmień ustawienia konta" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "Zmień ustawienia konta" msgid "Media processing panel" msgstr "Panel przetwarzania mediów" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Wyloguj się" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Dodaj media" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Utwórz nową kolekcję" @@ -503,6 +726,59 @@ msgstr "Ostatnie 10 udanych wysyłek" msgid "No processed entries, yet!" msgstr "Na razie nie przetworzono żadnego wpisu!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Jesteś zalogowany jako" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Zobacz swoje dane (np. profil, media, itp.)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "" + +#: 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" @@ -535,19 +811,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Logowanie nie powiodło się!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Utwórz je tutaj!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Zapomniałeś hasła?" @@ -556,7 +828,7 @@ msgstr "Zapomniałeś hasła?" msgid "Create an account!" msgstr "Utwórz konto!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Utwórz" @@ -590,7 +862,7 @@ msgstr "Opublikowane na licencji <a href=\"http://www.fsf.org/licensing/licenses msgid "Explore" msgstr "Odkrywaj" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Cześć, witaj na stronie MediaGoblin!" @@ -600,23 +872,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Ten serwis działa w oparciu o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, świetne oprogramowanie do publikowania mediów." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Aby dodawać swoje pliki, komentować i wykonywać inne czynności, możesz się zalogować na swoje konto MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Jeszcze go nie masz? To proste!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Załóż konto na tym serwerze</a>\n albo\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Uruchom MediaGoblin na swoim własnym serwerze</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Załączniki" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Dodaj załącznik" @@ -653,22 +930,29 @@ msgstr "Anuluj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Zapisz zmiany" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Zmieniam hasło użytkownika %(username)s" +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?" @@ -696,14 +980,14 @@ msgstr "Edytowanie %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Zmiana ustawień konta %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "Zmień swoje hasło." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Usuń moje konto" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Adres poczty elektronicznej" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +999,36 @@ msgstr "Edycja %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Edycja profilu %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Nowe komentarze" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s temu" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Oznacz wszystkie jako przeczytane" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Media ze znacznikami: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Pobierz" @@ -750,7 +1063,7 @@ msgid "" msgstr "Proszę pobrać przeglądarkę, która obsługuje \n\tdźwięk w HTML5, pod adresem <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Oryginalny plik" @@ -759,6 +1072,10 @@ msgstr "Oryginalny plik" msgid "WebM file (Vorbis codec)" msgstr "plik WebM (kodek Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Utworzono" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "plik WebM (kodek Vorbis)" msgid "Image for %(media_title)s" msgstr "Grafika dla %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "Plik PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Obróć" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspektywa" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Początek" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Góra" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Krawędź" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Pobierz model" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Format pliku" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Wysokość obiektu" @@ -829,8 +1138,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "plik WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "Plik WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1165,6 @@ msgstr "%(collection_title)s użytkownika <a href=\"%(user_url)s\">%(username)s< msgid "Edit" msgstr "Edytuj" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Usuń" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "media użytkownika <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Przeglądanie mediów użytkownika <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Dodaj komentarz" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Dodaj komentarz" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s temu" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Podgląd komentarza" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Dodano" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Utworzono" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "Znaczniki:" msgid "Could not read the image file." msgstr "Nie udało się odczytać pliku grafiki." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Wystąpił błąd" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Niewłaściwe żądanie" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Operacja niedozwolona" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1457,9 @@ msgstr "Komentarz" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Możesz formatować przy pomocy składni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1481,80 @@ msgstr "-- wybierz --" msgid "Include a note" msgstr "Dodaj notatkę" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "komentarze do twojego wpisu" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Komentowanie jest wyłączone." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Ups, twój komentarz nie zawierał treści." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Twój komentarz został opublikowany!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Sprawdź swoje wpisy i spróbuj ponownie." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Musisz wybrać lub dodać kolekcję" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" już obecne w kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" dodano do kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Media zostały usunięte." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Element został usunięty z kolekcji." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Usunięto kolekcję \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 5e83a7f2..72cae0d0 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 fecb844c..ca18fd9f 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -7,13 +7,14 @@ # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013 # osc <snd.noise@gmail.com>, 2011 # ufa <ufa@technotroll.org>, 2011 -# Canopus <viniciussm@rocketmail.com>, 2013 +# Canopus, 2013 +# Canopus, 2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -23,249 +24,279 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nome de Usuário" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Senha" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Endereço de email" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Desculpa, o registro está desativado neste momento." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Nome de usuário ou email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nome de usuário ou email inválido." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Este campo não aceita endereços de email." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Este campo requer um endereço de email." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Desculpa, o registro está desativado neste momento." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Desculpe, um usuário com este nome já existe." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar seu perfil, e enviar imagens!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "A chave de verificação ou nome usuário estão incorretos." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Você precisa entrar primeiro para sabermos para quem mandar o email!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Você já verificou seu email!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "O email de verificação foi enviado novamente." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Título" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descrição desse trabalho" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiquetas" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Separe as etiquetas com vírgulas." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Arquivo" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "O arquivo não pode estar vazio" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "A parte do título do endereço dessa mídia. Geralmente você não precisa mudar isso." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licença" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biografia" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Website" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Este endereço contém erros" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Me enviar um email quando outras pessoas comentarem em minhas mídias" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Licença preferida" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Me enviar um email quando outras pessoas comentarem em minhas mídias" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "O título não pode ficar vazio" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descrição desta coleção" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Senha antiga" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Digite sua senha antiga para provar que esta conta é sua." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nova senha" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Novo endereço de email" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Senha" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "Digite sua senha para provar que esta conta é sua." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Uma entrada com esse arquivo já existe para esse usuário" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Você está editando a mídia de outro usuário. Tenha cuidado." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Você adicionou o anexo %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Você só pode editar o seu próprio perfil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Você está editando um perfil de usuário. Tenha cuidado." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "As mudanças no perfil foram salvas" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "As mudanças na conta foram salvas" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Você precisa confirmar a exclusão da sua conta." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Você já tem uma coleção chamada \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Já existe uma coleção com este arquivo para este usuário." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Senha errada" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" -msgstr "" +msgstr "Sua senha foi alterada com sucesso." + +#: mediagoblin/edit/views.py:413 +msgid "Your email address has been verified." +msgstr "Seu endereço de email foi verificado." #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" @@ -287,7 +318,7 @@ msgstr "" #: mediagoblin/gmg_commands/assetlink.py:119 #, python-format msgid "Skipping \"%s\"; already set up.\n" -msgstr "" +msgstr "Pulando \"%s\"; já configurado.\n" #: mediagoblin/gmg_commands/assetlink.py:124 #, python-format @@ -301,19 +332,62 @@ msgid "" "domain." msgstr "Cookie CSFR não está presente. Isso é provavelmente o resultado de um bloqueador de cookies ou algo do tipo.<br/>Tenha certeza de autorizar este domínio a configurar cookies." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Desculpe, não tenho suporte a este tipo de arquivo :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Conversão do vídeo falhou" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +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 "" + +#: 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." + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nome de Usuário" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Endereço de email" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Nome de usuário ou email" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "Mantenha-me Conectado" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Localização" @@ -377,7 +451,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "Este campo é necessário para clientes públicos" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "O cliente {0} foi registrado!" @@ -390,59 +464,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Adicionar" -#: mediagoblin/processing/__init__.py:193 +#: 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 "Desculpe, já existe uma conta associada a esse OpenID." + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "Desculpe, o servidor OpenID não pôde ser encontrado" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "Nenhum serviço OpenID encontrado para %s" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "Verificação de %s falhou: %s" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "Verificação cancelada" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "O endereço do seu OpenID foi salvo com sucesso." + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "Esse OpenID não está associado a esta conta." + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "OpenID removido com sucesso." + +#: 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 "Adicionar um 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 "Deletar um 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 "Apagar" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Entrar" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Autenticação falhou" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "Entre para criar uma conta!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "Ou entre com uma senha!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "Ou entre com OpenID!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "Ou registre com OpenID!" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "Ou entre com Persona!" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "Ou registre com Persona!" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Arquivo inválido para esse tipo de mídia" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "Falha ao copiar para armazenamento público." + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Arquivo" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Você deve fornecer um arquivo." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Eba! Enviado!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Coleção \"%s\" adicionada!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifique seu email!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "sair" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Entrar" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Mudar configurações da conta" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -450,16 +674,16 @@ msgstr "Mudar configurações da conta" msgid "Media processing panel" msgstr "Painel de processamento de mídia" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Sair" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Adicionar mídia" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Criar nova coleção" @@ -506,6 +730,59 @@ msgstr "Últimos 10 envios bem sucedidos" msgid "No processed entries, yet!" msgstr "Ainda não há entradas processadas!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "Autorização" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "Autorizar" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "Você está conectado como" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "Você quer autorizar" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "um aplicativo desconhecido" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "para acessar sua conta?" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "Aplicativos com acesso à sua conta podem:" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "Alterar suas informações" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "Autorização Finalizada" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +msgstr "Autorização Concluída" + +#: mediagoblin/templates/mediagoblin/api/oob.html:28 +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" @@ -538,19 +815,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Autenticação falhou" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Crie uma aqui!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Esqueceu sua senha?" @@ -559,7 +832,7 @@ msgstr "Esqueceu sua senha?" msgid "Create an account!" msgstr "Criar uma conta!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Criar" @@ -593,7 +866,7 @@ msgstr "Lançado sob a <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Olá, bem-vindo a este site MediaGoblin." @@ -603,23 +876,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Este site roda o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um programa excelente para hospedar, gerenciar e compartilhar mídia." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Para adicionar sua própria mídia, publicar comentários e mais outras coisas, você pode entrar com sua conta MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr " Ainda não tem uma conta? É facil!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "\n>Crie uma conta neste site</a>\nou" + +#: 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 "\n<a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Configure MediaGoblin em seu próprio servidor</a>" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -633,13 +911,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Anexos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Adicionar anexo" @@ -656,21 +934,28 @@ msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salvar mudanças" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "" +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 "" +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 @@ -699,14 +984,14 @@ 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:46 -msgid "Change your password." -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Deletar minha conta" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Email" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -718,6 +1003,36 @@ msgstr "Editando %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Editando perfil de %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "Olá,\n\nNós queríamos verificar que você é %(username)s. Se for esse o caso, então por favor clique no link abaixo para verificar seu novo endereço de email.\n\n%(verification_url)s\n\nSe você não for %(username)s ou se não fez um pedido de alteração do endereço de email, você pode ignorar\nesta mensagem." + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Novos comentários" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Marcar tudo como lido" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -728,8 +1043,7 @@ msgstr "Etiquetas desta mídia: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Baixar" @@ -753,7 +1067,7 @@ msgid "" msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Arquivo original" @@ -762,6 +1076,10 @@ msgstr "Arquivo original" msgid "WebM file (Vorbis codec)" msgstr "Arquivo WebM (codec Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Criado" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -773,47 +1091,39 @@ msgstr "Arquivo WebM (codec Vorbis)" msgid "Image for %(media_title)s" msgstr "Imagem para %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" -msgstr "" +msgstr "Arquivo PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Alternar Rotação" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspectiva" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Frente" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Cima" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Lado" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Baixar o modelo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Formato de Arquivo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Altura do Objeto" @@ -832,8 +1142,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "Arquivo WebM (640p, VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "Arquivo WebM (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -859,11 +1169,6 @@ msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Editar" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Apagar" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -918,28 +1223,21 @@ msgstr "Mídia de <a href=\"%(user_url)s\"> %(username)s </a> " msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Vendo mídia de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Adicionar um comentário" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Adicionar este comentário" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" +msgstr "Adicionado há" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 @@ -1049,7 +1347,7 @@ msgstr "(apagar)" #: mediagoblin/templates/mediagoblin/utils/collections.html:21 msgid "Collected in" -msgstr "" +msgstr "Colecionado em" #: mediagoblin/templates/mediagoblin/utils/collections.html:40 msgid "Add to a collection" @@ -1099,26 +1397,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:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oops" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Um erro ocorreu" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Operação não permitida" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1127,27 +1433,27 @@ msgstr "Parece que não há uma página com este endereço. Desculpe!</p><p>Se v #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "ano" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "mês" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "semana" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "dia" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "hora" #: mediagoblin/tools/timesince.py:67 msgid "minute" -msgstr "" +msgstr "minuto" #: mediagoblin/user_pages/forms.py:23 msgid "Comment" @@ -1155,10 +1461,9 @@ msgstr "Comentário" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Você pode usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para formatação." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "Você pode usar <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">Markdown</a> para formatação." #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1180,77 +1485,80 @@ msgstr "-- Selecionar --" msgid "Include a note" msgstr "Incluir uma nota" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "comentou na sua publicação" +#: 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 "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação de texto." -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." -msgstr "" +msgstr "Desculpe, os comentários estão desabilitados." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Ops, seu comentário estava vazio." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Seu comentário foi postado!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Por favor, verifique suas entradas e tente novamente." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Você deve selecionar ou adicionar uma coleção" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" já está na coleção \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" adicionado à coleção \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Você deletou a mídia." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Você deletou o item da coleção." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Você deletou a coleção \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 8cfdf339..32504b9a 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 af2d94d6..00edc228 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 20:40+0000\n" -"Last-Translator: George Pop <gapop@hotmail.com>\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" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,250 +20,280 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Nume de utilizator" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Parolă" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adresa de e-mail" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Numele de utilizator sau adresa de e-mail" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Numele de utilizator sau adresa de e-mail" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nume de utilizator sau adresă de e-mail nevalidă." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Această rubrică nu este pentru adrese de e-mail." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Această rubrică trebuie completată cu o adresă de e-mail." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Ne pare rău, există deja un utilizator cu același nume." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Adresa ta de e-mail a fost verificată. Poți să te autentifici, să îți completezi profilul și să trimiți imagini!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Cheie de verificare sau user ID incorect." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Trebuie să fii autentificat ca să știm cui să trimitem mesajul!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Adresa ta de e-mail a fost deja verificată!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "E-mail-ul de verificare a fost retrimis." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titlu" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Descrierea acestui fișier" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Cuvinte-cheie" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Desparte cuvintele-cheie prin virgulă." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Identificator" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Identificatorul nu poate să lipsească" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Partea corespunzătoare titlului din adresa acestui fișier media. De regulă poate fi lăsată nemodificată." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licența" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biografie" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Sit Web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Această adresă prezintă erori" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Trimite-mi un e-mail când alții comentează fișierele mele" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Licența preferată" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Trimite-mi un e-mail când alții comentează fișierele mele" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Titlul nu poate să fie gol" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Descriere pentru această colecție" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Vechea parolă" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Introdu vechea parolă pentru a demonstra că ești titularul acestui cont." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Noua parolă" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Parolă" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Există deja un entry cu același identificator pentru acest utilizator." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Ai anexat %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Nu poți modifica decât propriul tău profil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Editezi profilul unui utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Modificările profilului au fost salvate" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Setările pentru acest cont au fost salvate" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Trebuie să confirmi ștergerea contului tău." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ai deja o colecție numită \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "O colecție cu același slug există deja pentru acest utilizator." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Parolă incorectă" -#: mediagoblin/edit/views.py:363 +#: mediagoblin/edit/views.py:370 msgid "Your password was changed successfully" msgstr "Parola a fost schimbată cu succes" +#: 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 "Tema nu poate fi atașată... nu există o temă selectată\n" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "Lipsește cookie-ul CSRF. Probabil că blocați cookie-urile.<br/>Asigurați-vă că există permisiunea setării cookie-urilor pentru acest domeniu." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Scuze, nu recunosc acest tip de fișier :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "unoconv nu poate fi executat; verificați log-ul" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Transcodarea video a eșuat" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "a făcut un comentariu la postarea ta" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Nume de utilizator" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adresa de e-mail" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Numele de utilizator sau adresa de e-mail" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Locul" @@ -374,7 +447,7 @@ msgstr "URI-ul de redirectare pentru aplicații, această rubrică\n msgid "This field is required for public clients" msgstr "Această rubrică este obligatorie pentru clienții publici" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Clientul {0} a fost înregistrat!" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Adaugă" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Șterge" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Autentificare" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Autentificare eșuată!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Formatul fișierului nu corespunde cu tipul de media selectat." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fișier" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Trebuie să selectezi un fișier." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Ura! Trimis!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Colecția \"%s\" a fost creată!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "Ieșire" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Autentificare" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Modifică setările contului" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "Modifică setările contului" msgid "Media processing panel" msgstr "Panou de procesare media" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Ieșire" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Trimite fișier" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Creează colecție nouă" @@ -503,6 +726,59 @@ msgstr "Ultimele 10 upload-uri reușite" msgid "No processed entries, yet!" msgstr "Nu există încă niciun entry procesat!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Autentificare eșuată!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Creează-l aici!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Ai uitat parola?" @@ -556,7 +828,7 @@ msgstr "Ai uitat parola?" msgid "Create an account!" msgstr "Creează un cont!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Creează" @@ -590,7 +862,7 @@ msgstr "Publicat sub licența <a href=\"http://www.fsf.org/licensing/licenses/ag msgid "Explore" msgstr "Explorează" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Salut, bine ai venit pe acest site MediaGoblin!" @@ -600,23 +872,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Acest site folosește <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un software excepțional pentru găzduirea fișierelor media." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Pentru a adăuga fișierele tale și pentru a comenta te poți autentifica cu contul tău MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Încă nu ai unul? E simplu!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creați un cont pe acest site</a>\n sau\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instalați MediaGoblin pe serverul dvs.</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" +msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Anexe" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Atașează" @@ -653,22 +930,29 @@ msgstr "Anulare" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salvează modificările" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Se modifică parola pentru %(username)s" +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?" @@ -696,14 +980,14 @@ 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:46 -msgid "Change your password." -msgstr "Modifică parolă." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Șterge contul meu" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +999,36 @@ msgstr "Editare %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Editare profil %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "în urmă cu %(formatted_time)s" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Fișier etichetat cu cuvintele-cheie: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Download" @@ -750,7 +1063,7 @@ msgid "" msgstr "Poți lua un browser modern \n\tcapabil să redea această înregistrare de la <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Fișierul original" @@ -759,6 +1072,10 @@ msgstr "Fișierul original" msgid "WebM file (Vorbis codec)" msgstr "Fișier WebM (codec Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Creat" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "Fișier WebM (codec Vorbis)" msgid "Image for %(media_title)s" msgstr "Imagine pentru %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "Fișier PDF" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Rotire" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspectivă" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Din față" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "De sus" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Lateral" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Descarcă modelul" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Formatul fișierului" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Înălțimea obiectului" @@ -829,8 +1138,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "Fișier WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1165,6 @@ msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Editare" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Șterge" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "<p>❖ Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a></p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Adaugă un comentariu" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Trimite acest comentariu" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "în urmă cu %(formatted_time)s" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Adăugat" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Creat" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,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:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Hopa!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "S-a produs o eroare" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Operația nu este permisă" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1457,9 @@ msgstr "Comentariu" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Poți folosi <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pentru formatare." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1481,80 @@ msgstr "-- Selectează --" msgid "Include a note" msgstr "Adaugă o notiță" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "a făcut un comentariu la postarea ta" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Comentariile sunt dezactivate." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Verifică datele și încearcă din nou." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Trebuie să alegi sau să creezi o colecție" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" este deja în colecția \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" a fost adăugat la colecția \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Ai șters acest fișier" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Ai șters acest articol din colecție." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Ai șters colecția \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 ed28ff43..8c537cc3 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 d0ff7bdd..a1c0e1d8 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -5,13 +5,14 @@ # Translators: # aleksejrs <deletesoftware@yandex.ru>, 2013 # aleksejrs <deletesoftware@yandex.ru>, 2011-2012 +# Yury Sakarinen, 2013 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-01 21:08+0000\n" -"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\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" "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" @@ -20,250 +21,280 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Логин" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Пароль" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Адрес электронной почты" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Извините, на этом сайте регистрация запрещена." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -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." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Имя пользователя или адрес электронной почты" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." -msgstr "" +msgstr "Неправильное имя пользователя или адрес электронной почты." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Это поле не для адреса электронной почты." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Это поле — для адреса электронной почты." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Извините, на этом сайте регистрация запрещена." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Извините, пользователь с этим именем уже зарегистрирован." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "Сожалеем, но на этот адрес электронной почты уже зарегистрирована другая учётная запись." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Ваш адрес электронной почты потвержден. Вы теперь можете войти и начать редактировать свой профиль и загружать новые изображения!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Неверный ключ проверки или идентификатор пользователя" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Вам надо представиться, чтобы мы знали, кому отправлять сообщение!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Вы уже потвердили свой адрес электронной почты!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." -msgstr "Переслать сообщение с подтверждением аккаунта." +msgstr "Отправить заново запрос на подтверждение по е-мэйл." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "Не найдено никого с таким именем пользователя." -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "Вам отправлено электронное письмо с инструкциями по смене пароля." -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Название" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Описание этого произведения" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Метки" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "(через запятую)" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Отличительная часть адреса" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Отличительная часть адреса необходима" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Часть адреса этого файла, производная от его названия. Её обычно не требуется изменять." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Лицензия" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Биография" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Сайт" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Этот адрес содержит ошибки" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Уведомлять меня по e-mail о комментариях к моим файлам" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Предпочитаемая лицензия" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "Она будет лицензией по умолчанию для ваших загрузок" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Уведомлять меня по e-mail о комментариях к моим файлам" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Название не может быть пустым" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Описание этой коллекции" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Отличительная часть адреса этой коллекции, основанная на названии. Обычно не нужно её изменять." -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Старый пароль" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Введите свой старый пароль в качестве доказательства, что это ваша учётная запись." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Новый пароль" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "Новый адрес электронной почты" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Пароль" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "Введите свой пароль в качестве доказательства, что это ваша учётная запись." + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Вы добавили сопутствующий файл %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Вы можете редактировать только свой собственный профиль." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Вы редактируете профиль пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Изменения профиля сохранены" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Настройки учётной записи записаны" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Вам нужно подтвердить, что вы хотите удалить свою учётную запись." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "У вас уже есть коллекция с названием «%s»!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "У этого пользователя уже есть коллекция с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "Вы редактируете коллекцию другого пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Неправильный пароль" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -298,19 +329,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Увы, я не поддерживаю этот тип файлов :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Перекодировка видео не удалась" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "оставил комментарий к вашему файлу" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Имя пользователя" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Адрес электронной почты" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Имя пользователя или адрес электронной почты" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "На карте" @@ -322,15 +396,15 @@ msgstr "Посмотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>" #: mediagoblin/plugins/oauth/forms.py:29 msgid "Allow" -msgstr "" +msgstr "Разрешить" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Deny" -msgstr "" +msgstr "Запретить" #: mediagoblin/plugins/oauth/forms.py:34 msgid "Name" -msgstr "" +msgstr "Имя" #: mediagoblin/plugins/oauth/forms.py:35 msgid "The name of the OAuth client" @@ -374,7 +448,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Клиент {0} зарегистрирован!" @@ -387,59 +461,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Добавить" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "OpenID" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "Добавить 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 "Удалить 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 "Удалить" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Войти" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Авторизация неуспешна!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Неправильный формат файла." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Файл" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Вы должны загрузить файл." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Ура! Файл загружен!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Коллекция «%s» добавлена!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Подтвердите ваш адрес электронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "завершение сеанса" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Войти" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Изменить настройки учётной записи" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +671,16 @@ msgstr "Изменить настройки учётной записи" msgid "Media processing panel" msgstr "Панель обработки файлов" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Завершение сеанса" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Добавить файлы" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Создать новую коллекцию" @@ -503,6 +727,59 @@ msgstr "Последние 10 удавшихся загрузок" msgid "No processed entries, yet!" msgstr "Выполненных задач пока нет!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "Посмотреть личную информацию (напр. профиль, файлы и т.д.)" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,28 +812,24 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Авторизация неуспешна!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "Ещё нету аккаунта?" +msgstr "Нет аккаунта?" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Создайте здесь!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: 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!" -msgstr "Создать аккаунт!" +msgstr "Создайте аккаунт!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Создать" @@ -590,7 +863,7 @@ msgstr "Он опубликован на условиях <a href=\"http://www.f msgid "Explore" msgstr "Смотреть" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Привет! Добро пожаловать на наш MediaGoblin’овый сайт!" @@ -600,22 +873,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Этот сайт работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, необыкновенно замечательном ПО для хостинга мультимедийных файлов." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Для добавления собственных файлов, комментирования и т. п. вы можете представиться с помощью вашей MediaGoblin’овой учётной записи." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "У вас её ещё нет? Не проблема!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +908,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Сопутствующие файлы" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Добавить сопутствующий файл" @@ -653,22 +931,29 @@ msgstr "Отмена" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Сохранить изменения" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Смена пароля %(username)s" +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?" @@ -696,14 +981,14 @@ msgstr "Редактирование %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Настройка учётной записи %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "Сменить пароль" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Удалить мою учётную запись" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "Е-майл " + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +1000,36 @@ msgstr "Редактирование %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Редактирование профиля %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "Новые комментарии" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s назад" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "Отметить все, как прочтенные" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1040,7 @@ msgstr "Файлы с меткой: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Скачать" @@ -750,7 +1064,7 @@ msgid "" 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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Исходный файл" @@ -759,6 +1073,10 @@ msgstr "Исходный файл" msgid "WebM file (Vorbis codec)" msgstr "WebM‐файл (кодек — Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Создан" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1088,39 @@ msgstr "WebM‐файл (кодек — Vorbis)" msgid "Image for %(media_title)s" msgstr "Изображение «%(media_title)s»" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF-файл" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Перспектива" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Спереди" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Сверху" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Сбоку" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Скачать модель" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Формат файла" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Высота объекта" @@ -829,8 +1139,8 @@ msgid "" msgstr "Вы можете скачать современный браузер, способный воспроизводить это видео, с <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM-файл (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "WebM файл (VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1166,6 @@ msgstr "%(collection_title)s пользователя <a href=\"%(user_url)s\">% msgid "Edit" msgstr "Изменить" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Удалить" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1220,22 @@ msgstr "Файлы пользователя <a href=\"%(user_url)s\">%(username) msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Добавить комментарий" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Добавить этот комментарий" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s назад" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "Предварительный просмотр комментария" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Добавлен" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Создан" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -946,7 +1244,7 @@ msgstr "Добавление «%(media_title)s» в коллекцию" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" @@ -1096,26 +1394,34 @@ msgstr "Метки" msgid "Could not read the image file." msgstr "Не удалось прочитать файл с изображением." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Ой!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Произошла ошибка" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "Неверный запрос" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Операция не позволяется" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1124,23 +1430,23 @@ msgstr "" #: mediagoblin/tools/timesince.py:62 msgid "year" -msgstr "" +msgstr "год" #: mediagoblin/tools/timesince.py:63 msgid "month" -msgstr "" +msgstr "месяц" #: mediagoblin/tools/timesince.py:64 msgid "week" -msgstr "" +msgstr "неделя" #: mediagoblin/tools/timesince.py:65 msgid "day" -msgstr "" +msgstr "день" #: mediagoblin/tools/timesince.py:66 msgid "hour" -msgstr "" +msgstr "час" #: mediagoblin/tools/timesince.py:67 msgid "minute" @@ -1152,10 +1458,9 @@ msgstr "Комментировать" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Для разметки можете использовать язык <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1482,80 @@ msgstr "-- Выберите --" msgid "Include a note" msgstr "Примечание" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "оставил комментарий к вашему файлу" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Сожалеем: возможность комментирования отключена." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуст." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Пожалуйста, проверьте введённое и попробуйте ещё раз." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Необходимо выбрать или добавить коллекцию" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» — уже в коллекции «%s»" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» добавлено в коллекцию «%s»" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Вы удалили файл." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой." -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Вы на пороге удаления файла другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Вы исключили файл из коллекции." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "Файл не исключён из коллекции, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Вы на пороге исключения файла из коллекции другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Вы удалили коллекцию «%s»" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Коллекция не удалена, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 fd48a37f..de023128 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 e4d1bacc..fb5088c8 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# martin <zatroch.martin@gmail.com>, 2013 -# martin <zatroch.martin@gmail.com>, 2012-2013 +# martin, 2013 +# martin, 2012-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 -# martin <zatroch.martin@gmail.com>, 2011-2012 +# martin, 2011-2012 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-28 07:47+0000\n" -"Last-Translator: martin <zatroch.martin@gmail.com>\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" "Language-Team: Slovak (http://www.transifex.com/projects/p/mediagoblin/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,250 +24,280 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Používateľské meno" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Heslo" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Email adresse" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Prepáč, registrácia na danej inštancii nie je povolená." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Použivateľské meno alebo e-mail" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Používateľské meno alebo e-mailová adresa" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Nesprávne používateľské meno alebo e-mailová adresa." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Toto pole neakceptuje e-mailové adresy." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Toto pole vyžaduje e-mailovú adresu." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Prepáč, registrácia na danej inštancii nie je povolená." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Prepáč, rovnaké používateľské meno už existuje." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Tvoja e-mailová adresa bola overená. Teraz sa môžeš prihlásiť, upravovať profil a vkladať výtvory!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Overovací kľúč, prípadne používateľské meno je nesprávne." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Je potrebné prihlásiť sa, aby sme vedeli kam máme e-mail zaslať!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Už máš overenú e-mailovú adresu!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Opätovne zaslať overovací e-mail." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titulok" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Popis výtvoru" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Štítky" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Oddeľ štítky pomocou čiarky." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Unikátna časť adresy" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Unikátna časť adresy nesmie byť prázdna" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Titulná časť adresy daného média. Zmena poľa nepovinná." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Licencia" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Bio" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Webstránka" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Daná adresa obsahuje chybu" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Zašli mi e-mail keď ostatní okomentujú môj výtvor" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Preferencia licencie" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Zašli mi e-mail keď ostatní okomentujú môj výtvor" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Titulok nesmie byť prázdny." -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Popis danej kolekcie" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Staré heslo" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Vlož svoje staré heslo na dôkaz toho, že vlastníš daný účet." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Nové heslo" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Heslo" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Položku s rovnakou unikátnou časťou adresy už niekde máš." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Upravuješ výtvory iného používateľa. Pristupuj zodpovedne. " -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Príloha %s pridaná!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Môžeš upravovať iba svoj vlastný profil." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Upravuješ profil iného používateľa. Pristupuj zodpovedne. " -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Zmeny v profile uložené" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Nastavenia účtu uložené" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Potrebuješ potvrdiť odstránenie svojho účtu." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Už máš kolekciu nazvanú ako \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Kolekcia s týmto štítkom už máš." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Nesprávne heslo" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -302,19 +332,62 @@ msgid "" "domain." msgstr "CSRF \"cookie\" neprítomný. Toto vidíš najskôr ako výsledok blokovania \"cookie\" súborov a pod.<br/>Uisti sa, že máš povolené ukladanie \"cookies\" pre danú doménu." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Prepáč, nepodporujem tento typ súborov =(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "beh unoconv zlyhal, preskúmajte log záznam" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "Konvertovanie videa zlyhalo" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "okmentoval tvoj príspevok" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Používateľské meno" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Email adresse" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Použivateľské meno alebo e-mail" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Poloha" @@ -378,7 +451,7 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nje <strong>požadované</st msgid "This field is required for public clients" msgstr "Dané pole je požadované pre verejných klientov." -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Klient {0} bol registrovaný!" @@ -391,59 +464,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Pridať" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Odstrániť" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Prihlásiť sa" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Prihlásenie zlyhalo!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Nesprávny typ súboru pre dané médium." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Súbor" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Musíš poskytnúť súbor." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Skvelé! Pridané!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekcia \"%s\" pridaná!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Over si e-mailovú adresu!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "odhlásiť sa" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Prihlásiť sa" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Zmeniť nastavenia účtu" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -451,16 +674,16 @@ msgstr "Zmeniť nastavenia účtu" msgid "Media processing panel" msgstr "Sekcia spracovania výtvorov" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Odhlásiť sa" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Pridať výtvor" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Vytvoriť novú kolekciu" @@ -507,6 +730,59 @@ msgstr "Posledných 10 úspešných nahratí" msgid "No processed entries, yet!" msgstr "Zatiaľ žiadne spracované položky!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -539,19 +815,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Prihlásenie zlyhalo!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Vytvor si jeden tu!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Zabudnuté heslo?" @@ -560,7 +832,7 @@ msgstr "Zabudnuté heslo?" msgid "Create an account!" msgstr "Opret en konto!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Vytvoriť" @@ -594,7 +866,7 @@ msgstr "Uvoľnené pod <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Explore" msgstr "Preskúmať" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Ahoj, vitaj na tejto MediaGoblin stránke!" @@ -604,23 +876,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin</a>, výnimočne skvelý kus softvéru na hostovanie médií." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Pre pridanie vlastných výtvorov, komentárov a viac.. sa prihlás zo svojim MediaGoblin účtom." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Har du ikke en endnu? Det er let!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Vytvoriť účet na tejto stránke</a>\n alebo\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Nastaviť MediaGoblin na vlastnom serveri</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" +msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -634,13 +911,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Prílohy" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Pridať prílohu" @@ -657,22 +934,29 @@ msgstr "Zrušiť" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Uložiť zmeny" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "Mením heslo používateľa %(username)s" +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" + #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 #, python-format msgid "Really delete user '%(user_name)s' and all related media/comments?" @@ -700,14 +984,14 @@ 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:46 -msgid "Change your password." -msgstr "Zmeniť svoje heslo." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Odstrániť môj účet" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -719,6 +1003,36 @@ msgstr "Úprava %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Úprava profilu, ktorý vlastní %(username)s " +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, 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 "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -729,8 +1043,7 @@ msgstr "Výtvory označené ako: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Stiahnuť" @@ -754,7 +1067,7 @@ msgid "" msgstr "Môžeš získať moderný prehliadač, ktorý\n\ttento zvuk hravo prehrá <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Originálny súbor" @@ -763,6 +1076,10 @@ msgstr "Originálny súbor" msgid "WebM file (Vorbis codec)" msgstr "WebM súbor (Vorbis kodek)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Vytvorené" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -774,47 +1091,39 @@ msgstr "WebM súbor (Vorbis kodek)" msgid "Image for %(media_title)s" msgstr "Obrázok pre %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF súbor" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Zapnúť rotáciu" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspektíva" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Čelo" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Vrch" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Strana" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Stiahnuť model" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Súborový formát" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Výška objektu" @@ -833,8 +1142,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM súbor (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -860,11 +1169,6 @@ msgstr "%(collection_title)s od <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Upraviť" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Odstrániť" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -919,29 +1223,22 @@ msgstr "Výtvory, ktoré vlastní <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Prehliadanie výtvorov od <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Pridať komentár" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Pridať tento komentár" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "pred %(formatted_time)s " +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Pridané" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Vytvorené" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1100,26 +1397,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:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Hopla!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Vyskytla sa chyba" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Nepovolená operácia" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1156,10 +1461,9 @@ msgstr "Komentár" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Môžeš využiť <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pre formátovanie príspevku." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1181,77 +1485,80 @@ msgstr "-- Vybrať --" msgid "Include a note" msgstr "Pridať poznámku" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "okmentoval tvoj príspevok" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Prepáč, komentovanie je vypnuté." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Hopla, tvoj komentár bol prázdny." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol pridaný!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Prosím skontroluj svoje položky a skús znova." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Musíš vybrať, prípadne pridať kolekciu" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" sa už nachádza v kolekcii \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s pridané do kolekcie \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "Položka bola z kolekcie odstránená." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Kolekcia \"%s\" bola úspešne odstránená." -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 199e761c..113553fb 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 35635acf..1ad70dc0 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Slovenian (http://www.transifex.com/projects/p/mediagoblin/language/sl/)\n" "MIME-Version: 1.0\n" @@ -19,250 +19,280 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Uporabniško ime" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Geslo" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "E-poštni naslov" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Oprostite, prijava za ta izvod ni omogočena." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Oprostite, prijava za ta izvod ni omogočena." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Oprostite, uporabnik s tem imenom že obstaja." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj profil in pošljete slike." -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Potrditveni ključ ali uporabniška identifikacija je napačna" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Ponovno pošiljanje potrditvene e-pošte." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Naslov" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Oznake" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Oznaka" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Oznaka ne sme biti prazna" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Biografija" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Spletna stran" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Geslo" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Vnos s to oznako za tega uporabnika že obstaja." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Urejate uporabniški profil. Nadaljujte pazljivo." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -297,19 +327,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Uporabniško ime" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "E-poštni naslov" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -373,7 +446,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -386,59 +459,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Prijava" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Prijava ni uspela." + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napačna datoteka." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Datoteka" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Podati morate datoteko." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Juhej! Poslano." -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Prijava" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -446,16 +669,16 @@ msgstr "" msgid "Media processing panel" msgstr "Podokno obdelovanja vsebine" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Dodaj vsebino" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -502,6 +725,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -534,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "Prijava ni uspela." - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Ustvarite si ga." -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -555,7 +827,7 @@ msgstr "" msgid "Create an account!" msgstr "Ustvarite račun." -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Ustvari" @@ -589,7 +861,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -599,22 +871,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -652,22 +929,29 @@ msgstr "Prekliči" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Shrani spremembe" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -695,12 +979,12 @@ msgstr "Urejanje %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -714,6 +998,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "Urejanje profila – %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -724,8 +1038,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -749,7 +1062,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -758,6 +1071,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -769,47 +1086,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -828,7 +1137,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -855,11 +1164,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,29 +1218,22 @@ msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1095,26 +1392,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Opa!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1151,9 +1456,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1176,77 +1480,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 0f113dcb..d7fc5203 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 aabf18db..f20af6cf 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -20,250 +20,280 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Emër përdoruesi" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Fjalëkalim" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Adresë email" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Emër përdoruesi ose email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "Emër përdoruesi ose adresë email e pavlefshme." -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "Kjo fushë nuk është për adresa email." -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "Kjo fushë lyp një adresë email." -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Na njdeni, regjistrimi në këtë instancë të shërbimit është i çaktivizuar." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Na ndjeni, ka tashmë një përdorues me këtë emër." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Adresa juaj email u verifikua. Tani mund të bëni hyrjen, të përpunoni profilin tuaj, dhe të parashtroni figura!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Kyçi i verifikimit ose id-ja e përdoruesit është e pasaktë" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Duhet të jeni i futur, që ta dimë kujt t'ia çojmë email-in!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Thuajse e keni verifikuar adresën tuaj email!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Ridërgoni email-in tuaj të verifikimit." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: 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:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titull" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Përshkrim i kësaj pune" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiketa" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Ndajini etiketat me presje." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Identifikues" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Identifikuesi s'mund të jetë i zbrazët" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "Titulli i adresës së kësaj medie. Zakonisht nuk keni nevojë ta ndryshoni këtë." -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "Leje" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Jetëshkrim" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Site Web" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "Kjo adresë përmban gabime" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Dërgomë email kur të tjerët komentojnë te media ime" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "Parapëlqime licence" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 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:71 -msgid "Email me when others comment on my media" -msgstr "Dërgomë email kur të tjerët komentojnë te media ime" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "Titulli s'mund të jetë i zbrazët" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "Përshkrim i këtij koleksioni" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 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:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Fjalëkalimi i vjetër" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari e zotëroni ju." -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Fjalëkalimi i ri" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Fjalëkalim" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Ka tashmë një zë me atë identifikues për këtë përdorues." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "Shtuat bashkangjitjen %s!" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "Mund të përpunoni vetëm profilin tuaj." -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Po përpunoni profilin e një përdoruesi. Hapni sytë." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Ndryshimet e profilit u ruajtën" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Rregullimet e llogarisë u ruajtën" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "Lypset të ripohoni fshirjen e llogarisë suaj." -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Keni tashmë një koleksion të quajtur \"%s\"!" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "Ka tashmë një koleksion me atë identifikues për këtë përdorues." -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 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:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Fjalëkalim i gabuar" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "Pa cookie CSRF të pranishme. Ka shumë të ngjarë që të jetë punë e një bllokuesi cookie-sh ose të tillë.<br/>Sigurohuni që të lejoni depozitim cookie-sh për këtë përkatësi." -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: 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 +msgid "commented on your post" +msgstr "komentoi te postimi juaj" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Emër përdoruesi" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Adresë email" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "Vend" @@ -374,7 +447,7 @@ msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është <strong>e msgid "This field is required for public clients" msgstr "Kjo fushë është e domosdoshme për klientë publikë" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "Klienti {0} u regjistrua!" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Shtoni" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Fshije" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Hyni" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Hyrja dështoi!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Kartelë" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Duhet të jepni një kartelë." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Yhaaaaaa! U parashtrua!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "U shtua koleksioni \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "dilni" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Hyni" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Ndryshoni rregullime llogarie" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "Ndryshoni rregullime llogarie" msgid "Media processing panel" msgstr "Paneli i përpunimit të medias" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Dilni" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Shtoni media" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "Krijoni koleksion të ri" @@ -503,6 +726,59 @@ msgstr "10 ngarkimet e fundit të suksesshme" msgid "No processed entries, yet!" msgstr "Ende pa zëra të përpunuar!" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Hyrja dështoi!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Krijoni një këtu!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Harruat fjalëkalimin tuaj?" @@ -556,7 +828,7 @@ msgstr "Harruat fjalëkalimin tuaj?" msgid "Create an account!" msgstr "Krijoni një llogari!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Krijoje" @@ -590,7 +862,7 @@ msgstr "Hedhur në qarkullim sipas <a href=\"http://www.fsf.org/licensing/licens msgid "Explore" msgstr "Eksploroni" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!" @@ -600,22 +872,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "Ky site përdor <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një program jashtëzakonisht i shkëlqyer për strehim mediash." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Për të shtuar media tuajën, për të bërë komente, dhe të tjera, mund të hyni përmes llogarisë suaj MediaGoblin." -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Nuk keni ende një të tillë? Është e lehtë!" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "Bashkangjitje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "Shtoni bashkangjitje" @@ -653,22 +930,29 @@ msgstr "Anuloje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Ruaji ndryshimet" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -696,14 +980,14 @@ msgstr "Po përpunohet %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Po ndryshohen rregullimet e llogarisë %(username)s" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Fshije llogarinë time" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -715,6 +999,36 @@ msgstr "Po përpunohet %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "Po përpunohet profili i %(username)s" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Media e etiketuar me:: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "Shkarkojeni" @@ -750,7 +1063,7 @@ msgid "" msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni te <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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Kartela origjinale" @@ -759,6 +1072,10 @@ msgstr "Kartela origjinale" msgid "WebM file (Vorbis codec)" msgstr "Kartelë WebM (kodek Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "Kartelë WebM (kodek Vorbis)" msgid "Image for %(media_title)s" msgstr "Figurë për %(media_title)s" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "Aktivizoni/Çaktivizoni Rrotullimin" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "Perspektivë" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "Ball" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "Krye" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "Anë" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "Shkarkojeni modelin" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Format Kartele" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "Lartësi Objekti" @@ -829,8 +1138,8 @@ msgid "" 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 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "Kartelë WebM (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -856,11 +1165,6 @@ msgstr "%(collection_title)s nga <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "Përpunoni" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Fshije" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "Media nga <a href=\"%(user_url)s\">%(username)s</a>" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Po shfletoni media nga <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Shtoni një koment" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Shtoje këtë koment" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "Etiketuar me" msgid "Could not read the image file." msgstr "Nuk lexoi dot kartelën e figurës." -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Oooh!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "Ndodhi një gabim" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "Veprim i palejuar" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,10 +1457,9 @@ msgstr "Koment" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Për formatime mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1177,77 +1481,80 @@ msgstr "-- Përzgjidhni --" msgid "Include a note" msgstr "Përfshini një shënim" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "komentoi te postimi juaj" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Hmmm, komenti juaj qe i zbrazët." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni." -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "Duhet të përzgjidhni ose shtoni një koleksion" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" u shtua te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "E fshitë median." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "E fshitë objektin prej koleksionit." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 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:382 +#: mediagoblin/user_pages/views.py:407 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:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%s\"" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 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:430 +#: mediagoblin/user_pages/views.py:455 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 5564d35d..b7cd984e 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 fcf8a666..1cb6b7ae 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,250 +18,280 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -296,19 +326,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -372,7 +445,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -385,59 +458,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -445,16 +668,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -501,6 +724,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -533,19 +809,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -554,7 +826,7 @@ msgstr "" msgid "Create an account!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -588,7 +860,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -598,22 +870,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -628,13 +905,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -651,22 +928,29 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -694,12 +978,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -713,6 +997,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -723,8 +1037,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -748,7 +1061,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -757,6 +1070,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -768,47 +1085,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -827,7 +1136,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -854,11 +1163,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -913,29 +1217,22 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1094,26 +1391,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1150,9 +1455,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1175,77 +1479,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 3b961e60..3fec1005 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 659de21b..ac9302be 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,250 +20,280 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Användarnamn" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Lösenord" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "E-postadress" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Vi beklagar, registreringen är avtängd på den här instansen." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Vi beklagar, registreringen är avtängd på den här instansen." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och ladda upp filer!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Verifieringsnyckeln eller användar-IDt är fel." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig." -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Du har redan verifierat din e-postadress!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Skickade ett nytt verifierings-email." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Titel" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "Beskrivning av verket" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Taggar" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "Sökvägsnamn" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "Sökvägsnamnet kan inte vara tomt" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "Presentation" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Hemsida" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Tidigare lösenord" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Lösenord" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "Ett inlägg med det sökvägsnamnet existerar redan." -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Var försiktig, du redigerar någon annans inlägg." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Var försiktig, du redigerar en annan användares profil." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Fel lösenord" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -298,19 +328,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Användarnamn" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "E-postadress" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -374,7 +447,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -387,59 +460,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Logga in" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Inloggning misslyckades!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Du måste ange en fil" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Tjohoo! Upladdat!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Logga in" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -447,16 +670,16 @@ msgstr "" msgid "Media processing panel" msgstr "Mediabehandlingspanel" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Lägg till media" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -503,6 +726,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -535,19 +811,15 @@ msgid "" "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:39 -msgid "Logging in failed!" -msgstr "Inloggning misslyckades!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Skapa ett här!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Glömt ditt lösenord?" @@ -556,7 +828,7 @@ msgstr "Glömt ditt lösenord?" msgid "Create an account!" msgstr "Skapa ett konto!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Skapa" @@ -590,7 +862,7 @@ msgstr "" msgid "Explore" msgstr "Utforska" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hej, välkommen till den här MediaGoblin-sidan!" @@ -600,22 +872,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "Har du inte ett redan?" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -630,13 +907,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -653,22 +930,29 @@ msgstr "Avbryt" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Spara ändringar" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -696,12 +980,12 @@ msgstr "Redigerar %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -715,6 +999,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "Redigerar %(username)ss profil" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -725,8 +1039,7 @@ msgstr "Media taggat med: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -750,7 +1063,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -759,6 +1072,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -770,47 +1087,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -829,7 +1138,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -856,11 +1165,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,29 +1219,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1096,26 +1393,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Ojoj!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1152,9 +1457,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1177,77 +1481,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 6e7ebd21..791028e4 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 b0bf1aa1..682d12f9 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: -# వీవెన్ <veeven@gmail.com>, 2011 +# వీవెన్ వీరపనేని <veeven@gmail.com>, 2011 msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Telugu (http://www.transifex.com/projects/p/mediagoblin/language/te/)\n" "MIME-Version: 1.0\n" @@ -19,250 +19,280 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "వాడుకరి పేరు" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "సంకేతపదం" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "ఈమెయిలు చిరునామా" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "శీర్షిక" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "సంకేతపదం" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -297,19 +327,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "వాడుకరి పేరు" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "ఈమెయిలు చిరునామా" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -373,7 +446,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -386,59 +459,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "ప్రవేశం విఫలమయ్యింది!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -446,16 +669,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -502,6 +725,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -534,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "ప్రవేశం విఫలమయ్యింది!" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "మీకు ఇంకా ఖాతా లేదా?" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "మీ సంకేతపదాన్ని మర్చిపోయారా?" @@ -555,7 +827,7 @@ msgstr "మీ సంకేతపదాన్ని మర్చిపోయా msgid "Create an account!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -589,7 +861,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -599,22 +871,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -652,22 +929,29 @@ msgstr "రద్దుచేయి" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "మార్పులను భద్రపరచు" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -695,12 +979,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -714,6 +998,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -724,8 +1038,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -749,7 +1062,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -758,6 +1071,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -769,47 +1086,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -828,7 +1137,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -855,11 +1164,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,29 +1218,22 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1095,26 +1392,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1151,9 +1456,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1176,77 +1480,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 4341870b..589333e7 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 4155520f..0084cf03 100644 --- a/mediagoblin/i18n/tr_TR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/tr_TR/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-06 15:44+0000\n" -"Last-Translator: Caner BAŞARAN <basaran.caner@gmail.com>\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" "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mediagoblin/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,250 +19,280 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "Kullanıcı adı" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "Parola" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "E-posta adresi" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "Üzgünüz, bu durumda kayıt devre dışıdır." -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "Kullanıcı adı veya E-posta" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "Kullanıcı adı ya da e-posta" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "Üzgünüz, bu durumda kayıt devre dışıdır." - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "Maalesef, bu isimde bir kullanıcı mevcut." -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 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:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "E-posta adresiniz doğrulandı. Şimdi giriş yapabilir, profilinizi düzenleyip ve yeni görüntüleri gönderebilirsiniz!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "Doğrulama anahtarı veya kullanıcı kimliği yanlış" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "Zaten e-posta adresinizi doğruladınız!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "Doğrulama e-postasını tekrar yolla." -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: 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:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "Başlık" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "Etiketler" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "Etikerleri virgül ile ayırın." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "Web sitesi" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "Medyama birisi yorum yazdığında bana e-posta at" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "Medyama birisi yorum yazdığında bana e-posta at" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "Eski parola" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "Yeni parola" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "Parola" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "Başka bir kullanıcının medyasını düzenlerken dikkatli davranın." -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "Başka bir kullanıcının profilini düzenlerken dikkatli davranın." -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "Profil değişiklikleri kaydedildi" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "Hesap ayarları kaydedildi" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "Yanlış parola" -#: mediagoblin/edit/views.py:363 +#: 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 +msgid "Your email address has been verified." +msgstr "" + #: mediagoblin/gmg_commands/assetlink.py:60 msgid "Cannot link theme... no theme set\n" msgstr "" @@ -297,19 +327,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "Üzgünüz, bu tip dosyaları desteklemiyoruz :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "Kullanıcı adı" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "E-posta adresi" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "Kullanıcı adı veya E-posta" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -373,7 +446,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -386,76 +459,226 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "Ekle" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "Si" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "Giriş" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "Giriş başarısız!" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "Bu medya türü için geçersiz dosya türü." +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "Dosya" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "Bir dosya sağlamanız gerekir." -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "Hoooop! Gönderildi!" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "E-postanızı doğrulayın!" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "çıkış" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "Giriş" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "Hesap ayarlarını değiştir" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26 msgid "Media processing panel" -msgstr "Madya işlem paneli" +msgstr "Medya işlem paneli" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "Çıkış" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Medya ekle" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -502,6 +725,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -534,19 +810,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "Giriş başarısız!" - #: 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:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "Şimdi oluşturun!" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "Parolanı mı unuttun?" @@ -555,7 +827,7 @@ msgstr "Parolanı mı unuttun?" msgid "Create an account!" msgstr "Hesap oluştur!" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "Oluştur" @@ -589,7 +861,7 @@ msgstr "" msgid "Explore" msgstr "Keşfet" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -599,22 +871,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:41 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" <a class=\"button_action\" href=\"http://mediagoblin.readthedocs.org/\">Set up MediaGoblin on your own server</a>" msgstr "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -629,13 +906,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -652,22 +929,29 @@ msgstr "İptal" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Değişiklikleri kaydet" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -695,14 +979,14 @@ msgstr "%(media_title)s düzenleme" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "Parolanızı değiştirin." - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "Hesabımı sil" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -714,6 +998,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "%(username)s profilini düzenleme" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s önce" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -724,8 +1038,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "İndir" @@ -749,7 +1062,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "Özgün dosya" @@ -758,6 +1071,10 @@ msgstr "Özgün dosya" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "Oluşturuldu" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -769,47 +1086,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF dosya" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "Dosya Biçimi" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -828,7 +1137,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -855,11 +1164,6 @@ msgstr "" msgid "Edit" msgstr "Düzenle" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "Si" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,29 +1218,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> medyası" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "Bir yorum ekle" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "Bu yorumu ekle" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s önce" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "Eklendi" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "Oluşturuldu" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1095,26 +1392,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "Amaninnn boo!" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1151,9 +1456,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1176,77 +1480,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "Maalesef, yorum devre dışı." -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "Amaninnn boo, yorumunuz boştu." -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "Yorumunuz gönderildi!" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "Medyayı sildiniz." -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 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:296 +#: mediagoblin/user_pages/views.py:321 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:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 differnew file mode 100644 index 00000000..282a8095 --- /dev/null +++ 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 new file mode 100644 index 00000000..bfbdcd64 --- /dev/null +++ b/mediagoblin/i18n/vi/LC_MESSAGES/mediagoblin.po @@ -0,0 +1,1558 @@ +# Translations template for PROJECT. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: GNU MediaGoblin\n" +"Report-Msgid-Bugs-To: http://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" +"Language-Team: Vietnamese (http://www.transifex.com/projects/p/mediagoblin/language/vi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: vi\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: mediagoblin/decorators.py:252 +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." +msgstr "" + +#: mediagoblin/auth/forms.py:25 +msgid "Username or email" +msgstr "" + +#: mediagoblin/auth/tools.py:41 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/tools.py:42 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/tools.py:43 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/tools.py:146 +msgid "Sorry, a user with that name already exists." +msgstr "" + +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +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 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "" + +#: mediagoblin/auth/views.py:167 +msgid "The verification key or user id is incorrect" +msgstr "" + +#: mediagoblin/auth/views.py:185 +msgid "You must be logged in so we know who to send the email to!" +msgstr "" + +#: mediagoblin/auth/views.py:193 +msgid "You've already verified your email address!" +msgstr "" + +#: mediagoblin/auth/views.py:203 +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/user_pages/forms.py:45 +msgid "Title" +msgstr "" + +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +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 +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 +msgid "Tags" +msgstr "" + +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +msgid "Separate tags by commas." +msgstr "" + +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +msgid "Slug" +msgstr "" + +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +msgid "The slug can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:42 +msgid "" +"The title part of this media's address. You usually don't need to change " +"this." +msgstr "" + +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/templates/mediagoblin/utils/license.html:20 +msgid "License" +msgstr "" + +#: mediagoblin/edit/forms.py:52 +msgid "Bio" +msgstr "" + +#: mediagoblin/edit/forms.py:58 +msgid "Website" +msgstr "" + +#: mediagoblin/edit/forms.py:60 +msgid "This address contains errors" +msgstr "" + +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:87 +msgid "The title can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/user_pages/forms.py:48 +msgid "Description of this collection" +msgstr "" + +#: mediagoblin/edit/forms.py:96 +msgid "" +"The title part of this collection's address. You usually don't need to " +"change this." +msgstr "" + +#: mediagoblin/edit/forms.py:103 +msgid "Old password" +msgstr "" + +#: mediagoblin/edit/forms.py:105 +msgid "Enter your old password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/forms.py:108 +msgid "New password" +msgstr "" + +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 +msgid "An entry with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:91 +msgid "You are editing another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:161 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:188 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:194 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:210 +msgid "Profile changes saved" +msgstr "" + +#: mediagoblin/edit/views.py:243 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:277 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 +#, python-format +msgid "You already have a collection called \"%s\"!" +msgstr "" + +#: mediagoblin/edit/views.py:317 +msgid "A collection with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:332 +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 +msgid "Your email address has been verified." +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:60 +msgid "Cannot link theme... no theme set\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:73 +msgid "No asset directory for this theme\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:76 +msgid "However, old link directory symlink found; removed.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:112 +#, python-format +msgid "Could not link \"%s\": %s exists and is not a symlink\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:119 +#, python-format +msgid "Skipping \"%s\"; already set up.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:124 +#, python-format +msgid "Old link found for \"%s\"; removing.\n" +msgstr "" + +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.<br/>Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 +msgid "Sorry, I don't support that file type :(" +msgstr "" + +#: mediagoblin/media_types/pdf/processing.py:142 +msgid "unoconv failing to run, check log file" +msgstr "" + +#: mediagoblin/media_types/video/processing.py:44 +msgid "Video transcoding failed" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:29 +msgid "Allow" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:30 +msgid "Deny" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:34 +msgid "Name" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:35 +msgid "The name of the OAuth client" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:36 +msgid "Description" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:38 +msgid "" +"This will be visible to users allowing your\n" +" application to authenticate as them." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:40 +msgid "Type" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:45 +msgid "" +"<strong>Confidential</strong> - The client can\n" +" make requests to the GNU MediaGoblin instance that can not be\n" +" intercepted by the user agent (e.g. server-side client).<br />\n" +" <strong>Public</strong> - The client can't make confidential\n" +" requests to the GNU MediaGoblin instance (e.g. client-side\n" +" JavaScript client)." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:52 +msgid "Redirect URI" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:54 +msgid "" +"The redirect URI for the applications, this field\n" +" is <strong>required</strong> for public clients." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:66 +msgid "This field is required for public clients" +msgstr "" + +#: mediagoblin/plugins/oauth/views.py:55 +msgid "The client {0} has been registered!" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +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/user_pages/media_collect.html:68 +msgid "Add" +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 +msgid "Invalid file given for media type." +msgstr "" + +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + +#: mediagoblin/submit/forms.py:26 +msgid "File" +msgstr "" + +#: mediagoblin/submit/views.py:52 +msgid "You must provide a file." +msgstr "" + +#: mediagoblin/submit/views.py:101 +msgid "Woohoo! Submitted!" +msgstr "" + +#: mediagoblin/submit/views.py:154 +#, python-format +msgid "Collection \"%s\" added!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "Verify your email!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:105 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:112 +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/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 +msgid "Log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:128 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:131 +#: 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:" +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 "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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 "" + +#: 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!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/auth/register.html:41 +msgid "Create" +msgstr "" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 +#, python-format +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 "" + +#: 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/templates/mediagoblin/bits/frontpage_welcome.html:24 +msgid "" +"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " +"extraordinarily great piece of media hosting software." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 +msgid "" +"To add your own media, place comments, and more, you can log in with your " +"MediaGoblin account." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 +msgid "Don't have one yet? It's easy!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:23 +#: mediagoblin/templates/mediagoblin/edit/attachments.html:35 +#, python-format +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 +msgid "Attachments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +msgid "Add attachment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:61 +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42 +#: mediagoblin/templates/mediagoblin/edit/edit.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 +msgid "Cancel" +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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 +msgid "Save changes" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 +#, python-format +msgid "Really delete user '%(user_name)s' and all related media/comments?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit.html:35 +#, python-format +msgid "Editing %(media_title)s" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 +#, python-format +msgid "Editing %(collection_title)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + +#: mediagoblin/templates/mediagoblin/listings/collection.html:30 +#: mediagoblin/templates/mediagoblin/listings/collection.html:35 +#: mediagoblin/templates/mediagoblin/listings/tag.html:30 +#: mediagoblin/templates/mediagoblin/listings/tag.html:35 +#, python-format +msgid "Media tagged with: %(tag_name)s" +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 +msgid "Download" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 +msgid "Original" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44 +msgid "" +"Sorry, this audio will not work because \n" +"\tyour web browser does not support HTML5 \n" +"\taudio." +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +msgid "Original file" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 +msgid "WebM file (Vorbis codec)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:65 +#, python-format +msgid "Image for %(media_title)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 +msgid "PDF file" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 +msgid "File Format" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 +msgid "Object Height" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +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 +msgid "WebM file (VP8/Vorbis)" +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 +msgid "Add your media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 +#, python-format +msgid "%(collection_title)s (%(username)s's collection)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 +#, python-format +msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 +msgid "Edit" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 +#, python-format +msgid "Really remove %(media_title)s from %(collection_title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +msgid "Remove" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 +#, python-format +msgid "%(username)s's media" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 +#, python-format +msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 +msgid "Add a comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 +msgid "Add this comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +msgid "Added" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 +#, python-format +msgid "Add “%(media_title)s” to a collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 +msgid "Add a new collection" +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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 +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." +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." +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 "" + +#: 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/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 +#, 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/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 "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:40 +msgid "Add to a collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 +msgid "feed icon" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 +msgid "Atom feed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/license.html:25 +msgid "All rights reserved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:39 +msgid "← Newer" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:45 +msgid "Older →" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:48 +msgid "Go to page:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 +msgid "newer" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 +msgid "older" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/tags.html:20 +msgid "Tagged with" +msgstr "" + +#: mediagoblin/tools/exif.py:83 +msgid "Could not read the image file." +msgstr "" + +#: mediagoblin/tools/response.py:36 +msgid "Oops!" +msgstr "" + +#: mediagoblin/tools/response.py:37 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:61 +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 +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 "" + +#: mediagoblin/tools/timesince.py:62 +msgid "year" +msgstr "" + +#: mediagoblin/tools/timesince.py:63 +msgid "month" +msgstr "" + +#: mediagoblin/tools/timesince.py:64 +msgid "week" +msgstr "" + +#: mediagoblin/tools/timesince.py:65 +msgid "day" +msgstr "" + +#: mediagoblin/tools/timesince.py:66 +msgid "hour" +msgstr "" + +#: mediagoblin/tools/timesince.py:67 +msgid "minute" +msgstr "" + +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: 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 "" + +#: mediagoblin/user_pages/forms.py:31 +msgid "I am sure I want to delete this" +msgstr "" + +#: mediagoblin/user_pages/forms.py:35 +msgid "I am sure I want to remove this item from the collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 +msgid "-- Select --" +msgstr "" + +#: mediagoblin/user_pages/forms.py:42 +msgid "Include a note" +msgstr "" + +#: 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 "" + +#: mediagoblin/user_pages/views.py:179 +msgid "Sorry, comments are disabled." +msgstr "" + +#: mediagoblin/user_pages/views.py:184 +msgid "Oops, your comment was empty." +msgstr "" + +#: mediagoblin/user_pages/views.py:190 +msgid "Your comment has been posted!" +msgstr "" + +#: mediagoblin/user_pages/views.py:225 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:265 +msgid "You have to select or add a collection" +msgstr "" + +#: mediagoblin/user_pages/views.py:276 +#, python-format +msgid "\"%s\" already in collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:282 +#, python-format +msgid "\"%s\" added to collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:302 +msgid "You deleted the media." +msgstr "" + +#: mediagoblin/user_pages/views.py:314 +msgid "The media was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:321 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:395 +msgid "You deleted the item from the collection." +msgstr "" + +#: mediagoblin/user_pages/views.py:399 +msgid "The item was not removed because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:407 +msgid "" +"You are about to delete an item from another user's collection. Proceed with" +" caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:440 +#, python-format +msgid "You deleted the collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:447 +msgid "" +"The collection was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:455 +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 differnew file mode 100644 index 00000000..dfd0a5af --- /dev/null +++ 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 new file mode 100644 index 00000000..3c94d3f5 --- /dev/null +++ b/mediagoblin/i18n/vi_VN/LC_MESSAGES/mediagoblin.po @@ -0,0 +1,1558 @@ +# Translations template for PROJECT. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: GNU MediaGoblin\n" +"Report-Msgid-Bugs-To: http://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" +"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/mediagoblin/language/vi_VN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: vi_VN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: mediagoblin/decorators.py:252 +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." +msgstr "" + +#: mediagoblin/auth/forms.py:25 +msgid "Username or email" +msgstr "" + +#: mediagoblin/auth/tools.py:41 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/tools.py:42 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/tools.py:43 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/tools.py:146 +msgid "Sorry, a user with that name already exists." +msgstr "" + +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 +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 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 +msgid "" +"Your email address has been verified. You may now login, edit your profile, " +"and submit images!" +msgstr "" + +#: mediagoblin/auth/views.py:167 +msgid "The verification key or user id is incorrect" +msgstr "" + +#: mediagoblin/auth/views.py:185 +msgid "You must be logged in so we know who to send the email to!" +msgstr "" + +#: mediagoblin/auth/views.py:193 +msgid "You've already verified your email address!" +msgstr "" + +#: mediagoblin/auth/views.py:203 +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/user_pages/forms.py:45 +msgid "Title" +msgstr "" + +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 +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 +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 +msgid "Tags" +msgstr "" + +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 +msgid "Separate tags by commas." +msgstr "" + +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 +msgid "Slug" +msgstr "" + +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 +msgid "The slug can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:42 +msgid "" +"The title part of this media's address. You usually don't need to change " +"this." +msgstr "" + +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 +#: mediagoblin/templates/mediagoblin/utils/license.html:20 +msgid "License" +msgstr "" + +#: mediagoblin/edit/forms.py:52 +msgid "Bio" +msgstr "" + +#: mediagoblin/edit/forms.py:58 +msgid "Website" +msgstr "" + +#: mediagoblin/edit/forms.py:60 +msgid "This address contains errors" +msgstr "" + +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:87 +msgid "The title can't be empty" +msgstr "" + +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 +#: mediagoblin/user_pages/forms.py:48 +msgid "Description of this collection" +msgstr "" + +#: mediagoblin/edit/forms.py:96 +msgid "" +"The title part of this collection's address. You usually don't need to " +"change this." +msgstr "" + +#: mediagoblin/edit/forms.py:103 +msgid "Old password" +msgstr "" + +#: mediagoblin/edit/forms.py:105 +msgid "Enter your old password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/forms.py:108 +msgid "New password" +msgstr "" + +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 +msgid "An entry with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:91 +msgid "You are editing another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:161 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:188 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:194 +msgid "You are editing a user's profile. Proceed with caution." +msgstr "" + +#: mediagoblin/edit/views.py:210 +msgid "Profile changes saved" +msgstr "" + +#: mediagoblin/edit/views.py:243 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:277 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 +#, python-format +msgid "You already have a collection called \"%s\"!" +msgstr "" + +#: mediagoblin/edit/views.py:317 +msgid "A collection with that slug already exists for this user." +msgstr "" + +#: mediagoblin/edit/views.py:332 +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 +msgid "Your email address has been verified." +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:60 +msgid "Cannot link theme... no theme set\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:73 +msgid "No asset directory for this theme\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:76 +msgid "However, old link directory symlink found; removed.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:112 +#, python-format +msgid "Could not link \"%s\": %s exists and is not a symlink\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:119 +#, python-format +msgid "Skipping \"%s\"; already set up.\n" +msgstr "" + +#: mediagoblin/gmg_commands/assetlink.py:124 +#, python-format +msgid "Old link found for \"%s\"; removing.\n" +msgstr "" + +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.<br/>Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 +msgid "Sorry, I don't support that file type :(" +msgstr "" + +#: mediagoblin/media_types/pdf/processing.py:142 +msgid "unoconv failing to run, check log file" +msgstr "" + +#: mediagoblin/media_types/video/processing.py:44 +msgid "Video transcoding failed" +msgstr "" + +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:29 +msgid "Allow" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:30 +msgid "Deny" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:34 +msgid "Name" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:35 +msgid "The name of the OAuth client" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:36 +msgid "Description" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:38 +msgid "" +"This will be visible to users allowing your\n" +" application to authenticate as them." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:40 +msgid "Type" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:45 +msgid "" +"<strong>Confidential</strong> - The client can\n" +" make requests to the GNU MediaGoblin instance that can not be\n" +" intercepted by the user agent (e.g. server-side client).<br />\n" +" <strong>Public</strong> - The client can't make confidential\n" +" requests to the GNU MediaGoblin instance (e.g. client-side\n" +" JavaScript client)." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:52 +msgid "Redirect URI" +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:54 +msgid "" +"The redirect URI for the applications, this field\n" +" is <strong>required</strong> for public clients." +msgstr "" + +#: mediagoblin/plugins/oauth/forms.py:66 +msgid "This field is required for public clients" +msgstr "" + +#: mediagoblin/plugins/oauth/views.py:55 +msgid "The client {0} has been registered!" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" +msgstr "" + +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +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/user_pages/media_collect.html:68 +msgid "Add" +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 +msgid "Invalid file given for media type." +msgstr "" + +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + +#: mediagoblin/submit/forms.py:26 +msgid "File" +msgstr "" + +#: mediagoblin/submit/views.py:52 +msgid "You must provide a file." +msgstr "" + +#: mediagoblin/submit/views.py:101 +msgid "Woohoo! Submitted!" +msgstr "" + +#: mediagoblin/submit/views.py:154 +#, python-format +msgid "Collection \"%s\" added!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "Verify your email!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:105 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:112 +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/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 +msgid "Log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:128 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:131 +#: 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:" +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 "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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 "" + +#: 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!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/auth/register.html:41 +msgid "Create" +msgstr "" + +#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19 +#, python-format +msgid "" +"Hi %(username)s,\n" +"\n" +"to activate your GNU MediaGoblin account, open the following URL in\n" +"your web browser:\n" +"\n" +"%(verification_url)s" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/bits/base_footer.html:24 +#, python-format +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 "" + +#: 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/templates/mediagoblin/bits/frontpage_welcome.html:24 +msgid "" +"This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " +"extraordinarily great piece of media hosting software." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 +msgid "" +"To add your own media, place comments, and more, you can log in with your " +"MediaGoblin account." +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 +msgid "Don't have one yet? It's easy!" +msgstr "" + +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 +msgid "" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:23 +#: mediagoblin/templates/mediagoblin/edit/attachments.html:35 +#, python-format +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 +msgid "Attachments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 +msgid "Add attachment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:61 +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:42 +#: mediagoblin/templates/mediagoblin/edit/edit.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:32 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 +msgid "Cancel" +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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 +msgid "Save changes" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 +#, python-format +msgid "Really delete user '%(user_name)s' and all related media/comments?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/edit.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit.html:35 +#, python-format +msgid "Editing %(media_title)s" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 +#, python-format +msgid "Editing %(collection_title)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 +#, python-format +msgid "Editing %(username)s's profile" +msgstr "" + +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + +#: mediagoblin/templates/mediagoblin/listings/collection.html:30 +#: mediagoblin/templates/mediagoblin/listings/collection.html:35 +#: mediagoblin/templates/mediagoblin/listings/tag.html:30 +#: mediagoblin/templates/mediagoblin/listings/tag.html:35 +#, python-format +msgid "Media tagged with: %(tag_name)s" +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 +msgid "Download" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 +msgid "Original" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:44 +msgid "" +"Sorry, this audio will not work because \n" +"\tyour web browser does not support HTML5 \n" +"\taudio." +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:61 +msgid "Original file" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 +msgid "WebM file (Vorbis codec)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:59 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:65 +#, python-format +msgid "Image for %(media_title)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 +msgid "PDF file" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 +msgid "File Format" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 +msgid "Object Height" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:44 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:47 +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 +msgid "WebM file (VP8/Vorbis)" +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 +msgid "Add your media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 +#, python-format +msgid "%(collection_title)s (%(username)s's collection)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 +#, python-format +msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 +msgid "Edit" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 +#, python-format +msgid "Really remove %(media_title)s from %(collection_title)s?" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +msgid "Remove" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 +#, python-format +msgid "%(username)s's media" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 +#, python-format +msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 +msgid "Add a comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 +msgid "Add this comment" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 +msgid "Added" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 +#, python-format +msgid "Add “%(media_title)s” to a collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 +msgid "Add a new collection" +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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 +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." +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." +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 "" + +#: 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/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 +#, 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/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 "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:40 +msgid "Add to a collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 +msgid "feed icon" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 +msgid "Atom feed" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/license.html:25 +msgid "All rights reserved" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:39 +msgid "← Newer" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:45 +msgid "Older →" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/pagination.html:48 +msgid "Go to page:" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 +msgid "newer" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 +#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 +msgid "older" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/tags.html:20 +msgid "Tagged with" +msgstr "" + +#: mediagoblin/tools/exif.py:83 +msgid "Could not read the image file." +msgstr "" + +#: mediagoblin/tools/response.py:36 +msgid "Oops!" +msgstr "" + +#: mediagoblin/tools/response.py:37 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:61 +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 +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 "" + +#: mediagoblin/tools/timesince.py:62 +msgid "year" +msgstr "" + +#: mediagoblin/tools/timesince.py:63 +msgid "month" +msgstr "" + +#: mediagoblin/tools/timesince.py:64 +msgid "week" +msgstr "" + +#: mediagoblin/tools/timesince.py:65 +msgid "day" +msgstr "" + +#: mediagoblin/tools/timesince.py:66 +msgid "hour" +msgstr "" + +#: mediagoblin/tools/timesince.py:67 +msgid "minute" +msgstr "" + +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: 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 "" + +#: mediagoblin/user_pages/forms.py:31 +msgid "I am sure I want to delete this" +msgstr "" + +#: mediagoblin/user_pages/forms.py:35 +msgid "I am sure I want to remove this item from the collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 +msgid "-- Select --" +msgstr "" + +#: mediagoblin/user_pages/forms.py:42 +msgid "Include a note" +msgstr "" + +#: 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 "" + +#: mediagoblin/user_pages/views.py:179 +msgid "Sorry, comments are disabled." +msgstr "" + +#: mediagoblin/user_pages/views.py:184 +msgid "Oops, your comment was empty." +msgstr "" + +#: mediagoblin/user_pages/views.py:190 +msgid "Your comment has been posted!" +msgstr "" + +#: mediagoblin/user_pages/views.py:225 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:265 +msgid "You have to select or add a collection" +msgstr "" + +#: mediagoblin/user_pages/views.py:276 +#, python-format +msgid "\"%s\" already in collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:282 +#, python-format +msgid "\"%s\" added to collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:302 +msgid "You deleted the media." +msgstr "" + +#: mediagoblin/user_pages/views.py:314 +msgid "The media was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:321 +msgid "You are about to delete another user's media. Proceed with caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:395 +msgid "You deleted the item from the collection." +msgstr "" + +#: mediagoblin/user_pages/views.py:399 +msgid "The item was not removed because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:407 +msgid "" +"You are about to delete an item from another user's collection. Proceed with" +" caution." +msgstr "" + +#: mediagoblin/user_pages/views.py:440 +#, python-format +msgid "You deleted the collection \"%s\"" +msgstr "" + +#: mediagoblin/user_pages/views.py:447 +msgid "" +"The collection was not deleted because you didn't check that you were sure." +msgstr "" + +#: mediagoblin/user_pages/views.py:455 +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 1ed5a4f1..7c1bcda8 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 4bb714fe..b5122636 100644 --- a/mediagoblin/i18n/zh_CN/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_CN/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-16 11:06+0000\n" -"Last-Translator: m13253 <m13253@hotmail.com>\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" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mediagoblin/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,250 +23,280 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "用户名" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "密码" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "电子邮件地址" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "抱歉，本站已暂停注册。" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -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." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "用户名或电子邮件" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "无效用户名或电子邮件地址。" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "此字段不能填写电子邮件地址。" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "此字段需填写电子邮件地址。" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "抱歉，本站已暂停注册。" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "抱歉，该用户名已存在。" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "抱歉，已有用户用该电子邮件注册。" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "您的电子邮件地址已认证。您现在可以登录、修改个人资料并上传图片了！" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "验证码错误或用户 ID 错误" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "您必须登录以便让我们知道将电子邮件发给谁" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "您已经认证过电子邮件地址了！" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "重发认证邮件。" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "找不到有该用户名的人。" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "密码修改说明已通过电子邮件送达。" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "标题" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "该作品的描述" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "标签" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "用逗号分隔标签。" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "简称" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "简称不能为空" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "该媒体网址的标题部份。通常不需要修改。" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "许可证" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "个性签名" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "网站" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "本网址出错了" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "当有人对我的媒体评论时给我电子邮件" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "许可证偏好" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "这将是您上传界面的默认许可证。" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "当有人对我的媒体评论时给我电子邮件" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "标题不能是空的" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "这个合集的描述" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "此合集网址的标题部份，通常不需要修改。" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "旧的密码" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "输入您的旧密码来证明您拥有这个账户。" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "新密码" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "密码" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "这个简称已经被别人用了" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "您正在修改别人的媒体，请小心操作。" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "您加上了附件“%s”！" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "您只能修改自己的个人资料" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "您正在修改别人的个人资料，请小心操作。" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "个人资料已修改" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "账户设置已保存" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "您需要确认删除您的账户。" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已经有一个称做“%s”的合集了！" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "该用户已经有使用该简称的合集了。" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "您正在修改别人的合集，请小心操作。" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "密码错误" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -301,19 +331,62 @@ msgid "" "domain." msgstr "CSRF cookie 不存在。很可能是由类似 cookie 屏蔽器造成的。<br />请允许本域名的 cookie 设定。" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "抱歉，我不支持这样的文件格式 :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "无法运行 unoconv，请检查日志" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "视频转码失败" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "在您的内容张贴评论" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "用户名" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "电子邮件地址" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "用户名或电子邮件" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "位置" @@ -377,7 +450,7 @@ msgstr "此应用程序的重定向 URI，本字段在公开类型的 OAuth clie msgid "This field is required for public clients" msgstr "本字段在公开类型的 OAuth client 为必填" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "OAuth client {0} 注册完成！" @@ -390,59 +463,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "增加" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "删除" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "登录" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "登录失败！" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "提供文件的媒体类型错误。" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "文件" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "您必须提供一个文件" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "啊哈！已提交！" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "合集“%s”已新增！" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "确认您的电子邮件！" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "登录" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "更改账户设置" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -450,16 +673,16 @@ msgstr "更改账户设置" msgid "Media processing panel" msgstr "媒体处理面板" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "新增媒体" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "新增合集" @@ -506,6 +729,59 @@ msgstr "最近 10 次成功上传的纪录" msgid "No processed entries, yet!" msgstr "现在还没有处理的纪录！" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -538,19 +814,15 @@ msgid "" "a happy goblin!" msgstr "%(username)s 您好：\n\n要修改 GNU MediaGoblin 的密码，请在您的浏览器中打开下面的网址：\n\n%(verification_url)s\n\n如果您认为这个是个误会，请忽略此封信件，继续当个快乐的哥布林！" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "登录失败！" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "还没有账户吗？" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "在这里建立一个吧！" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "忘了密码吗？" @@ -559,7 +831,7 @@ msgstr "忘了密码吗？" msgid "Create an account!" msgstr "建立一个账户！" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "建立" @@ -593,7 +865,7 @@ msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL msgid "Explore" msgstr "探索" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "嘿！欢迎来到 MediaGoblin 站！ " @@ -603,23 +875,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a>——与众不同的媒体分享网站。" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "您可以登录您的 MediaGoblin 账户以上传媒体、张贴评论等等。" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "没有账户吗？开账户很简单！" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">在本站创建帐户</a>\n 或者\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">在您自己的服务器上搭建 MediaGoblin</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -633,13 +910,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "新增附件" @@ -656,22 +933,29 @@ msgstr "取消" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "保存更改" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "修改 %(username)s 的密码" +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?" @@ -699,14 +983,14 @@ msgstr "编辑 %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "正在改变 %(username)s 的账户设置" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "修改您的密码。" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "删除我的帐户" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -718,6 +1002,36 @@ msgstr "编辑 %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "编辑 %(username)s 的个人资料" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s前" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -728,8 +1042,7 @@ msgstr "此媒体被标记为：%(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "下载" @@ -753,7 +1066,7 @@ msgid "" 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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "源文件" @@ -762,6 +1075,10 @@ msgstr "源文件" msgid "WebM file (Vorbis codec)" msgstr "WebM 文件（Vorbis 编码）" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "已创建" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -773,49 +1090,41 @@ msgstr "WebM 文件（Vorbis 编码）" msgid "Image for %(media_title)s" msgstr "%(media_title)s 的照片" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF 文件" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "切换旋转" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "透视" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "正面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "顶面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "侧面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "下载模型" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "文件格式" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" -msgstr "对象高度" +msgstr "物体高度" #: mediagoblin/templates/mediagoblin/media_displays/video.html:44 msgid "" @@ -832,8 +1141,8 @@ msgid "" msgstr "您可以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> 取得可以播放此视频的浏览器！" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM 文件（640p；VP8/Vorbis）" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -859,11 +1168,6 @@ msgstr "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "编辑" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "删除" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -918,29 +1222,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒体" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ 浏览 <a href=\"%(user_url)s\">%(username)s</a> 的媒体" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "新增评论" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "增加评论" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s前" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "已增加" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "已创建" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1099,26 +1396,34 @@ msgstr "标签" msgid "Could not read the image file." msgstr "无法读取图片文件。" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "糟糕！" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "发生错误" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "操作不允许" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1155,10 +1460,9 @@ msgstr "评论" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "您可以用 <a href=\"http://wowubuntu.com/markdown/\">Markdown</a> 来排版。" +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1180,77 +1484,80 @@ msgstr "— 请选择 —" msgid "Include a note" msgstr "加注" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "在您的内容张贴评论" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "抱歉，不开放评论。" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "啊，您的评论是空的。" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "您的评论已经张贴完成！" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "请检查项目并重试。" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "您需要选择或是新增一个合集" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "“%s”已经在“%s”合集" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "“%s”加入“%s”合集" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "您已经删除此媒体。" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由于您没有勾选确认，该媒体没有被移除。" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "您正在删除别人的媒体，请小心操作。" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "您已经从该合集中删除该项目。" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "由于您没有勾选确认，该项目没有被移除。" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您正在从别人的合集中删除项目，请小心操作。" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已经删除“%s”合集。" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由于您没有勾选确认，该合集没有被移除。" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 c234ff00..888052fb 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 a7ee8db6..51759424 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-05-27 18:54+0000\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" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -18,250 +18,280 @@ msgstr "" "Language: zh_TW.Big5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." msgstr "" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "" -#: mediagoblin/edit/forms.py:63 -msgid "License preference" +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." msgstr "" #: mediagoblin/edit/forms.py:69 -msgid "This will be your default license on upload forms." +msgid "License preference" msgstr "" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" +#: mediagoblin/edit/forms.py:75 +msgid "This will be your default license on upload forms." msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:363 +#: 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 "" @@ -296,19 +326,62 @@ msgid "" "domain." msgstr "" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "" @@ -372,7 +445,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "" @@ -385,59 +458,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -445,16 +668,16 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "" @@ -501,6 +724,59 @@ msgstr "" msgid "No processed entries, yet!" msgstr "" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -533,19 +809,15 @@ msgid "" "a happy goblin!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "" @@ -554,7 +826,7 @@ msgstr "" msgid "Create an account!" msgstr "" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "" @@ -588,7 +860,7 @@ msgstr "" msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" @@ -598,22 +870,27 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 @@ -628,13 +905,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:44 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "" @@ -651,22 +928,29 @@ msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" +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?" @@ -694,12 +978,12 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 +msgid "Delete my account" msgstr "" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 -msgid "Delete my account" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 @@ -713,6 +997,36 @@ msgstr "" msgid "Editing %(username)s's profile" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -723,8 +1037,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "" @@ -748,7 +1061,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "" @@ -757,6 +1070,10 @@ msgstr "" msgid "WebM file (Vorbis codec)" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -768,47 +1085,39 @@ msgstr "" msgid "Image for %(media_title)s" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "" @@ -827,7 +1136,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 @@ -854,11 +1163,6 @@ msgstr "" msgid "Edit" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -913,29 +1217,22 @@ msgstr "" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1094,26 +1391,34 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1150,9 +1455,8 @@ msgstr "" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." msgstr "" #: mediagoblin/user_pages/forms.py:31 @@ -1175,77 +1479,80 @@ msgstr "" msgid "Include a note" msgstr "" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 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 4b7a2398..5e8ec911 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 05ecd4b5..586f3766 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/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-05-27 13:54-0500\n" -"PO-Revision-Date: 2013-06-16 01:40+0000\n" -"Last-Translator: m13253 <m13253@hotmail.com>\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" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,250 +23,280 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:26 -msgid "Username" -msgstr "使用者名稱" - -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 -#: mediagoblin/tests/test_util.py:110 -msgid "Password" -msgstr "密碼" - -#: mediagoblin/auth/forms.py:34 -msgid "Email address" -msgstr "Email 位址" +#: mediagoblin/decorators.py:252 +msgid "Sorry, registration is disabled on this instance." +msgstr "抱歉，本站已經暫停註冊。" -#: mediagoblin/auth/forms.py:41 -msgid "Username or Email" -msgstr "使用者名稱或 email" +#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202 +#: mediagoblin/plugins/persona/views.py:77 +msgid "Sorry, authentication is disabled on this instance." +msgstr "" -#: mediagoblin/auth/forms.py:52 +#: mediagoblin/auth/forms.py:25 msgid "Username or email" msgstr "使用者名稱或 email" -#: mediagoblin/auth/tools.py:31 +#: mediagoblin/auth/tools.py:41 msgid "Invalid User name or email address." msgstr "無效的使用者名稱或 email 位置。" -#: mediagoblin/auth/tools.py:32 +#: mediagoblin/auth/tools.py:42 msgid "This field does not take email addresses." msgstr "本欄位不接受 email 位置。" -#: mediagoblin/auth/tools.py:33 +#: mediagoblin/auth/tools.py:43 msgid "This field requires an email address." msgstr "本欄位需要 email 位置。" -#: mediagoblin/auth/views.py:54 -msgid "Sorry, registration is disabled on this instance." -msgstr "抱歉，本站已經暫停註冊。" - -#: mediagoblin/auth/views.py:68 +#: mediagoblin/auth/tools.py:146 msgid "Sorry, a user with that name already exists." msgstr "抱歉，這個使用者名稱已經存在。" -#: mediagoblin/auth/views.py:72 +#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442 msgid "Sorry, a user with that email address already exists." msgstr "抱歉，此 email 位置已經被註冊了。" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293 +#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419 +msgid "The verification key or user id is incorrect." +msgstr "" + +#: mediagoblin/auth/views.py:161 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" msgstr "您的 email 位址已被認證。您已經可以登入，編輯您的個人檔案並上傳圖片！" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:167 msgid "The verification key or user id is incorrect" msgstr "認證碼或是使用者 ID 錯誤" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:185 msgid "You must be logged in so we know who to send the email to!" msgstr "您必須登入，我們才知道信要送給誰！" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:193 msgid "You've already verified your email address!" msgstr "您的電子郵件已經確認了！" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:203 msgid "Resent your verification email." msgstr "重送認證信。" -#: mediagoblin/auth/views.py:258 +#: 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:269 +#: mediagoblin/auth/views.py:248 msgid "Couldn't find someone with that username." msgstr "找不到相關的使用者名稱。" -#: mediagoblin/auth/views.py:272 +#: mediagoblin/auth/views.py:251 msgid "" "An email has been sent with instructions on how to change your password." msgstr "修改密碼的指示已經由電子郵件寄送到您的信箱。" -#: mediagoblin/auth/views.py:279 +#: 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:336 +#: 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/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: 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/user_pages/forms.py:45 msgid "Title" msgstr "標題" -#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31 +#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31 msgid "Description of this work" msgstr "這個作品的描述" -#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 -#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 +#: 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 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> 來排版。" -#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 +#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36 msgid "Tags" msgstr "標籤" -#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 +#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." msgstr "用逗號分隔標籤。" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94 msgid "Slug" msgstr "簡稱" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95 msgid "The slug can't be empty" msgstr "簡稱不能為空白" -#: mediagoblin/edit/forms.py:40 +#: mediagoblin/edit/forms.py:42 msgid "" "The title part of this media's address. You usually don't need to change " "this." msgstr "此媒體網址的標題部份。通常不需要修改。" -#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 +#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" msgstr "授權" -#: mediagoblin/edit/forms.py:50 +#: mediagoblin/edit/forms.py:52 msgid "Bio" msgstr "自我介紹" -#: mediagoblin/edit/forms.py:56 +#: mediagoblin/edit/forms.py:58 msgid "Website" msgstr "網站" -#: mediagoblin/edit/forms.py:58 +#: mediagoblin/edit/forms.py:60 msgid "This address contains errors" msgstr "本網址出錯了" -#: mediagoblin/edit/forms.py:63 +#: mediagoblin/edit/forms.py:65 +msgid "Email me when others comment on my media" +msgstr "當有人對我的媒體留言時寄信給我" + +#: mediagoblin/edit/forms.py:67 +msgid "Enable insite notifications about events." +msgstr "" + +#: mediagoblin/edit/forms.py:69 msgid "License preference" msgstr "授權偏好" -#: mediagoblin/edit/forms.py:69 +#: mediagoblin/edit/forms.py:75 msgid "This will be your default license on upload forms." msgstr "在上傳頁面，這將會是您預設的授權模式。" -#: mediagoblin/edit/forms.py:71 -msgid "Email me when others comment on my media" -msgstr "當有人對我的媒體留言時寄信給我" - -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:87 msgid "The title can't be empty" msgstr "標題不能是空的" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" msgstr "這個蒐藏的描述" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:96 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "此蒐藏網址的標題部份，通常不需要修改。" -#: mediagoblin/edit/forms.py:99 +#: mediagoblin/edit/forms.py:103 msgid "Old password" msgstr "舊的密碼" -#: mediagoblin/edit/forms.py:101 +#: mediagoblin/edit/forms.py:105 msgid "Enter your old password to prove you own this account." msgstr "輸入您的舊密碼來證明您擁有這個帳號。" -#: mediagoblin/edit/forms.py:104 +#: mediagoblin/edit/forms.py:108 msgid "New password" msgstr "新密碼" -#: mediagoblin/edit/views.py:67 +#: mediagoblin/edit/forms.py:116 +msgid "New email address" +msgstr "" + +#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28 +#: mediagoblin/plugins/basic_auth/forms.py:43 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63 +#: mediagoblin/tests/test_util.py:110 +msgid "Password" +msgstr "密碼" + +#: mediagoblin/edit/forms.py:122 +msgid "Enter your password to prove you own this account." +msgstr "" + +#: mediagoblin/edit/views.py:73 msgid "An entry with that slug already exists for this user." msgstr "這個簡稱已經被其他人用了" -#: mediagoblin/edit/views.py:85 +#: mediagoblin/edit/views.py:91 msgid "You are editing another user's media. Proceed with caution." msgstr "您正在修改別人的媒體，請小心操作。" -#: mediagoblin/edit/views.py:155 +#: mediagoblin/edit/views.py:161 #, python-format msgid "You added the attachment %s!" msgstr "您加上了附件「%s」！" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:188 msgid "You can only edit your own profile." msgstr "您只能修改您自己的個人檔案。" -#: mediagoblin/edit/views.py:188 +#: mediagoblin/edit/views.py:194 msgid "You are editing a user's profile. Proceed with caution." msgstr "您正在修改別人的個人檔案，請小心操作。" -#: mediagoblin/edit/views.py:204 +#: mediagoblin/edit/views.py:210 msgid "Profile changes saved" msgstr "個人檔案修改已儲存" -#: mediagoblin/edit/views.py:240 +#: mediagoblin/edit/views.py:243 msgid "Account settings saved" msgstr "帳號設定已儲存" -#: mediagoblin/edit/views.py:274 +#: mediagoblin/edit/views.py:277 msgid "You need to confirm the deletion of your account." msgstr "您必須要確認是否刪除您的帳號。" -#: mediagoblin/edit/views.py:310 mediagoblin/submit/views.py:138 -#: mediagoblin/user_pages/views.py:222 +#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148 +#: mediagoblin/user_pages/views.py:242 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已經有一個稱做「%s」的蒐藏了！" -#: mediagoblin/edit/views.py:314 +#: mediagoblin/edit/views.py:317 msgid "A collection with that slug already exists for this user." msgstr "這個使用者已經有使用該簡稱的蒐藏了。" -#: mediagoblin/edit/views.py:329 +#: mediagoblin/edit/views.py:332 msgid "You are editing another user's collection. Proceed with caution." msgstr "您正在修改別人的蒐藏，請小心操作。" -#: mediagoblin/edit/views.py:348 +#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:363 +#: 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" @@ -301,19 +331,62 @@ msgid "" "domain." msgstr "跨網站存取 (CSRF) 的 cookie 不存在，有可能是 cookie 阻擋程式之類的程式導致的。<br/>請允許此網域的 cookie 設定。" -#: mediagoblin/media_types/__init__.py:111 -#: mediagoblin/media_types/__init__.py:155 +#: mediagoblin/media_types/__init__.py:78 +#: mediagoblin/media_types/__init__.py:100 msgid "Sorry, I don't support that file type :(" msgstr "抱歉，我不支援這樣的檔案格式 :(" -#: mediagoblin/media_types/pdf/processing.py:136 +#: mediagoblin/media_types/pdf/processing.py:142 msgid "unoconv failing to run, check log file" msgstr "unoconv 無法執行，請檢查紀錄檔" -#: mediagoblin/media_types/video/processing.py:37 +#: mediagoblin/media_types/video/processing.py:44 msgid "Video transcoding failed" msgstr "影像轉碼失敗" +#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58 +msgid "commented on your post" +msgstr "在您的內容張貼留言" + +#: mediagoblin/notifications/views.py:35 +#, python-format +msgid "Subscribed to comments on %s!" +msgstr "" + +#: mediagoblin/notifications/views.py:48 +#, python-format +msgid "You will not receive notifications for comments on %s." +msgstr "" + +#: mediagoblin/oauth/views.py:239 +msgid "Must provide an oauth_token." +msgstr "" + +#: mediagoblin/oauth/views.py:244 mediagoblin/oauth/views.py:294 +msgid "No request token found." +msgstr "" + +#: mediagoblin/plugins/basic_auth/forms.py:24 +#: mediagoblin/plugins/openid/forms.py:27 +#: mediagoblin/plugins/persona/forms.py:24 +msgid "Username" +msgstr "使用者名稱" + +#: mediagoblin/plugins/basic_auth/forms.py:32 +#: mediagoblin/plugins/openid/forms.py:31 +#: mediagoblin/plugins/persona/forms.py:28 +#: mediagoblin/plugins/persona/forms.py:39 +msgid "Email address" +msgstr "Email 位址" + +#: mediagoblin/plugins/basic_auth/forms.py:39 +msgid "Username or Email" +msgstr "使用者名稱或 email" + +#: mediagoblin/plugins/basic_auth/forms.py:46 +msgid "Stay logged in" +msgstr "" + #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 msgid "Location" msgstr "位置" @@ -377,7 +450,7 @@ msgstr "此應用程式的重定向 URI，本欄位在公開類型的 OAuth 用 msgid "This field is required for public clients" msgstr "本欄位在公開類型的用戶程式為必填" -#: mediagoblin/plugins/oauth/views.py:56 +#: mediagoblin/plugins/oauth/views.py:55 msgid "The client {0} has been registered!" msgstr "OAuth 用戶程式 {0} 註冊完成！" @@ -390,59 +463,209 @@ msgid "Your OAuth clients" 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/user_pages/media_collect.html:68 msgid "Add" msgstr "增加" -#: mediagoblin/processing/__init__.py:193 +#: 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 "" + +#: mediagoblin/plugins/openid/forms.py:38 +msgid "OpenID" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:48 +msgid "Sorry, the OpenID server could not be found" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:61 +#, python-format +msgid "No OpenID service was found for %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:106 +#, python-format +msgid "Verification of %s failed: %s" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:117 +msgid "Verification cancelled" +msgstr "" + +#: mediagoblin/plugins/openid/views.py:314 +msgid "Your OpenID url was saved successfully." +msgstr "" + +#: 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 "" + +#: mediagoblin/plugins/openid/views.py:343 +#: mediagoblin/plugins/openid/views.py:402 +msgid "That OpenID is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/openid/views.py:385 +msgid "OpenID was successfully removed." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "刪除" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html:21 +msgid "OpenID's" +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/auth/login.html:28 +#: mediagoblin/templates/mediagoblin/auth/login.html:36 +#: mediagoblin/templates/mediagoblin/auth/login.html:58 +msgid "Log in" +msgstr "登入" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:39 +#: mediagoblin/templates/mediagoblin/auth/login.html:39 +msgid "Logging in failed!" +msgstr "登入失敗！" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:44 +msgid "Log in to create an account!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:51 +msgid "Or login with a password!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html:23 +msgid "Or login with OpenID!" +msgstr "" + +#: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/register_link.html:23 +msgid "Or register with OpenID!" +msgstr "" + +#: mediagoblin/plugins/persona/__init__.py:90 +msgid "Sorry, an account is already registered to that Persona email." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:138 +msgid "The Persona email address was successfully removed." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:144 +msgid "" +"You can't delete your only Persona email address unless you have a password " +"set." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:149 +msgid "That Persona email address is not registered to this account." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:176 +msgid "" +"Sorry, an account is already registered with that Persona email address." +msgstr "" + +#: mediagoblin/plugins/persona/views.py:192 +msgid "Your Persona email address was saved successfully." +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:31 +msgid "Delete a Persona email address" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit.html:34 +msgid "Add a Persona email address" +msgstr "" + +#: 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/login_link.html:22 +msgid "Or login with Persona!" +msgstr "" + +#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html:22 +msgid "Or register with Persona!" +msgstr "" + +#: mediagoblin/processing/__init__.py:413 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別！" +#: mediagoblin/processing/__init__.py:420 +msgid "Copying to public storage failed." +msgstr "" + +#: mediagoblin/processing/__init__.py:428 +msgid "An acceptable processing file was not found" +msgstr "" + #: mediagoblin/submit/forms.py:26 msgid "File" msgstr "檔案" -#: mediagoblin/submit/views.py:49 +#: mediagoblin/submit/views.py:52 msgid "You must provide a file." msgstr "您必須提供一個檔案" -#: mediagoblin/submit/views.py:93 +#: mediagoblin/submit/views.py:101 msgid "Woohoo! Submitted!" msgstr "啊哈！PO 上去啦！" -#: mediagoblin/submit/views.py:144 +#: mediagoblin/submit/views.py:154 #, python-format msgid "Collection \"%s\" added!" msgstr "蒐藏「%s」新增完成！" -#: mediagoblin/templates/mediagoblin/base.html:67 +#: mediagoblin/templates/mediagoblin/base.html:79 msgid "Verify your email!" msgstr "確認您的電子郵件" -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:86 msgid "log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:73 -#: mediagoblin/templates/mediagoblin/auth/login.html:28 -#: mediagoblin/templates/mediagoblin/auth/login.html:36 -#: mediagoblin/templates/mediagoblin/auth/login.html:54 -msgid "Log in" -msgstr "登入" - -#: mediagoblin/templates/mediagoblin/base.html:82 +#: mediagoblin/templates/mediagoblin/base.html:105 #, 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:89 +#: mediagoblin/templates/mediagoblin/base.html:112 msgid "Change account settings" msgstr "更改帳號設定" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:108 +#: 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/user_pages/processing_panel.html:21 @@ -450,16 +673,16 @@ msgstr "更改帳號設定" msgid "Media processing panel" msgstr "媒體處理面板" -#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:125 msgid "Log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:99 +#: mediagoblin/templates/mediagoblin/base.html:128 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "新增媒體" -#: mediagoblin/templates/mediagoblin/base.html:102 +#: mediagoblin/templates/mediagoblin/base.html:131 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" msgstr "新增新的蒐藏" @@ -506,6 +729,59 @@ msgstr "最近 10 次成功上傳的紀錄" msgid "No processed entries, yet!" msgstr "現在還沒有處理的紀錄！" +#: mediagoblin/templates/mediagoblin/api/authorize.html:21 +msgid "Authorization" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:26 +#: mediagoblin/templates/mediagoblin/api/authorize.html:53 +msgid "Authorize" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:29 +msgid "You are logged in as" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:33 +msgid "Do you want to authorize " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:37 +msgid "an unknown application" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:39 +msgid " to access your account? " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:41 +msgid "Applications with access to your account can: " +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:43 +msgid "Post new media as you" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:44 +msgid "See your information (e.g profile, media, etc...)" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/authorize.html:45 +msgid "Change your information" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:21 +msgid "Authorization Finished" +msgstr "" + +#: mediagoblin/templates/mediagoblin/api/oob.html:26 +msgid "Authorization Complete" +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" @@ -538,19 +814,15 @@ msgid "" "a happy goblin!" msgstr "%(username)s 您好：\n\n要修改 GNU MediaGoblin 的密碼，請在您的瀏覽器中打開下面的網址：\n\n%(verification_url)s\n\n如果您認為這個是個誤會，請忽略此封信件，繼續當個快樂的哥布林！" -#: mediagoblin/templates/mediagoblin/auth/login.html:39 -msgid "Logging in failed!" -msgstr "登入失敗！" - #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" msgstr "還沒有帳號嗎？" -#: mediagoblin/templates/mediagoblin/auth/login.html:45 +#: mediagoblin/templates/mediagoblin/auth/login.html:46 msgid "Create one here!" msgstr "在這裡建立一個吧！" -#: mediagoblin/templates/mediagoblin/auth/login.html:51 +#: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Forgot your password?" msgstr "忘了密碼嗎？" @@ -559,7 +831,7 @@ msgstr "忘了密碼嗎？" msgid "Create an account!" msgstr "建立一個帳號！" -#: mediagoblin/templates/mediagoblin/auth/register.html:40 +#: mediagoblin/templates/mediagoblin/auth/register.html:41 msgid "Create" msgstr "建立" @@ -593,7 +865,7 @@ msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL msgid "Explore" msgstr "探索" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:22 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:23 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "嘿！歡迎來到 MediaGoblin 站台！ " @@ -603,23 +875,28 @@ msgid "" "extraordinarily great piece of media hosting software." msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 與眾不同的媒體分享網站。" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:25 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:26 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "您可以登入您的 MediaGoblin 帳號以進行上傳媒體、張貼評論等等。" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:27 +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 msgid "Don't have one yet? It's easy!" msgstr "沒有帳號嗎？開帳號很簡單！" -#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:28 -#, python-format +#: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:35 msgid "" -"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" -" or\n" -" <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">在本站建立您的帳號</a>\n 或是\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">在您自己的伺服器上安裝 MediaGoblin</a>" +"\n" +" >Create an account at this site</a>\n" +" or" +msgstr "" + +#: 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 "" #: mediagoblin/templates/mediagoblin/bits/logo.html:23 #: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 @@ -633,13 +910,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:182 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:198 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:178 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:194 msgid "Attachments" msgstr "附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:57 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:204 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:200 msgid "Add attachment" msgstr "新增附件" @@ -656,22 +933,29 @@ msgstr "取消" #: mediagoblin/templates/mediagoblin/edit/attachments.html:63 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "儲存變更" -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28 -#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:23 +#: mediagoblin/templates/mediagoblin/edit/change_email.html:33 #, python-format -msgid "Changing %(username)s's password" -msgstr "更改 %(username)s 的密碼" +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?" @@ -699,14 +983,14 @@ msgstr "編輯 %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "正在改變 %(username)s 的帳號設定" -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46 -msgid "Change your password." -msgstr "更改您的密碼。" - -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53 msgid "Delete my account" msgstr "刪除我的帳號" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58 +msgid "Email" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" @@ -718,6 +1002,36 @@ msgstr "編輯 %(collection_title)s" msgid "Editing %(username)s's profile" msgstr "編輯 %(username)s 的個人檔案" +#: mediagoblin/templates/mediagoblin/edit/verification.txt:19 +#, python-format +msgid "" +"Hi,\n" +"\n" +"We wanted to verify that you are %(username)s. If this is the case, then \n" +"please follow the link below to verify your new email address.\n" +"\n" +"%(verification_url)s\n" +"\n" +"If you are not %(username)s or didn't request an email change, you can ignore\n" +"this email." +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:4 +msgid "New comments" +msgstr "" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24 +#: mediagoblin/templates/mediagoblin/media_displays/image.html:39 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:139 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#, python-format +msgid "%(formatted_time)s ago" +msgstr "%(formatted_time)s 前" + +#: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:41 +msgid "Mark all read" +msgstr "" + #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 #: mediagoblin/templates/mediagoblin/listings/tag.html:30 @@ -728,8 +1042,7 @@ msgstr "這個媒體具有以下標籤：%(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:65 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67 #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "Download" msgstr "下載" @@ -753,7 +1066,7 @@ msgid "" 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:71 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73 #: mediagoblin/templates/mediagoblin/media_displays/video.html:61 msgid "Original file" msgstr "原始檔案" @@ -762,6 +1075,10 @@ msgstr "原始檔案" msgid "WebM file (Vorbis codec)" msgstr "WebM 檔案 (Vorbis 編碼)" +#: mediagoblin/templates/mediagoblin/media_displays/image.html:36 +msgid "Created" +msgstr "建立於" + #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:59 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 @@ -773,47 +1090,39 @@ msgstr "WebM 檔案 (Vorbis 編碼)" msgid "Image for %(media_title)s" msgstr " %(media_title)s 的照片" -#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:79 +#: mediagoblin/templates/mediagoblin/media_displays/pdf.html:81 msgid "PDF file" msgstr "PDF 檔" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 -msgid "Toggle Rotate" -msgstr "切換旋轉" - -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" msgstr "透視" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:115 msgid "Front" msgstr "正面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:118 msgid "Top" msgstr "頂面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Side" msgstr "側面" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:126 msgid "WebGL" msgstr "WebGL" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:132 msgid "Download model" msgstr "下載模型" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:140 msgid "File Format" msgstr "檔案格式" -#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:142 msgid "Object Height" msgstr "物件高度" @@ -832,8 +1141,8 @@ msgid "" msgstr "您可以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> 取得可以播放此影片的先進瀏覽器。" #: mediagoblin/templates/mediagoblin/media_displays/video.html:69 -msgid "WebM file (640p; VP8/Vorbis)" -msgstr "WebM 檔案 (640p; VP8/Vorbis)" +msgid "WebM file (VP8/Vorbis)" +msgstr "" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" @@ -859,11 +1168,6 @@ msgstr "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgid "Edit" msgstr "編輯" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 -msgid "Delete" -msgstr "刪除" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -918,29 +1222,22 @@ msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒體" msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ 瀏覽 <a href=\"%(user_url)s\">%(username)s</a> 的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:95 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:97 msgid "Add a comment" msgstr "新增留言" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:104 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:108 msgid "Add this comment" msgstr "增加留言" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:164 -#, python-format -msgid "%(formatted_time)s ago" -msgstr "%(formatted_time)s 前" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:112 +msgid "Comment Preview" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:150 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:157 msgid "Added" msgstr "新增於" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -msgid "Created" -msgstr "建立於" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format @@ -1099,26 +1396,34 @@ msgstr "標籤" msgid "Could not read the image file." msgstr "無法讀取圖片檔案。" -#: mediagoblin/tools/response.py:35 +#: mediagoblin/tools/response.py:36 msgid "Oops!" msgstr "糟糕！" -#: mediagoblin/tools/response.py:36 +#: mediagoblin/tools/response.py:37 msgid "An error occured" msgstr "發生錯誤" #: mediagoblin/tools/response.py:51 +msgid "Bad Request" +msgstr "" + +#: mediagoblin/tools/response.py:53 +msgid "The request sent to the server is invalid, please double check it" +msgstr "" + +#: mediagoblin/tools/response.py:60 msgid "Operation not allowed" msgstr "操作不允許" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:61 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:60 +#: mediagoblin/tools/response.py:69 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" @@ -1155,10 +1460,9 @@ msgstr "留言" #: mediagoblin/user_pages/forms.py:25 msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "您可以用 <a href=\"http://markdown.tw\">Markdown</a> 來排版。" +"You can use <a href=\"http://daringfireball.net/projects/markdown/basics\" " +"target=\"_blank\">Markdown</a> for formatting." +msgstr "" #: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" @@ -1180,77 +1484,80 @@ msgstr "— 請選擇 —" msgid "Include a note" msgstr "加註" -#: mediagoblin/user_pages/lib.py:58 -msgid "commented on your post" -msgstr "在您的內容張貼留言" +#: 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 "" -#: mediagoblin/user_pages/views.py:169 +#: mediagoblin/user_pages/views.py:179 msgid "Sorry, comments are disabled." msgstr "抱歉，留言被關閉。" -#: mediagoblin/user_pages/views.py:174 +#: mediagoblin/user_pages/views.py:184 msgid "Oops, your comment was empty." msgstr "啊，您的留言是空的。" -#: mediagoblin/user_pages/views.py:180 +#: mediagoblin/user_pages/views.py:190 msgid "Your comment has been posted!" msgstr "您的留言已經張貼完成！" -#: mediagoblin/user_pages/views.py:205 +#: mediagoblin/user_pages/views.py:225 msgid "Please check your entries and try again." msgstr "請檢查項目並重試。" -#: mediagoblin/user_pages/views.py:245 +#: mediagoblin/user_pages/views.py:265 msgid "You have to select or add a collection" msgstr "您需要選擇或是新增一個蒐藏" -#: mediagoblin/user_pages/views.py:256 +#: mediagoblin/user_pages/views.py:276 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "「%s」已經在「%s」蒐藏" -#: mediagoblin/user_pages/views.py:262 +#: mediagoblin/user_pages/views.py:282 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "「%s」加入「%s」蒐藏" -#: mediagoblin/user_pages/views.py:282 +#: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." msgstr "您已經刪除此媒體。" -#: mediagoblin/user_pages/views.py:289 +#: mediagoblin/user_pages/views.py:314 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該媒體沒有被移除。" -#: mediagoblin/user_pages/views.py:296 +#: mediagoblin/user_pages/views.py:321 msgid "You are about to delete another user's media. Proceed with caution." msgstr "您正在刪除別人的媒體，請小心操作。" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:395 msgid "You deleted the item from the collection." msgstr "您已經從該蒐藏中刪除該項目。" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:399 msgid "The item was not removed because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該項目沒有被移除。" -#: mediagoblin/user_pages/views.py:382 +#: mediagoblin/user_pages/views.py:407 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您正在從別人的蒐藏中刪除項目，請小心操作。" -#: mediagoblin/user_pages/views.py:415 +#: mediagoblin/user_pages/views.py:440 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%s」蒐藏。" -#: mediagoblin/user_pages/views.py:422 +#: mediagoblin/user_pages/views.py:447 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該蒐藏沒有被移除。" -#: mediagoblin/user_pages/views.py:430 +#: mediagoblin/user_pages/views.py:455 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您正在刪除別人的蒐藏，請小心操作。" diff --git a/mediagoblin/media_types/ascii/__init__.py b/mediagoblin/media_types/ascii/__init__.py index 4baf8dd3..1ee44988 100644 --- a/mediagoblin/media_types/ascii/__init__.py +++ b/mediagoblin/media_types/ascii/__init__.py @@ -15,21 +15,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.ascii.processing import process_ascii, \ +from mediagoblin.media_types.ascii.processing import AsciiProcessingManager, \ sniff_handler -from mediagoblin.tools import pluginapi ACCEPTED_EXTENSIONS = ["txt", "asc", "nfo"] MEDIA_TYPE = 'mediagoblin.media_types.ascii' -def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) - - class ASCIIMediaManager(MediaManagerBase): human_readable = "ASCII" - processor = staticmethod(process_ascii) display_template = "mediagoblin/media_displays/ascii.html" default_thumb = "images/media_thumbs/ascii.jpg" @@ -40,8 +34,8 @@ def get_media_type_and_manager(ext): hooks = { - 'setup': setup_plugin, 'get_media_type_and_manager': get_media_type_and_manager, ('media_manager', MEDIA_TYPE): lambda: ASCIIMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: AsciiProcessingManager, 'sniff_handler': sniff_handler, } diff --git a/mediagoblin/media_types/ascii/config_spec.ini b/mediagoblin/media_types/ascii/config_spec.ini new file mode 100644 index 00000000..24b05053 --- /dev/null +++ b/mediagoblin/media_types/ascii/config_spec.ini @@ -0,0 +1,4 @@ +[plugin_spec] +thumbnail_font = string(default=None) + + diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index aca784e8..3b287877 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -13,6 +13,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import argparse import chardet import os try: @@ -22,7 +23,11 @@ except ImportError: import logging from mediagoblin import mg_globals as mgg -from mediagoblin.processing import create_pub_filepath +from mediagoblin.processing import ( + create_pub_filepath, FilenameBuilder, + MediaProcessor, ProcessingManager, + get_process_filename, copy_original, + store_public, request_from_args) from mediagoblin.media_types.ascii import asciitoimage _log = logging.getLogger(__name__) @@ -43,106 +48,202 @@ def sniff_handler(media_file, **kw): return None -def process_ascii(proc_state): - """Code to process a txt file. Will be run by celery. - - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. +class CommonAsciiProcessor(MediaProcessor): """ - entry = proc_state.entry - workbench = proc_state.workbench - ascii_config = mgg.global_config['media_type:mediagoblin.media_types.ascii'] - # Conversions subdirectory to avoid collisions - conversions_subdir = os.path.join( - workbench.dir, 'conversions') - os.mkdir(conversions_subdir) - - queued_filepath = entry.queued_media_file - queued_filename = workbench.localized_file( - mgg.queue_store, queued_filepath, - 'source') - - queued_file = file(queued_filename, 'rb') - - with queued_file: - queued_file_charset = chardet.detect(queued_file.read()) - - # Only select a non-utf-8 charset if chardet is *really* sure - # Tested with "Feli\x0109an superjaron", which was detecte - if queued_file_charset['confidence'] < 0.9: - interpreted_charset = 'utf-8' - else: - interpreted_charset = queued_file_charset['encoding'] - - _log.info('Charset detected: {0}\nWill interpret as: {1}'.format( - queued_file_charset, - interpreted_charset)) - - queued_file.seek(0) # Rewind the queued file - - thumb_filepath = create_pub_filepath( - entry, 'thumbnail.png') - - tmp_thumb_filename = os.path.join( - conversions_subdir, thumb_filepath[-1]) - - ascii_converter_args = {} - - if ascii_config['thumbnail_font']: - ascii_converter_args.update( - {'font': ascii_config['thumbnail_font']}) - - converter = asciitoimage.AsciiToImage( - **ascii_converter_args) - - thumb = converter._create_image( - queued_file.read()) - - with file(tmp_thumb_filename, 'w') as thumb_file: - thumb.thumbnail( - (mgg.global_config['media:thumb']['max_width'], - mgg.global_config['media:thumb']['max_height']), - Image.ANTIALIAS) - thumb.save(thumb_file) - - _log.debug('Copying local file to public storage') - mgg.public_store.copy_local_to_storage( - tmp_thumb_filename, thumb_filepath) - - queued_file.seek(0) + Provides a base for various ascii processing steps + """ + acceptable_files = ['original', 'unicode'] - original_filepath = create_pub_filepath(entry, queued_filepath[-1]) + def common_setup(self): + self.ascii_config = mgg.global_config['plugins'][ + 'mediagoblin.media_types.ascii'] - with mgg.public_store.get_file(original_filepath, 'wb') \ - as original_file: - original_file.write(queued_file.read()) + # Conversions subdirectory to avoid collisions + self.conversions_subdir = os.path.join( + self.workbench.dir, 'conversions') + os.mkdir(self.conversions_subdir) - queued_file.seek(0) # Rewind *again* + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) - unicode_filepath = create_pub_filepath(entry, 'ascii-portable.txt') + self.charset = None - with mgg.public_store.get_file(unicode_filepath, 'wb') \ - as unicode_file: - # Decode the original file from its detected charset (or UTF8) - # Encode the unicode instance to ASCII and replace any non-ASCII - # with an HTML entity (&# - unicode_file.write( - unicode(queued_file.read().decode( - interpreted_charset)).encode( - 'ascii', - 'xmlcharrefreplace')) + def copy_original(self): + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) - # Remove queued media file from storage and database. - # queued_filepath is in the task_id directory which should - # be removed too, but fail if the directory is not empty to be on - # the super-safe side. - mgg.queue_store.delete_file(queued_filepath) # rm file - mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir - entry.queued_media_file = [] + def _detect_charset(self, orig_file): + d_charset = chardet.detect(orig_file.read()) - media_files_dict = entry.setdefault('media_files', {}) - media_files_dict['thumb'] = thumb_filepath - media_files_dict['unicode'] = unicode_filepath - media_files_dict['original'] = original_filepath + # Only select a non-utf-8 charset if chardet is *really* sure + # Tested with "Feli\x0109an superjaron", which was detected + if d_charset['confidence'] < 0.9: + self.charset = 'utf-8' + else: + self.charset = d_charset['encoding'] - entry.save() + _log.info('Charset detected: {0}\nWill interpret as: {1}'.format( + d_charset, + self.charset)) + + # Rewind the file + orig_file.seek(0) + + def store_unicode_file(self): + with file(self.process_filename, 'rb') as orig_file: + self._detect_charset(orig_file) + unicode_filepath = create_pub_filepath(self.entry, + 'ascii-portable.txt') + + with mgg.public_store.get_file(unicode_filepath, 'wb') \ + as unicode_file: + # Decode the original file from its detected charset (or UTF8) + # Encode the unicode instance to ASCII and replace any + # non-ASCII with an HTML entity (&# + unicode_file.write( + unicode(orig_file.read().decode( + self.charset)).encode( + 'ascii', + 'xmlcharrefreplace')) + + self.entry.media_files['unicode'] = unicode_filepath + + def generate_thumb(self, font=None, thumb_size=None): + with file(self.process_filename, 'rb') as orig_file: + # If no font kwarg, check config + if not font: + font = self.ascii_config.get('thumbnail_font', None) + if not thumb_size: + thumb_size = (mgg.global_config['media:thumb']['max_width'], + mgg.global_config['media:thumb']['max_height']) + + tmp_thumb = os.path.join( + self.conversions_subdir, + self.name_builder.fill('{basename}.thumbnail.png')) + + ascii_converter_args = {} + + # If there is a font from either the config or kwarg, update + # ascii_converter_args + if font: + ascii_converter_args.update( + {'font': self.ascii_config['thumbnail_font']}) + + converter = asciitoimage.AsciiToImage( + **ascii_converter_args) + + thumb = converter._create_image( + orig_file.read()) + + with file(tmp_thumb, 'w') as thumb_file: + thumb.thumbnail( + thumb_size, + Image.ANTIALIAS) + thumb.save(thumb_file) + + _log.debug('Copying local file to public storage') + store_public(self.entry, 'thumb', tmp_thumb, + self.name_builder.fill('{basename}.thumbnail.jpg')) + + +class InitialProcessor(CommonAsciiProcessor): + """ + Initial processing step for new ascii media + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_width'), + type=int) + + parser.add_argument( + '--font', + help='the thumbnail font') + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['thumb_size', 'font']) + + def process(self, thumb_size=None, font=None): + self.common_setup() + self.store_unicode_file() + self.generate_thumb(thumb_size=thumb_size, font=font) + self.copy_original() + self.delete_queue_file() + + +class Resizer(CommonAsciiProcessor): + """ + Resizing process steps for processed media + """ + name = 'resize' + description = 'Resize thumbnail' + thumb_size = 'thumb_size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + # Needed for gmg reprocess thumbs to work + parser.add_argument( + 'file', + nargs='?', + default='thumb', + choices=['thumb']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['thumb_size', 'file']) + + def process(self, thumb_size=None, file=None): + self.common_setup() + self.generate_thumb(thumb_size=thumb_size) + + +class AsciiProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) diff --git a/mediagoblin/media_types/audio/__init__.py b/mediagoblin/media_types/audio/__init__.py index c7ed8d2d..6ad473c8 100644 --- a/mediagoblin/media_types/audio/__init__.py +++ b/mediagoblin/media_types/audio/__init__.py @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.audio.processing import process_audio, \ +from mediagoblin.media_types.audio.processing import AudioProcessingManager, \ sniff_handler from mediagoblin.tools import pluginapi @@ -32,8 +32,8 @@ def setup_plugin(): class AudioMediaManager(MediaManagerBase): human_readable = "Audio" - processor = staticmethod(process_audio) display_template = "mediagoblin/media_displays/audio.html" + default_thumb = "images/media_thumbs/image.png" def get_media_type_and_manager(ext): @@ -45,4 +45,5 @@ hooks = { 'get_media_type_and_manager': get_media_type_and_manager, 'sniff_handler': sniff_handler, ('media_manager', MEDIA_TYPE): lambda: AudioMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: AudioProcessingManager, } diff --git a/mediagoblin/media_types/audio/config_spec.ini b/mediagoblin/media_types/audio/config_spec.ini new file mode 100644 index 00000000..743deaa4 --- /dev/null +++ b/mediagoblin/media_types/audio/config_spec.ini @@ -0,0 +1,8 @@ +[plugin_spec] +keep_original = boolean(default=True) +# vorbisenc quality +quality = float(default=0.3) +create_spectrogram = boolean(default=True) +spectrogram_fft_size = integer(default=4096) + + diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py index 22383bc1..d0716448 100644 --- a/mediagoblin/media_types/audio/processing.py +++ b/mediagoblin/media_types/audio/processing.py @@ -14,16 +14,19 @@ # 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 argparse import logging -from tempfile import NamedTemporaryFile import os from mediagoblin import mg_globals as mgg -from mediagoblin.processing import (create_pub_filepath, BadMediaFail, - FilenameBuilder, ProgressCallback) +from mediagoblin.processing import ( + BadMediaFail, FilenameBuilder, + ProgressCallback, MediaProcessor, ProcessingManager, + request_from_args, get_process_filename, + store_public, copy_original) -from mediagoblin.media_types.audio.transcoders import (AudioTranscoder, - AudioThumbnailer) +from mediagoblin.media_types.audio.transcoders import ( + AudioTranscoder, AudioThumbnailer) _log = logging.getLogger(__name__) @@ -39,121 +42,304 @@ def sniff_handler(media_file, **kw): _log.debug('Audio discovery raised BadMediaFail') return None - if data.is_audio == True and data.is_video == False: + if data.is_audio is True and data.is_video is False: return MEDIA_TYPE return None -def process_audio(proc_state): - """Code to process uploaded audio. Will be run by celery. - - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. +class CommonAudioProcessor(MediaProcessor): + """ + Provides a base for various audio processing steps """ - entry = proc_state.entry - workbench = proc_state.workbench - audio_config = mgg.global_config['media_type:mediagoblin.media_types.audio'] - - queued_filepath = entry.queued_media_file - queued_filename = workbench.localized_file( - mgg.queue_store, queued_filepath, - 'source') - name_builder = FilenameBuilder(queued_filename) - - webm_audio_filepath = create_pub_filepath( - entry, - '{original}.webm'.format( - original=os.path.splitext( - queued_filepath[-1])[0])) - - if audio_config['keep_original']: - with open(queued_filename, 'rb') as queued_file: - original_filepath = create_pub_filepath( - entry, name_builder.fill('{basename}{ext}')) - - with mgg.public_store.get_file(original_filepath, 'wb') as \ - original_file: - _log.debug('Saving original...') - original_file.write(queued_file.read()) - - entry.media_files['original'] = original_filepath - - transcoder = AudioTranscoder() - - with NamedTemporaryFile(dir=workbench.dir) as webm_audio_tmp: - progress_callback = ProgressCallback(entry) - - transcoder.transcode( - queued_filename, - webm_audio_tmp.name, - quality=audio_config['quality'], + acceptable_files = ['original', 'best_quality', 'webm_audio'] + + def common_setup(self): + """ + Setup the workbench directory and pull down the original file, add + the audio_config, transcoder, thumbnailer and spectrogram_tmp path + """ + self.audio_config = mgg \ + .global_config['plugins']['mediagoblin.media_types.audio'] + + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) + + self.transcoder = AudioTranscoder() + self.thumbnailer = AudioThumbnailer() + + def copy_original(self): + if self.audio_config['keep_original']: + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) + + def _keep_best(self): + """ + If there is no original, keep the best file that we have + """ + if not self.entry.media_files.get('best_quality'): + # Save the best quality file if no original? + if not self.entry.media_files.get('original') and \ + self.entry.media_files.get('webm_audio'): + self.entry.media_files['best_quality'] = self.entry \ + .media_files['webm_audio'] + + def transcode(self, quality=None): + if not quality: + quality = self.audio_config['quality'] + + progress_callback = ProgressCallback(self.entry) + webm_audio_tmp = os.path.join(self.workbench.dir, + self.name_builder.fill( + '{basename}{ext}')) + + self.transcoder.transcode( + self.process_filename, + webm_audio_tmp, + quality=quality, progress_callback=progress_callback) - transcoder.discover(webm_audio_tmp.name) + self.transcoder.discover(webm_audio_tmp) + + self._keep_best() _log.debug('Saving medium...') - mgg.public_store.get_file(webm_audio_filepath, 'wb').write( - webm_audio_tmp.read()) - - entry.media_files['webm_audio'] = webm_audio_filepath - - # entry.media_data_init(length=int(data.audiolength)) - - if audio_config['create_spectrogram']: - spectrogram_filepath = create_pub_filepath( - entry, - '{original}-spectrogram.jpg'.format( - original=os.path.splitext( - queued_filepath[-1])[0])) - - with NamedTemporaryFile(dir=workbench.dir, suffix='.ogg') as wav_tmp: - _log.info('Creating OGG source for spectrogram') - transcoder.transcode( - queued_filename, - wav_tmp.name, - mux_string='vorbisenc quality={0} ! oggmux'.format( - audio_config['quality'])) - - thumbnailer = AudioThumbnailer() - - with NamedTemporaryFile(dir=workbench.dir, suffix='.jpg') as spectrogram_tmp: - thumbnailer.spectrogram( - wav_tmp.name, - spectrogram_tmp.name, - width=mgg.global_config['media:medium']['max_width'], - fft_size=audio_config['spectrogram_fft_size']) - - _log.debug('Saving spectrogram...') - mgg.public_store.get_file(spectrogram_filepath, 'wb').write( - spectrogram_tmp.read()) - - entry.media_files['spectrogram'] = spectrogram_filepath - - with NamedTemporaryFile(dir=workbench.dir, suffix='.jpg') as thumb_tmp: - thumbnailer.thumbnail_spectrogram( - spectrogram_tmp.name, - thumb_tmp.name, - (mgg.global_config['media:thumb']['max_width'], - mgg.global_config['media:thumb']['max_height'])) - - thumb_filepath = create_pub_filepath( - entry, - '{original}-thumbnail.jpg'.format( - original=os.path.splitext( - queued_filepath[-1])[0])) - - mgg.public_store.get_file(thumb_filepath, 'wb').write( - thumb_tmp.read()) - - entry.media_files['thumb'] = thumb_filepath - else: - entry.media_files['thumb'] = ['fake', 'thumb', 'path.jpg'] - - # Remove queued media file from storage and database. - # queued_filepath is in the task_id directory which should - # be removed too, but fail if the directory is not empty to be on - # the super-safe side. - mgg.queue_store.delete_file(queued_filepath) # rm file - mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir - entry.queued_media_file = [] + store_public(self.entry, 'webm_audio', webm_audio_tmp, + self.name_builder.fill('{basename}.medium.webm')) + + 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'] + + wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( + '{basename}.ogg')) + + _log.info('Creating OGG source for spectrogram') + self.transcoder.transcode( + self.process_filename, + wav_tmp, + mux_string='vorbisenc quality={0} ! oggmux'.format( + self.audio_config['quality'])) + + spectrogram_tmp = os.path.join(self.workbench.dir, + self.name_builder.fill( + '{basename}-spectrogram.jpg')) + + self.thumbnailer.spectrogram( + wav_tmp, + spectrogram_tmp, + width=max_width, + fft_size=fft_size) + + _log.debug('Saving spectrogram...') + store_public(self.entry, 'spectrogram', spectrogram_tmp, + self.name_builder.fill('{basename}.spectrogram.jpg')) + + 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) + + thumb_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( + '{basename}-thumbnail.jpg')) + + # We need the spectrogram to create a thumbnail + spectrogram = self.entry.media_files.get('spectrogram') + if not spectrogram: + _log.info('No spectrogram found, we will create one.') + self.create_spectrogram() + spectrogram = self.entry.media_files['spectrogram'] + + spectrogram_filepath = mgg.public_store.get_local_path(spectrogram) + + self.thumbnailer.thumbnail_spectrogram( + spectrogram_filepath, + thumb_tmp, + tuple(size)) + + store_public(self.entry, 'thumb', thumb_tmp, + self.name_builder.fill('{basename}.thumbnail.jpg')) + + +class InitialProcessor(CommonAudioProcessor): + """ + Initial processing steps for new audio + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--quality', + type=float, + help='vorbisenc quality. Range: -0.1..1') + + parser.add_argument( + '--fft_size', + type=int, + help='spectrogram fft size') + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int, + help='minimum size is 100 x 100') + + parser.add_argument( + '--medium_width', + type=int, + help='The width of the spectogram') + + parser.add_argument( + '--create_spectrogram', + action='store_true', + help='Create spectogram and thumbnail, will default to config') + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['create_spectrogram', 'quality', 'fft_size', + 'thumb_size', 'medium_width']) + + def process(self, quality=None, fft_size=None, thumb_size=None, + create_spectrogram=None, medium_width=None): + self.common_setup() + + if not create_spectrogram: + create_spectrogram = self.audio_config['create_spectrogram'] + + self.transcode(quality=quality) + self.copy_original() + + if create_spectrogram: + self.create_spectrogram(max_width=medium_width, fft_size=fft_size) + self.generate_thumb(size=thumb_size) + self.delete_queue_file() + + +class Resizer(CommonAudioProcessor): + """ + Thumbnail and spectogram resizing process steps for processed audio + """ + name = 'resize' + description = 'Resize thumbnail or spectogram' + thumb_size = 'thumb_size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media entry is eligible for processing + """ + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--fft_size', + type=int, + help='spectrogram fft size') + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int, + help='minimum size is 100 x 100') + + parser.add_argument( + '--medium_width', + type=int, + help='The width of the spectogram') + + parser.add_argument( + 'file', + choices=['thumb', 'spectrogram']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['thumb_size', 'file', 'fft_size', 'medium_width']) + + def process(self, file, thumb_size=None, fft_size=None, + medium_width=None): + self.common_setup() + + if file == 'thumb': + self.generate_thumb(size=thumb_size) + elif file == 'spectrogram': + self.create_spectrogram(max_width=medium_width, fft_size=fft_size) + + +class Transcoder(CommonAudioProcessor): + """ + Transcoding processing steps for processed audio + """ + name = 'transcode' + description = 'Re-transcode audio' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--quality', + help='vorbisenc quality. Range: -0.1..1') + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['quality']) + + def process(self, quality=None): + self.common_setup() + self.transcode(quality=quality) + + +class AudioProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) + self.add_processor(Transcoder) diff --git a/mediagoblin/media_types/audio/transcoders.py b/mediagoblin/media_types/audio/transcoders.py index 84e6af7e..150dad8e 100644 --- a/mediagoblin/media_types/audio/transcoders.py +++ b/mediagoblin/media_types/audio/transcoders.py @@ -122,8 +122,7 @@ class AudioThumbnailer(object): int(start_x), 0, int(stop_x), int(im_h))) - if th.size[0] > th_w or th.size[1] > th_h: - th.thumbnail(thumb_size, Image.ANTIALIAS) + th.thumbnail(thumb_size, Image.ANTIALIAS) th.save(dst) diff --git a/mediagoblin/media_types/image/__init__.py b/mediagoblin/media_types/image/__init__.py index 1bb9c6f3..06e0f08f 100644 --- a/mediagoblin/media_types/image/__init__.py +++ b/mediagoblin/media_types/image/__init__.py @@ -14,24 +14,22 @@ # 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 datetime +import logging from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.image.processing import process_image, \ - sniff_handler -from mediagoblin.tools import pluginapi +from mediagoblin.media_types.image.processing import sniff_handler, \ + ImageProcessingManager -ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"] -MEDIA_TYPE = 'mediagoblin.media_types.image' +_log = logging.getLogger(__name__) -def setup_plugin(): - config = pluginapi.get_config('mediagoblin.media_types.image') +ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"] +MEDIA_TYPE = 'mediagoblin.media_types.image' class ImageMediaManager(MediaManagerBase): human_readable = "Image" - processor = staticmethod(process_image) display_template = "mediagoblin/media_displays/image.html" default_thumb = "images/media_thumbs/image.png" @@ -65,8 +63,8 @@ def get_media_type_and_manager(ext): hooks = { - 'setup': setup_plugin, 'get_media_type_and_manager': get_media_type_and_manager, 'sniff_handler': sniff_handler, ('media_manager', MEDIA_TYPE): lambda: ImageMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: ImageProcessingManager, } diff --git a/mediagoblin/media_types/image/config_spec.ini b/mediagoblin/media_types/image/config_spec.ini new file mode 100644 index 00000000..08111df2 --- /dev/null +++ b/mediagoblin/media_types/image/config_spec.ini @@ -0,0 +1,7 @@ +[plugin_spec] +# One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS +resize_filter = string(default="ANTIALIAS") +#level of compression used when resizing images +quality = integer(default=90) + + diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index baf2ac7e..4c7bdb15 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -20,9 +20,14 @@ except ImportError: import Image import os import logging +import argparse from mediagoblin import mg_globals as mgg -from mediagoblin.processing import BadMediaFail, FilenameBuilder +from mediagoblin.processing import ( + BadMediaFail, FilenameBuilder, + MediaProcessor, ProcessingManager, + request_from_args, get_process_filename, + store_public, copy_original) from mediagoblin.tools.exif import exif_fix_image_orientation, \ extract_exif, clean_exif, get_gps_data, get_useful, \ exif_image_needs_rotation @@ -38,8 +43,8 @@ PIL_FILTERS = { MEDIA_TYPE = 'mediagoblin.media_types.image' -def resize_image(proc_state, resized, keyname, target_name, new_size, - exif_tags, workdir): +def resize_image(entry, resized, keyname, target_name, new_size, + exif_tags, workdir, quality, filter): """ Store a resized version of an image and return its pathname. @@ -51,17 +56,16 @@ def resize_image(proc_state, resized, keyname, target_name, new_size, exif_tags -- EXIF data for the original image workdir -- directory path for storing converted image files new_size -- 2-tuple size for the resized image + quality -- level of compression used when resizing images + filter -- One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS """ - config = mgg.global_config['media_type:mediagoblin.media_types.image'] - resized = exif_fix_image_orientation(resized, exif_tags) # Fix orientation - filter_config = config['resize_filter'] try: - resize_filter = PIL_FILTERS[filter_config.upper()] + resize_filter = PIL_FILTERS[filter.upper()] except KeyError: raise Exception('Filter "{0}" not found, choose one of {1}'.format( - unicode(filter_config), + unicode(filter), u', '.join(PIL_FILTERS.keys()))) resized.thumbnail(new_size, resize_filter) @@ -69,32 +73,36 @@ def resize_image(proc_state, resized, keyname, target_name, new_size, # Copy the new file to the conversion subdir, then remotely. tmp_resized_filename = os.path.join(workdir, target_name) with file(tmp_resized_filename, 'w') as resized_file: - resized.save(resized_file, quality=config['quality']) - proc_state.store_public(keyname, tmp_resized_filename, target_name) + resized.save(resized_file, quality=quality) + store_public(entry, keyname, tmp_resized_filename, target_name) + +def resize_tool(entry, + force, keyname, orig_file, target_name, + conversions_subdir, exif_tags, quality, filter, new_size=None): + # Use the default size if new_size was not given + if not new_size: + max_width = mgg.global_config['media:' + keyname]['max_width'] + max_height = mgg.global_config['media:' + keyname]['max_height'] + new_size = (max_width, max_height) -def resize_tool(proc_state, force, keyname, target_name, - conversions_subdir, exif_tags): - # filename -- the filename of the original image being resized - filename = proc_state.get_queued_filename() - max_width = mgg.global_config['media:' + keyname]['max_width'] - max_height = mgg.global_config['media:' + keyname]['max_height'] # 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. # Also created if the file needs rotation, or if forced. try: - im = Image.open(filename) + im = Image.open(orig_file) except IOError: raise BadMediaFail() if force \ - or im.size[0] > max_width \ - or im.size[1] > max_height \ + or im.size[0] > new_size[0]\ + or im.size[1] > new_size[1]\ or exif_image_needs_rotation(exif_tags): resize_image( - proc_state, im, unicode(keyname), target_name, - (max_width, max_height), - exif_tags, conversions_subdir) + entry, im, unicode(keyname), target_name, + tuple(new_size), + exif_tags, conversions_subdir, + quality, filter) SUPPORTED_FILETYPES = ['png', 'gif', 'jpg', 'jpeg', 'tiff'] @@ -119,53 +127,210 @@ def sniff_handler(media_file, **kw): return None -def process_image(proc_state): - """Code to process an image. Will be run by celery. - - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. +class CommonImageProcessor(MediaProcessor): """ - entry = proc_state.entry - workbench = proc_state.workbench - - # Conversions subdirectory to avoid collisions - conversions_subdir = os.path.join( - workbench.dir, 'conversions') - os.mkdir(conversions_subdir) - - queued_filename = proc_state.get_queued_filename() - name_builder = FilenameBuilder(queued_filename) - - # EXIF extraction - exif_tags = extract_exif(queued_filename) - gps_data = get_gps_data(exif_tags) - - # Always create a small thumbnail - resize_tool(proc_state, True, 'thumb', - name_builder.fill('{basename}.thumbnail{ext}'), - conversions_subdir, exif_tags) - - # Possibly create a medium - resize_tool(proc_state, False, 'medium', - name_builder.fill('{basename}.medium{ext}'), - conversions_subdir, exif_tags) - - # Copy our queued local workbench to its final destination - proc_state.copy_original(name_builder.fill('{basename}{ext}')) - - # Remove queued media file from storage and database - proc_state.delete_queue_file() - - # Insert exif data into database - exif_all = clean_exif(exif_tags) - - if len(exif_all): - entry.media_data_init(exif_all=exif_all) - - if len(gps_data): - for key in list(gps_data.keys()): - gps_data['gps_' + key] = gps_data.pop(key) - entry.media_data_init(**gps_data) + Provides a base for various media processing steps + """ + # list of acceptable file keys in order of prefrence for reprocessing + acceptable_files = ['original', 'medium'] + + def common_setup(self): + """ + Set up the workbench directory and pull down the original file + """ + self.image_config = mgg.global_config['plugins'][ + 'mediagoblin.media_types.image'] + + ## @@: Should this be two functions? + # Conversions subdirectory to avoid collisions + self.conversions_subdir = os.path.join( + self.workbench.dir, 'conversions') + os.mkdir(self.conversions_subdir) + + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) + + # Exif extraction + self.exif_tags = extract_exif(self.process_filename) + + def generate_medium_if_applicable(self, size=None, quality=None, + filter=None): + if not quality: + quality = self.image_config['quality'] + if not filter: + filter = self.image_config['resize_filter'] + + resize_tool(self.entry, False, 'medium', self.process_filename, + self.name_builder.fill('{basename}.medium{ext}'), + self.conversions_subdir, self.exif_tags, quality, + filter, size) + + def generate_thumb(self, size=None, quality=None, filter=None): + if not quality: + quality = self.image_config['quality'] + if not filter: + filter = self.image_config['resize_filter'] + + resize_tool(self.entry, True, 'thumb', self.process_filename, + self.name_builder.fill('{basename}.thumbnail{ext}'), + self.conversions_subdir, self.exif_tags, quality, + filter, size) + + def copy_original(self): + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) + + def extract_metadata(self): + # Is there any GPS data + gps_data = get_gps_data(self.exif_tags) + + # Insert exif data into database + exif_all = clean_exif(self.exif_tags) + + if len(exif_all): + self.entry.media_data_init(exif_all=exif_all) + + if len(gps_data): + for key in list(gps_data.keys()): + gps_data['gps_' + key] = gps_data.pop(key) + self.entry.media_data_init(**gps_data) + + +class InitialProcessor(CommonImageProcessor): + """ + Initial processing step for new images + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + ############################### + # Command line interface things + ############################### + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--thumb-size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--filter', + choices=['BICUBIC', 'BILINEAR', 'NEAREST', 'ANTIALIAS']) + + parser.add_argument( + '--quality', + type=int, + help='level of compression used when resizing images') + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'thumb_size', 'filter', 'quality']) + + def process(self, size=None, thumb_size=None, quality=None, filter=None): + self.common_setup() + self.generate_medium_if_applicable(size=size, filter=filter, + quality=quality) + self.generate_thumb(size=thumb_size, filter=filter, quality=quality) + self.copy_original() + self.extract_metadata() + self.delete_queue_file() + + +class Resizer(CommonImageProcessor): + """ + Resizing process steps for processed media + """ + name = 'resize' + description = 'Resize image' + thumb_size = 'size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in 'processed' + + ############################### + # Command line interface things + ############################### + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--filter', + choices=['BICUBIC', 'BILINEAR', 'NEAREST', 'ANTIALIAS']) + + parser.add_argument( + '--quality', + type=int, + help='level of compression used when resizing images') + + parser.add_argument( + 'file', + choices=['medium', 'thumb']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'file', 'quality', 'filter']) + + def process(self, file, size=None, filter=None, quality=None): + self.common_setup() + if file == 'medium': + self.generate_medium_if_applicable(size=size, filter=filter, + quality=quality) + elif file == 'thumb': + self.generate_thumb(size=size, filter=filter, quality=quality) + + +class ImageProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) if __name__ == '__main__': diff --git a/mediagoblin/media_types/pdf/__init__.py b/mediagoblin/media_types/pdf/__init__.py index 67509ddc..de70389e 100644 --- a/mediagoblin/media_types/pdf/__init__.py +++ b/mediagoblin/media_types/pdf/__init__.py @@ -15,21 +15,16 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.pdf.processing import process_pdf, \ +from mediagoblin.media_types.pdf.processing import PdfProcessingManager, \ sniff_handler -from mediagoblin.tools import pluginapi + ACCEPTED_EXTENSIONS = ['pdf'] MEDIA_TYPE = 'mediagoblin.media_types.pdf' -def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) - - class PDFMediaManager(MediaManagerBase): human_readable = "PDF" - processor = staticmethod(process_pdf) display_template = "mediagoblin/media_displays/pdf.html" default_thumb = "images/media_thumbs/pdf.jpg" @@ -40,8 +35,8 @@ def get_media_type_and_manager(ext): hooks = { - 'setup': setup_plugin, 'get_media_type_and_manager': get_media_type_and_manager, 'sniff_handler': sniff_handler, ('media_manager', MEDIA_TYPE): lambda: PDFMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: PdfProcessingManager, } diff --git a/mediagoblin/media_types/pdf/config_spec.ini b/mediagoblin/media_types/pdf/config_spec.ini new file mode 100644 index 00000000..c8a12cba --- /dev/null +++ b/mediagoblin/media_types/pdf/config_spec.ini @@ -0,0 +1,5 @@ +[plugin_spec] +pdf_js = boolean(default=True) + + + diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py index f35b4376..549def69 100644 --- a/mediagoblin/media_types/pdf/processing.py +++ b/mediagoblin/media_types/pdf/processing.py @@ -13,14 +13,18 @@ # # 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 argparse import os import logging import dateutil.parser from subprocess import PIPE, Popen from mediagoblin import mg_globals as mgg -from mediagoblin.processing import (create_pub_filepath, - FilenameBuilder, BadMediaFail) +from mediagoblin.processing import ( + FilenameBuilder, BadMediaFail, + MediaProcessor, ProcessingManager, + request_from_args, get_process_filename, + store_public, copy_original) from mediagoblin.tools.translate import fake_ugettext_passthrough as _ _log = logging.getLogger(__name__) @@ -230,51 +234,207 @@ def pdf_info(original): return ret_dict -def process_pdf(proc_state): - """Code to process a pdf file. Will be run by celery. - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. +class CommonPdfProcessor(MediaProcessor): """ - entry = proc_state.entry - workbench = proc_state.workbench - - queued_filename = proc_state.get_queued_filename() - name_builder = FilenameBuilder(queued_filename) - - # Copy our queued local workbench to its final destination - original_dest = name_builder.fill('{basename}{ext}') - proc_state.copy_original(original_dest) - - # Create a pdf if this is a different doc, store pdf for viewer - ext = queued_filename.rsplit('.', 1)[-1].lower() - if ext == 'pdf': - pdf_filename = queued_filename - else: - pdf_filename = queued_filename.rsplit('.', 1)[0] + '.pdf' + Provides a base for various pdf processing steps + """ + acceptable_files = ['original', 'pdf'] + + def common_setup(self): + """ + Set up common pdf processing steps + """ + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) + + self._set_pdf_filename() + + def _set_pdf_filename(self): + if self.name_builder.ext == '.pdf': + self.pdf_filename = self.process_filename + elif self.entry.media_files.get('pdf'): + self.pdf_filename = self.workbench.localized_file( + mgg.public_store, self.entry.media_files['pdf']) + else: + self.pdf_filename = self._generate_pdf() + + def copy_original(self): + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) + + 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']) + + # Note: pdftocairo adds '.png', so don't include an ext + thumb_filename = os.path.join(self.workbench.dir, + self.name_builder.fill( + '{basename}.thumbnail')) + + executable = where('pdftocairo') + args = [executable, '-scale-to', str(min(thumb_size)), + '-singlefile', '-png', self.pdf_filename, thumb_filename] + + _log.debug('calling {0}'.format(repr(' '.join(args)))) + Popen(executable=executable, args=args).wait() + + # since pdftocairo added '.png', we need to include it with the + # filename + store_public(self.entry, 'thumb', thumb_filename + '.png', + self.name_builder.fill('{basename}.thumbnail.png')) + + def _generate_pdf(self): + """ + Store the pdf. If the file is not a pdf, make it a pdf + """ + tmp_pdf = self.process_filename + unoconv = where('unoconv') Popen(executable=unoconv, - args=[unoconv, '-v', '-f', 'pdf', queued_filename]).wait() - if not os.path.exists(pdf_filename): + args=[unoconv, '-v', '-f', 'pdf', self.process_filename]).wait() + + if not os.path.exists(tmp_pdf): _log.debug('unoconv failed to convert file to pdf') raise BadMediaFail() - proc_state.store_public(keyname=u'pdf', local_file=pdf_filename) - - pdf_info_dict = pdf_info(pdf_filename) - - for name, width, height in [ - (u'thumb', mgg.global_config['media:thumb']['max_width'], - mgg.global_config['media:thumb']['max_height']), - (u'medium', mgg.global_config['media:medium']['max_width'], - mgg.global_config['media:medium']['max_height']), - ]: - filename = name_builder.fill('{basename}.%s.png' % name) - path = workbench.joinpath(filename) - create_pdf_thumb(pdf_filename, path, width, height) - assert(os.path.exists(path)) - proc_state.store_public(keyname=name, local_file=path) - - proc_state.delete_queue_file() - - entry.media_data_init(**pdf_info_dict) - entry.save() + + store_public(self.entry, 'pdf', tmp_pdf, + self.name_builder.fill('{basename}.pdf')) + + return self.workbench.localized_file( + mgg.public_store, self.entry.media_files['pdf']) + + def extract_pdf_info(self): + pdf_info_dict = pdf_info(self.pdf_filename) + self.entry.media_data_init(**pdf_info_dict) + + def generate_medium(self, size=None): + if not size: + size = (mgg.global_config['media:medium']['max_width'], + mgg.global_config['media:medium']['max_height']) + + # Note: pdftocairo adds '.png', so don't include an ext + filename = os.path.join(self.workbench.dir, + self.name_builder.fill('{basename}.medium')) + + executable = where('pdftocairo') + args = [executable, '-scale-to', str(min(size)), + '-singlefile', '-png', self.pdf_filename, filename] + + _log.debug('calling {0}'.format(repr(' '.join(args)))) + Popen(executable=executable, args=args).wait() + + # since pdftocairo added '.png', we need to include it with the + # filename + store_public(self.entry, 'medium', filename + '.png', + self.name_builder.fill('{basename}.medium.png')) + + +class InitialProcessor(CommonPdfProcessor): + """ + Initial processing step for new pdfs + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--thumb-size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'thumb_size']) + + def process(self, size=None, thumb_size=None): + self.common_setup() + self.extract_pdf_info() + self.copy_original() + self.generate_medium(size=size) + self.generate_thumb(thumb_size=thumb_size) + self.delete_queue_file() + + +class Resizer(CommonPdfProcessor): + """ + Resizing process steps for processed pdfs + """ + name = 'resize' + description = 'Resize thumbnail and medium' + thumb_size = 'size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + 'file', + choices=['medium', 'thumb']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'file']) + + def process(self, file, size=None): + self.common_setup() + if file == 'medium': + self.generate_medium(size=size) + elif file == 'thumb': + self.generate_thumb(thumb_size=size) + + +class PdfProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) diff --git a/mediagoblin/media_types/stl/__init__.py b/mediagoblin/media_types/stl/__init__.py index 1d2a8478..d5b56b4b 100644 --- a/mediagoblin/media_types/stl/__init__.py +++ b/mediagoblin/media_types/stl/__init__.py @@ -15,21 +15,16 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.stl.processing import process_stl, \ +from mediagoblin.media_types.stl.processing import StlProcessingManager, \ sniff_handler -from mediagoblin.tools import pluginapi + MEDIA_TYPE = 'mediagoblin.media_types.stl' ACCEPTED_EXTENSIONS = ["obj", "stl"] -def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) - - class STLMediaManager(MediaManagerBase): human_readable = "stereo lithographics" - processor = staticmethod(process_stl) display_template = "mediagoblin/media_displays/stl.html" default_thumb = "images/media_thumbs/video.jpg" @@ -39,8 +34,8 @@ def get_media_type_and_manager(ext): return MEDIA_TYPE, STLMediaManager hooks = { - 'setup': setup_plugin, 'get_media_type_and_manager': get_media_type_and_manager, 'sniff_handler': sniff_handler, ('media_manager', MEDIA_TYPE): lambda: STLMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: StlProcessingManager, } diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 53751416..77d3d86e 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -14,6 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import argparse import os import json import logging @@ -21,8 +22,11 @@ import subprocess import pkg_resources from mediagoblin import mg_globals as mgg -from mediagoblin.processing import create_pub_filepath, \ - FilenameBuilder +from mediagoblin.processing import ( + FilenameBuilder, MediaProcessor, + ProcessingManager, request_from_args, + get_process_filename, store_public, + copy_original) from mediagoblin.media_types.stl import model_loader @@ -75,49 +79,61 @@ def blender_render(config): env=env) -def process_stl(proc_state): - """Code to process an stl or obj model. Will be run by celery. - - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. +class CommonStlProcessor(MediaProcessor): """ - entry = proc_state.entry - workbench = proc_state.workbench - - queued_filepath = entry.queued_media_file - queued_filename = workbench.localized_file( - mgg.queue_store, queued_filepath, 'source') - name_builder = FilenameBuilder(queued_filename) - - ext = queued_filename.lower().strip()[-4:] - if ext.startswith("."): - ext = ext[1:] - else: - ext = None - - # Attempt to parse the model file and divine some useful - # information about it. - with open(queued_filename, 'rb') as model_file: - model = model_loader.auto_detect(model_file, ext) - - # generate preview images - greatest = [model.width, model.height, model.depth] - greatest.sort() - greatest = greatest[-1] - - def snap(name, camera, width=640, height=640, project="ORTHO"): - filename = name_builder.fill(name) - workbench_path = workbench.joinpath(filename) + Provides a common base for various stl processing steps + """ + acceptable_files = ['original'] + + def common_setup(self): + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) + + self._set_ext() + self._set_model() + self._set_greatest() + + def _set_ext(self): + ext = self.name_builder.ext[1:] + + if not ext: + ext = None + + self.ext = ext + + def _set_model(self): + """ + Attempt to parse the model file and divine some useful + information about it. + """ + with open(self.process_filename, 'rb') as model_file: + self.model = model_loader.auto_detect(model_file, self.ext) + + def _set_greatest(self): + greatest = [self.model.width, self.model.height, self.model.depth] + greatest.sort() + self.greatest = greatest[-1] + + def copy_original(self): + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) + + def _snap(self, keyname, name, camera, size, project="ORTHO"): + filename = self.name_builder.fill(name) + workbench_path = self.workbench.joinpath(filename) shot = { - "model_path": queued_filename, - "model_ext": ext, + "model_path": self.process_filename, + "model_ext": self.ext, "camera_coord": camera, - "camera_focus": model.average, - "camera_clip": greatest*10, - "greatest": greatest, + "camera_focus": self.model.average, + "camera_clip": self.greatest*10, + "greatest": self.greatest, "projection": project, - "width": width, - "height": height, + "width": size[0], + "height": size[1], "out_file": workbench_path, } blender_render(shot) @@ -126,70 +142,191 @@ def process_stl(proc_state): assert os.path.exists(workbench_path) # copy it up! - with open(workbench_path, 'rb') as rendered_file: - public_path = create_pub_filepath(entry, filename) - - with mgg.public_store.get_file(public_path, "wb") as public_file: - public_file.write(rendered_file.read()) - - return public_path - - thumb_path = snap( - "{basename}.thumb.jpg", - [0, greatest*-1.5, greatest], - mgg.global_config['media:thumb']['max_width'], - mgg.global_config['media:thumb']['max_height'], - project="PERSP") - - perspective_path = snap( - "{basename}.perspective.jpg", - [0, greatest*-1.5, greatest], project="PERSP") - - topview_path = snap( - "{basename}.top.jpg", - [model.average[0], model.average[1], greatest*2]) - - frontview_path = snap( - "{basename}.front.jpg", - [model.average[0], greatest*-2, model.average[2]]) - - sideview_path = snap( - "{basename}.side.jpg", - [greatest*-2, model.average[1], model.average[2]]) - - ## Save the public file stuffs - model_filepath = create_pub_filepath( - entry, name_builder.fill('{basename}{ext}')) - - with mgg.public_store.get_file(model_filepath, 'wb') as model_file: - with open(queued_filename, 'rb') as queued_file: - model_file.write(queued_file.read()) - - # Remove queued media file from storage and database. - # queued_filepath is in the task_id directory which should - # be removed too, but fail if the directory is not empty to be on - # the super-safe side. - mgg.queue_store.delete_file(queued_filepath) # rm file - mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir - entry.queued_media_file = [] - - # Insert media file information into database - media_files_dict = entry.setdefault('media_files', {}) - media_files_dict[u'original'] = model_filepath - media_files_dict[u'thumb'] = thumb_path - media_files_dict[u'perspective'] = perspective_path - media_files_dict[u'top'] = topview_path - media_files_dict[u'side'] = sideview_path - media_files_dict[u'front'] = frontview_path - - # Put model dimensions into the database - dimensions = { - "center_x" : model.average[0], - "center_y" : model.average[1], - "center_z" : model.average[2], - "width" : model.width, - "height" : model.height, - "depth" : model.depth, - "file_type" : ext, - } - entry.media_data_init(**dimensions) + store_public(self.entry, keyname, workbench_path, filename) + + 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']) + + self._snap( + "thumb", + "{basename}.thumb.jpg", + [0, self.greatest*-1.5, self.greatest], + thumb_size, + project="PERSP") + + def generate_perspective(self, size=None): + if not size: + size = (mgg.global_config['media:medium']['max_width'], + mgg.global_config['media:medium']['max_height']) + + self._snap( + "perspective", + "{basename}.perspective.jpg", + [0, self.greatest*-1.5, self.greatest], + size, + project="PERSP") + + def generate_topview(self, size=None): + if not size: + size = (mgg.global_config['media:medium']['max_width'], + mgg.global_config['media:medium']['max_height']) + + self._snap( + "top", + "{basename}.top.jpg", + [self.model.average[0], self.model.average[1], + self.greatest*2], + 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']) + + self._snap( + "front", + "{basename}.front.jpg", + [self.model.average[0], self.greatest*-2, + self.model.average[2]], + 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']) + + self._snap( + "side", + "{basename}.side.jpg", + [self.greatest*-2, self.model.average[1], + self.model.average[2]], + size) + + def store_dimensions(self): + """ + Put model dimensions into the database + """ + dimensions = { + "center_x": self.model.average[0], + "center_y": self.model.average[1], + "center_z": self.model.average[2], + "width": self.model.width, + "height": self.model.height, + "depth": self.model.depth, + "file_type": self.ext, + } + self.entry.media_data_init(**dimensions) + + +class InitialProcessor(CommonStlProcessor): + """ + Initial processing step for new stls + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'thumb_size']) + + def process(self, size=None, thumb_size=None): + self.common_setup() + self.generate_thumb(thumb_size=thumb_size) + self.generate_perspective(size=size) + self.generate_topview(size=size) + self.generate_frontview(size=size) + self.generate_sideview(size=size) + self.store_dimensions() + self.copy_original() + self.delete_queue_file() + + +class Resizer(CommonStlProcessor): + """ + Resizing process steps for processed stls + """ + name = 'resize' + description = 'Resize thumbnail and mediums' + thumb_size = 'size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + """ + Determine if this media type is eligible for processing + """ + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + 'file', + choices=['medium', 'thumb']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['size', 'file']) + + def process(self, file, size=None): + self.common_setup() + if file == 'medium': + self.generate_perspective(size=size) + self.generate_topview(size=size) + self.generate_frontview(size=size) + self.generate_sideview(size=size) + elif file == 'thumb': + self.generate_thumb(thumb_size=size) + + +class StlProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py index e8a4308b..c85cc0b2 100644 --- a/mediagoblin/media_types/video/__init__.py +++ b/mediagoblin/media_types/video/__init__.py @@ -15,27 +15,22 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from mediagoblin.media_types import MediaManagerBase -from mediagoblin.media_types.video.processing import process_video, \ +from mediagoblin.media_types.video.processing import VideoProcessingManager, \ sniff_handler -from mediagoblin.tools import pluginapi + MEDIA_TYPE = 'mediagoblin.media_types.video' ACCEPTED_EXTENSIONS = [ "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"] -def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) - - class VideoMediaManager(MediaManagerBase): human_readable = "Video" - processor = staticmethod(process_video) display_template = "mediagoblin/media_displays/video.html" default_thumb = "images/media_thumbs/video.jpg" # Used by the media_entry.get_display_media method - media_fetch_order = [u'webm_640', u'original'] + media_fetch_order = [u'webm_video', u'original'] default_webm_type = 'video/webm; codecs="vp8, vorbis"' @@ -44,8 +39,8 @@ def get_media_type_and_manager(ext): return MEDIA_TYPE, VideoMediaManager hooks = { - 'setup': setup_plugin, 'get_media_type_and_manager': get_media_type_and_manager, 'sniff_handler': sniff_handler, ('media_manager', MEDIA_TYPE): lambda: VideoMediaManager, + ('reprocess_manager', MEDIA_TYPE): lambda: VideoProcessingManager, } diff --git a/mediagoblin/media_types/video/config_spec.ini b/mediagoblin/media_types/video/config_spec.ini new file mode 100644 index 00000000..98714f56 --- /dev/null +++ b/mediagoblin/media_types/video/config_spec.ini @@ -0,0 +1,22 @@ +[plugin_spec] +# Should we keep the original file? +keep_original = boolean(default=False) + +# 0 means autodetect, autodetect means number_of_CPUs - 1 +vp8_threads = integer(default=0) +# Range: 0..10 +vp8_quality = integer(default=8) +# Range: -0.1..1 +vorbis_quality = float(default=0.3) + +# Autoplay the video when page is loaded? +auto_play = boolean(default=False) + +[[skip_transcode]] +mime_types = string_list(default=list("video/webm")) +container_formats = string_list(default=list("Matroska")) +video_codecs = string_list(default=list("VP8 video")) +audio_codecs = string_list(default=list("Vorbis")) +dimensions_match = boolean(default=True) + + diff --git a/mediagoblin/media_types/video/migrations.py b/mediagoblin/media_types/video/migrations.py index 442bbd8d..d68e2933 100644 --- a/mediagoblin/media_types/video/migrations.py +++ b/mediagoblin/media_types/video/migrations.py @@ -20,6 +20,7 @@ from sqlalchemy import MetaData, Column, Unicode MIGRATIONS = {} + @RegisterMigration(1, MIGRATIONS) def add_orig_metadata_column(db_conn): metadata = MetaData(bind=db_conn.bind) @@ -30,3 +31,19 @@ def add_orig_metadata_column(db_conn): default=None, nullable=True) col.create(vid_data) db_conn.commit() + + +@RegisterMigration(2, MIGRATIONS) +def webm_640_to_webm_video(db): + metadata = MetaData(bind=db.bind) + + file_keynames = inspect_table(metadata, 'core__file_keynames') + + for row in db.execute(file_keynames.select()): + if row.name == 'webm_640': + db.execute( + file_keynames.update(). \ + where(file_keynames.c.id==row.id).\ + values(name='webm_video')) + + db.commit() diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py index 0b52c53f..be9d258f 100644 --- a/mediagoblin/media_types/video/models.py +++ b/mediagoblin/media_types/video/models.py @@ -36,12 +36,12 @@ class VideoData(Base): - orig_metadata: A loose json structure containing metadata gstreamer pulled from the original video. This field is NOT GUARANTEED to exist! - + Likely metadata extracted: "videoheight", "videolength", "videowidth", "audiorate", "audiolength", "audiochannels", "audiowidth", "mimetype", "tags" - + TODO: document the above better. """ __tablename__ = "video__mediadata" @@ -68,7 +68,7 @@ class VideoData(Base): """ orig_metadata = self.orig_metadata or {} - if "webm_640" not in self.get_media_entry.media_files \ + if "webm_video" not in self.get_media_entry.media_files \ and "mimetype" in orig_metadata \ and "tags" in orig_metadata \ and "audio-codec" in orig_metadata["tags"] \ diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 857c1647..4d1d5ea2 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -14,13 +14,18 @@ # 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 argparse import os.path import logging import datetime from mediagoblin import mg_globals as mgg -from mediagoblin.processing import \ - create_pub_filepath, FilenameBuilder, BaseProcessingFail, ProgressCallback +from mediagoblin.processing import ( + FilenameBuilder, BaseProcessingFail, + ProgressCallback, MediaProcessor, + ProcessingManager, request_from_args, + get_process_filename, store_public, + copy_original) from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from . import transcoders @@ -48,115 +53,15 @@ def sniff_handler(media_file, **kw): if not data: _log.error('Could not discover {0}'.format( - kw.get('media'))) + kw.get('media'))) return None - if data['is_video'] == True: + if data['is_video'] is True: return MEDIA_TYPE return None -def process_video(proc_state): - """ - Process a video entry, transcode the queued media files (originals) and - create a thumbnail for the entry. - - A Workbench() represents a local tempory dir. It is automatically - cleaned up when this function exits. - """ - entry = proc_state.entry - workbench = proc_state.workbench - video_config = mgg.global_config['media_type:mediagoblin.media_types.video'] - - queued_filepath = entry.queued_media_file - queued_filename = proc_state.get_queued_filename() - name_builder = FilenameBuilder(queued_filename) - - medium_basename = name_builder.fill('{basename}-640p.webm') - medium_filepath = create_pub_filepath(entry, medium_basename) - - thumbnail_basename = name_builder.fill('{basename}.thumbnail.jpg') - thumbnail_filepath = create_pub_filepath(entry, thumbnail_basename) - - # Create a temporary file for the video destination (cleaned up with workbench) - tmp_dst = os.path.join(workbench.dir, medium_basename) - # Transcode queued file to a VP8/vorbis file that fits in a 640x640 square - progress_callback = ProgressCallback(entry) - - dimensions = ( - mgg.global_config['media:medium']['max_width'], - mgg.global_config['media:medium']['max_height']) - - # Extract metadata and keep a record of it - metadata = transcoders.VideoTranscoder().discover(queued_filename) - store_metadata(entry, metadata) - - # Figure out whether or not we need to transcode this video or - # if we can skip it - if skip_transcode(metadata): - _log.debug('Skipping transcoding') - - dst_dimensions = metadata['videowidth'], metadata['videoheight'] - - # Push original file to public storage - _log.debug('Saving original...') - proc_state.copy_original(queued_filepath[-1]) - - did_transcode = False - else: - transcoder = transcoders.VideoTranscoder() - - transcoder.transcode(queued_filename, tmp_dst, - vp8_quality=video_config['vp8_quality'], - vp8_threads=video_config['vp8_threads'], - vorbis_quality=video_config['vorbis_quality'], - progress_callback=progress_callback, - dimensions=dimensions) - - dst_dimensions = transcoder.dst_data.videowidth,\ - transcoder.dst_data.videoheight - - # Push transcoded video to public storage - _log.debug('Saving medium...') - mgg.public_store.copy_local_to_storage(tmp_dst, medium_filepath) - _log.debug('Saved medium') - - entry.media_files['webm_640'] = medium_filepath - - did_transcode = True - - # Save the width and height of the transcoded video - entry.media_data_init( - width=dst_dimensions[0], - height=dst_dimensions[1]) - - # Temporary file for the video thumbnail (cleaned up with workbench) - tmp_thumb = os.path.join(workbench.dir, thumbnail_basename) - - # Create a thumbnail.jpg that fits in a 180x180 square - transcoders.VideoThumbnailerMarkII( - queued_filename, - tmp_thumb, - 180) - - # Push the thumbnail to public storage - _log.debug('Saving thumbnail...') - mgg.public_store.copy_local_to_storage(tmp_thumb, thumbnail_filepath) - entry.media_files['thumb'] = thumbnail_filepath - - # save the original... but only if we did a transcoding - # (if we skipped transcoding and just kept the original anyway as the main - # media, then why would we save the original twice?) - if video_config['keep_original'] and did_transcode: - # Push original file to public storage - _log.debug('Saving original...') - proc_state.copy_original(queued_filepath[-1]) - - # Remove queued media file from storage and database - proc_state.delete_queue_file() - - def store_metadata(media_entry, metadata): """ Store metadata from this video for this media entry. @@ -165,9 +70,9 @@ def store_metadata(media_entry, metadata): stored_metadata = dict( [(key, metadata[key]) for key in [ - "videoheight", "videolength", "videowidth", - "audiorate", "audiolength", "audiochannels", "audiowidth", - "mimetype"] + "videoheight", "videolength", "videowidth", + "audiorate", "audiolength", "audiochannels", "audiowidth", + "mimetype"] if key in metadata]) # We have to convert videorate into a sequence because it's a @@ -186,10 +91,10 @@ def store_metadata(media_entry, metadata): tags = dict( [(key, tags_metadata[key]) for key in [ - "application-name", "artist", "audio-codec", "bitrate", - "container-format", "copyright", "encoder", - "encoder-version", "license", "nominal-bitrate", "title", - "video-codec"] + "application-name", "artist", "audio-codec", "bitrate", + "container-format", "copyright", "encoder", + "encoder-version", "license", "nominal-bitrate", "title", + "video-codec"] if key in tags_metadata]) if 'date' in tags_metadata: date = tags_metadata['date'] @@ -211,3 +116,297 @@ def store_metadata(media_entry, metadata): if len(stored_metadata): media_entry.media_data_init( orig_metadata=stored_metadata) + + +class CommonVideoProcessor(MediaProcessor): + """ + Provides a base for various video processing steps + """ + acceptable_files = ['original', 'best_quality', 'webm_video'] + + def common_setup(self): + self.video_config = mgg \ + .global_config['plugins'][MEDIA_TYPE] + + # Pull down and set up the processing file + self.process_filename = get_process_filename( + self.entry, self.workbench, self.acceptable_files) + self.name_builder = FilenameBuilder(self.process_filename) + + self.transcoder = transcoders.VideoTranscoder() + self.did_transcode = False + + def copy_original(self): + # If we didn't transcode, then we need to keep the original + if not self.did_transcode or \ + (self.video_config['keep_original'] and self.did_transcode): + copy_original( + self.entry, self.process_filename, + self.name_builder.fill('{basename}{ext}')) + + def _keep_best(self): + """ + If there is no original, keep the best file that we have + """ + if not self.entry.media_files.get('best_quality'): + # Save the best quality file if no original? + if not self.entry.media_files.get('original') and \ + self.entry.media_files.get('webm_video'): + self.entry.media_files['best_quality'] = self.entry \ + .media_files['webm_video'] + + + def transcode(self, medium_size=None, vp8_quality=None, vp8_threads=None, + vorbis_quality=None): + progress_callback = ProgressCallback(self.entry) + tmp_dst = os.path.join(self.workbench.dir, + self.name_builder.fill('{basename}.medium.webm')) + + if not medium_size: + medium_size = ( + mgg.global_config['media:medium']['max_width'], + mgg.global_config['media:medium']['max_height']) + if not vp8_quality: + vp8_quality = self.video_config['vp8_quality'] + if not vp8_threads: + vp8_threads = self.video_config['vp8_threads'] + if not vorbis_quality: + vorbis_quality = self.video_config['vorbis_quality'] + + # Extract metadata and keep a record of it + metadata = self.transcoder.discover(self.process_filename) + store_metadata(self.entry, metadata) + + # Figure out whether or not we need to transcode this video or + # if we can skip it + if skip_transcode(metadata, medium_size): + _log.debug('Skipping transcoding') + + dst_dimensions = metadata['videowidth'], metadata['videoheight'] + + # If there is an original and transcoded, delete the transcoded + # since it must be of lower quality then the original + if self.entry.media_files.get('original') and \ + self.entry.media_files.get('webm_video'): + self.entry.media_files['webm_video'].delete() + + else: + self.transcoder.transcode(self.process_filename, tmp_dst, + vp8_quality=vp8_quality, + vp8_threads=vp8_threads, + vorbis_quality=vorbis_quality, + progress_callback=progress_callback, + dimensions=tuple(medium_size)) + + dst_dimensions = self.transcoder.dst_data.videowidth,\ + self.transcoder.dst_data.videoheight + + self._keep_best() + + # Push transcoded video to public storage + _log.debug('Saving medium...') + store_public(self.entry, 'webm_video', tmp_dst, + self.name_builder.fill('{basename}.medium.webm')) + _log.debug('Saved medium') + + self.did_transcode = True + + # Save the width and height of the transcoded video + self.entry.media_data_init( + width=dst_dimensions[0], + height=dst_dimensions[1]) + + def generate_thumb(self, thumb_size=None): + # Temporary file for the video thumbnail (cleaned up with workbench) + tmp_thumb = os.path.join(self.workbench.dir, + self.name_builder.fill( + '{basename}.thumbnail.jpg')) + + if not thumb_size: + thumb_size = (mgg.global_config['media:thumb']['max_width'],) + + # We will only use the width so that the correct scale is kept + transcoders.VideoThumbnailerMarkII( + self.process_filename, + tmp_thumb, + thumb_size[0]) + + # Push the thumbnail to public storage + _log.debug('Saving thumbnail...') + store_public(self.entry, 'thumb', tmp_thumb, + self.name_builder.fill('{basename}.thumbnail.jpg')) + + +class InitialProcessor(CommonVideoProcessor): + """ + Initial processing steps for new video + """ + name = "initial" + description = "Initial processing" + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + if not state: + state = entry.state + return state in ( + "unprocessed", "failed") + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--medium_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--vp8_quality', + type=int, + help='Range 0..10') + + parser.add_argument( + '--vp8_threads', + type=int, + help='0 means number_of_CPUs - 1') + + parser.add_argument( + '--vorbis_quality', + type=float, + help='Range -0.1..1') + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['medium_size', 'vp8_quality', 'vp8_threads', + 'vorbis_quality', 'thumb_size']) + + def process(self, medium_size=None, vp8_threads=None, vp8_quality=None, + vorbis_quality=None, thumb_size=None): + self.common_setup() + + self.transcode(medium_size=medium_size, vp8_quality=vp8_quality, + vp8_threads=vp8_threads, vorbis_quality=vorbis_quality) + + self.copy_original() + self.generate_thumb(thumb_size=thumb_size) + self.delete_queue_file() + + +class Resizer(CommonVideoProcessor): + """ + Video thumbnail resizing process steps for processed media + """ + name = 'resize' + description = 'Resize thumbnail' + thumb_size = 'thumb_size' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--thumb_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + # Needed for gmg reprocess thumbs to work + parser.add_argument( + 'file', + nargs='?', + default='thumb', + choices=['thumb']) + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['thumb_size', 'file']) + + def process(self, thumb_size=None, file=None): + self.common_setup() + self.generate_thumb(thumb_size=thumb_size) + + +class Transcoder(CommonVideoProcessor): + """ + Transcoding processing steps for processed video + """ + name = 'transcode' + description = 'Re-transcode video' + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + if not state: + state = entry.state + return state in 'processed' + + @classmethod + def generate_parser(cls): + parser = argparse.ArgumentParser( + description=cls.description, + prog=cls.name) + + parser.add_argument( + '--medium_size', + nargs=2, + metavar=('max_width', 'max_height'), + type=int) + + parser.add_argument( + '--vp8_quality', + type=int, + help='Range 0..10') + + parser.add_argument( + '--vp8_threads', + type=int, + help='0 means number_of_CPUs - 1') + + parser.add_argument( + '--vorbis_quality', + type=float, + help='Range -0.1..1') + + return parser + + @classmethod + def args_to_request(cls, args): + return request_from_args( + args, ['medium_size', 'vp8_threads', 'vp8_quality', + 'vorbis_quality']) + + def process(self, medium_size=None, vp8_quality=None, vp8_threads=None, + vorbis_quality=None): + self.common_setup() + self.transcode(medium_size=medium_size, vp8_threads=vp8_threads, + vp8_quality=vp8_quality, vorbis_quality=vorbis_quality) + + +class VideoProcessingManager(ProcessingManager): + def __init__(self): + super(self.__class__, self).__init__() + self.add_processor(InitialProcessor) + self.add_processor(Resizer) + self.add_processor(Transcoder) diff --git a/mediagoblin/media_types/video/util.py b/mediagoblin/media_types/video/util.py index 5765ecfb..beb10129 100644 --- a/mediagoblin/media_types/video/util.py +++ b/mediagoblin/media_types/video/util.py @@ -21,13 +21,13 @@ from mediagoblin import mg_globals as mgg _log = logging.getLogger(__name__) -def skip_transcode(metadata): +def skip_transcode(metadata, size): ''' Checks video metadata against configuration values for skip_transcode. Returns True if the video matches the requirements in the configuration. ''' - config = mgg.global_config['media_type:mediagoblin.media_types.video']\ + config = mgg.global_config['plugins']['mediagoblin.media_types.video']\ ['skip_transcode'] medium_config = mgg.global_config['media:medium'] @@ -51,9 +51,9 @@ def skip_transcode(metadata): return False if config['dimensions_match']: - if not metadata['videoheight'] <= medium_config['max_height']: + if not metadata['videoheight'] <= size[1]: return False - if not metadata['videowidth'] <= medium_config['max_width']: + if not metadata['videowidth'] <= size[0]: return False return True diff --git a/mediagoblin/notifications/__init__.py b/mediagoblin/notifications/__init__.py index ed9f8d78..b6f9f478 100644 --- a/mediagoblin/notifications/__init__.py +++ b/mediagoblin/notifications/__init__.py @@ -17,7 +17,8 @@ import logging from mediagoblin.db.models import Notification, \ - CommentNotification, CommentSubscription + CommentNotification, CommentSubscription, User +from mediagoblin.notifications.task import email_notification_task from mediagoblin.notifications.tools import generate_comment_message _log = logging.getLogger(__name__) @@ -121,6 +122,12 @@ NOTIFICATION_FETCH_LIMIT = 100 def get_notifications(user_id, only_unseen=True): query = Notification.query.filter_by(user_id=user_id) + wants_notifications = User.query.filter_by(id=user_id).first()\ + .wants_notifications + + # If the user does not want notifications, don't return any + if not wants_notifications: + return None if only_unseen: query = query.filter_by(seen=False) @@ -130,12 +137,19 @@ def get_notifications(user_id, only_unseen=True): return notifications + def get_notification_count(user_id, only_unseen=True): query = Notification.query.filter_by(user_id=user_id) + wants_notifications = User.query.filter_by(id=user_id).first()\ + .wants_notifications if only_unseen: query = query.filter_by(seen=False) - count = query.count() + # If the user doesn't want notifications, don't show any + if not wants_notifications: + count = None + else: + count = query.count() return count diff --git a/mediagoblin/notifications/routing.py b/mediagoblin/notifications/routing.py index e57956d3..cd7bbc21 100644 --- a/mediagoblin/notifications/routing.py +++ b/mediagoblin/notifications/routing.py @@ -23,3 +23,7 @@ add_route('mediagoblin.notifications.subscribe_comments', add_route('mediagoblin.notifications.silence_comments', '/u/<string:user>/m/<string:media>/notifications/silence/', 'mediagoblin.notifications.views:silence_comments') + +add_route('mediagoblin.notifications.mark_all_comment_notifications_seen', + '/notifications/comments/mark_all_seen/', + 'mediagoblin.notifications.views:mark_all_comment_notifications_seen') diff --git a/mediagoblin/notifications/views.py b/mediagoblin/notifications/views.py index d275bc92..cfe66b2e 100644 --- a/mediagoblin/notifications/views.py +++ b/mediagoblin/notifications/views.py @@ -14,19 +14,15 @@ # 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.tools.response import render_to_response, render_404, redirect +from mediagoblin.tools.response import redirect from mediagoblin.tools.translate import pass_to_ugettext as _ -from mediagoblin.decorators import (uses_pagination, get_user_media_entry, - get_media_entry_by_id, - require_active_login, user_may_delete_media, user_may_alter_collection, - get_user_collection, get_user_collection_item, active_user_from_url) - +from mediagoblin.decorators import get_user_media_entry, require_active_login from mediagoblin import messages -from mediagoblin.notifications import add_comment_subscription, \ - silence_comment_subscription +from mediagoblin.notifications import (add_comment_subscription, + silence_comment_subscription, mark_comment_notification_seen, + get_notifications) -from werkzeug.exceptions import BadRequest @get_user_media_entry @require_active_login @@ -41,6 +37,7 @@ def subscribe_comments(request, media): return redirect(request, location=media.url_for_self(request.urlgen)) + @get_user_media_entry @require_active_login def silence_comments(request, media): @@ -52,3 +49,17 @@ def silence_comments(request, media): ' %s.') % media.title) return redirect(request, location=media.url_for_self(request.urlgen)) + + +@require_active_login +def mark_all_comment_notifications_seen(request): + """ + Marks all comment notifications seen. + """ + for comment in get_notifications(request.user.id): + mark_comment_notification_seen(comment.subject_id, request.user) + + if request.GET.get('next'): + return redirect(request, location=request.GET.get('next')) + else: + return redirect(request, 'index') diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html index 2e63e1f8..88b232f8 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html @@ -17,9 +17,8 @@ #} {% block openid_edit_link %} - <p> - <a href="{{ request.urlgen('mediagoblin.plugins.openid.edit') }}"> - {% trans %}Edit your OpenID's{% endtrans %} - </a> - </p> + <a href="{{ request.urlgen('mediagoblin.plugins.openid.edit') }}"> + {% trans %}OpenID's{% endtrans %} + </a> + · {% endblock %} diff --git a/mediagoblin/plugins/persona/static/js/persona.js b/mediagoblin/plugins/persona/static/js/persona.js index a6def398..76a7757a 100644 --- a/mediagoblin/plugins/persona/static/js/persona.js +++ b/mediagoblin/plugins/persona/static/js/persona.js @@ -17,14 +17,20 @@ */ $(document).ready(function () { + var requestParams = { + backgroundColor: "#171717", + siteName: "GNU MediaGoblin", + siteLogo: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAA0IklEQVR4XuSYS2gUSRyHq6ofk8kDZXycRTwEcfGgboIgBOMTFoxZ8LYXwcWDd/HoRUFPHvbg47gXQeMugqC7iiIeoht0IeDFg+ID8RBNYpKZ6e4qPyYVu5meBhkmSU9S8PHvamro6v76V93TUuSkHdz3q7z7701Tt6+b0gnr4SfYBptgM6yDEvSADwIq8BUmLK/gDbyE/2AKZjjOdNaxl5tlFXJgcFhJKR1EBAkJ/ZRdlu2wFdwWedcwDi9gDEYRMZoQ41Ei9ulVJWT/3qNSKeUuiEDCDspJOAxroQuSzTQ/5+zfJtL0yBhz4d79kXF7o/iUgL5ZNQlBQokyBOdhIwgIQFmWYm4aInBBwns4i5wbyPi8YhNCAhzSENntnym/we/gJy6KAyp1e5t4olJZaqqMrbYfj7fI+b62iHhsRopC8Gy/DFfhT+b9NHkObS8EAT4yqtRNdK9BH3QnLoTMkuC4BrDkGKEYJUCmZp0Skt6matChBK68lkI2OnJ6TmV4DMeR8W7hXNpdSA/lHJwCDaJBEiCW4PrzFV2tb1ZgGEJVCR0lxGUvaR78YYw5w1I23VZCeGCrfx7c0lbGCcpFWANV8EAmk6AUIMG1aZAyTsjiEh8rIjlhIJBDgnTDZa0KPnyB06Tkik2/YlvnVghvJy53UIiUDUqpO+za2XBpoicVEgqiJkLKHLz8m1hOtSLnsyEzl7JRGEbGB85ZkRqd24Qg5ZiU8no6EfFd6fpGeJDnFlatmGRLyxkKw/D2/Yd/t0yIaoEAZePrwGUrIwAf5PeHqxVR7NbCLxiR9+Yyx84eHd846SlX4C/HcS4N7PnFy1VCBgeOlFzXfWD/WZv654TrGeF3GKFUrd9eTeIiEqRFiShIXTENCv6H3RDat7DlE0IqeilPYG2jxCGiJmQltDBgGSvLrLexMvQi5O2SL1lIcBLfncagBLEMQ4cRxS7dlAxjDORNol1yOSelUnOT4MJr+xlIUOWSJgQZhygjUEwuUwY8u0St5FYhKVGQmZY+eG6M0fZ72KInpN/K6KgXWyjEMppNxtTHCTH1acLu+2GxqfHlclmEYVhL7NzcXK1fqVTE7MysmJycrNVGTWtdP6dUajuKRngFkyXkGWyxMhYnIQvv2/aZMQad9WMKiHD85v9hfyvvPaAsu8o7398+6cbKqburOudWd0tqqZUjSEjI5GD7EUQQPMRgj70MzJhZToPtsZ+xgWcPb8AYPBhsEGDikCwJkBDKoZU6q3N1pa548wl7v7O+dc7qW0F0Xut53qe119Gte+rW7f3f/y/tb39HRxplKUae2IsfBfRtW4vruliWxWmITGR6786dO9FRRMP3qZQrVGtVlFLp+wJUNpulra2Ngf5+FAptDJlMBs/zsG2LTDb7coDLZykFQaDwa/OYUgOyxphNMSi7L5jKuuXmN3Tatr0P6JzrTWVyBts9ezDSCfV9n6Gn99GXb+dEp2HZsmXCEnWK6DG956WXXmL3bpkDAj/AYGjPFrm0bw2hjujMteKHAZP1EuWwzlhlmhm/Qi1s4Cgbx3awlMIPfTJuBqPAdh06OzvZsGED+Xx+1t9DIaqrMR8UgFFgPVCLjX3jvAJyw7V32Llc7ilgy1xVJ2A4hnORdOWVSiWOPbOXX1tzJV8/9gjbr7wiXfkpMAsCUS6XefqppxmfGGegrYe8k+Gqgc2U/Spb+1YT6UgAj4zBoJHJdx0828NzXXkviALGylMxWGUMEKGZrsww6VfYOXKQkl9j0eJFbNu2DcdxaJYoUjSqC4KyIwbj0lizuPE1OEdAxF44MbphfP2cpMzPs5pqZkfKkF2PPMPbNt/CsyMvsd+aYPPmzQuqjBSo44PHefyJx+W9V6zcxhX9Gyh4OfwoxEKJ+kMBSmEri5jluJaL7QojUJaFsuOhbJQBO1FrlrLxwwZ1v8GxiSGOxmOoPMGJqMKmy7aKemtmbxTOY0oE2Eka/52ns1WsTtNu/DpwzxxvSgy4kzk3MJonGGBycpKjz+/j9auv4cj0CI+P7GHxosW0DHQTBgH5QmHWRAwPD/PoI4+yqKWL12+4lvZMUSbUUpYwQWGJXXK9DMoI8AJIPMRWeG4Wy1IYDADaICrLsgU4gkZA3a8ThgGVWoVypcRweZKD1VE6NgwIKCmDURA0lIwmCQEHeF8MxhfOkSGSve21LGsECACXBA3HOzdvKgUg9nbE8zlw4AC61GBL70r6iz30FNswGvLZrKzKqaDKiClRLpUIXUX/0gEGR4coTGmWtPVwy9rtjJenAcQRsC0bjSEMQ3nt2BbGgO24WJaNAmGX6zlYtkMUhvK+BgHTccWWiGNQq1Ypl0s0/DqNoIEC7j3wJLumjnHrrbfOciaUgnrVIgqZKzPApcChX5UhdjiFxGD8oCn9LGI5nDUY6Zc/evQow0NDHBscZH3nUrbE47pNWzAGGqGP2EsUjuOyqmsAY7QAmRvIcixmTmm6Sl53ceXmi7CVzVStgus4Mtme66HRGB3heS6u7aIsW4DxMhmMTDoox8HNeigUfqVGFISoKBTGWNrgeC6hEYDJZXMoECYFYQAGsVsx4MKk5lRRNqepVSy0pllagf8Rg3Hbr7InzilU1vuTFLqZbTf0WTMjBkNc0r1798rrt2y4kZWd/RSyObQBgyHjegJcJpNFoUR1KGWBglBreoqd9BW7BCw34wkIdhRgIo3lOKAjud9zLMRrslxRQY7j4HoeYks8YREK8OsNIj+Sifb9hjBHFoMnLjdhFBGGvjBb7I1S1HxhCuPj4/T19c1ivajzvKZWtuaqrlfFYHwgBuNzL2dPnJfbdgUywF8DNGVtxaNSFmclSilGRkbYv38/fYUObli6lXW9y3FcTybHRuHlMkRRRBD4uI6LI+rHkdUuwZkD2nbQRpMvtKCMASVZS0IdogDluCgMtiX3YdDoyKAyGUJhgI0VRoTCIk2tUqE8PUUo7JV4SGKSqBTJJBtj5DuJp2aEIWRdV0CPf85CopQ4PBLRN821D3w6BuPrMRiTp8MQyVMle+CfTGhmAJVkbWWcLTvENX36aZYWe2Jm3CCrWYyr4+I6joDieBkUELkZwOB5OTHSMUDpVyHQPo7tye8oZaGFWmKsZQVHURgPTRT6oMBxxE4QNurx1SYyAZHtoHVEpTQjrnakQwwy8cIOo8BoQ2QibKXEXdYJ88r1GiYC17JZsmSJgCJqa7ZIXGYlO5GJeADJQr/rtACJwYhiMFYBH2q2Hco6d7vxwAMP0Om18Ipll4BSopoyXkaYICsR8XAEmHjIKlCORRhEhFGAQoGyhAkZ1yWMNMaEoBQqGTqJN3QkqxkbC+VaCMhhRK1SFVUUBGWq1QqlSilRS6GsfEs8NIWoKR0B4DmugOAkjsJ0tcxUvUT/wEDKfBYW0SjUyvPevzNmySeAvWLgT8OG/D2gAZdEHDfdzzg7u3HkyBHQhuuXbqHgZUX/Z92MGGBQANiJfm7UaxgFnpdFN3xhR71RE+NqAL/RAMuiVJ5GGSUgFoqt4poGQQAK8ZoEVNcRdvlG4/vynoBQrZepB0H6DxLwFAhD6lEojNbJd6rUa/LZNV0n0oZao8ZUo8zqvqWnzCIoheS8/Lqi6TYH+HAMxvvT8qJfpbKuAK5sth1KIbt855ARF7d2oKWXZS09YFt4joPt2KIWhBtK4Qe+qJxSZUbcU1BUamUCvyHpjkI2T4SR1xGaWq0q+r6YLxJMTwhzLKPEbji2C7aRla+UEqAaYUOAqge+2INUMKQMlZ8bsUeRTH7DaGFP3feJJIZRlP0aTlue/v7+00rruJ4h9FXz/EXA+2IwPgZMLcQQKe+Mq0VMUsRWJBWDBH+CLuqMs68pnSuVCm/acBWB0WQtN9H1Gq2D1DSIujFoqo06WUDXykzNTKKwsBQ0Al+iZmMMjSCg4fvCjpnytLAQFGBwHU8ms9oIEIfAaGqNBkHoi71BzVIzqdEWEDDI9/KjQIDVWkAlMhoLi+PlSZ4bP8CGSzY3qatTSsqSuVn2f4jZ8YZmlqg5hcYtwFBzzKGUIVc0nIsEvs+/3Xsvv33p68U45jM50ctiCBNXUhsxoNQbdbTRYlfK1Qok+tx1bBRKmKKwZCVb0KTq4oEYcLmKR4QSO6SNMGWeKtWp92QiAh0J8EZA0MKUFIwYbGFHKajx+NheFi1fwuYtW06HHU2gS8CI0aTiJ8Asj8E43syQtL4oiK9vBLxmz8rNcq4iq8+1ZKKSmII0BY5MvutJYs8PGmhtRHVNl8soASMgEM8HsTtGa3ntWJYAYQmYGgwIsFqDTGAISVxjjAyZ1PiaEkmAF9UUGbQR70qYgAEgNeySCT5cGuLAzBArVq8WMFLP6nTFssB2RHWRiIsIHwD+eK7KsgEN/EVytdIPcRzDuYofBLS6OWEHWiO+fBQmkx2SMZGwoOE35CpBV+L/CxOUQoPcr7VMMWFytcX4ChhYGnwTESXxRZQwwDSpT0sJgPK+H4pnha0siU1c28bGoqp9xmqTjDVKDJXHmQ4qLO5ZxXXX3E5nX05AFTBOMz+XMsTLzAIkffO1MRH+IiZEPQWE+EUQ25DLgB4gIAXkPBWx+aLrbVEHQRjJpFhK1I+wQSbZGKarldQIQ2JYMYjIJBqTXCHjuBjLioctyUO/4QtrjAHQGATQVK0k6kkMuvzdE/UZWfmBiQBDQ4fUooAxv0zW9ggiH8/N09LSxU1b3sXqZRfz9N4f4DoZgrBxSru58M+FJZIVbpJLgS0xKE/GOBgnDeFj6t/dxBbg3NmRTsihQ4eYqE2hULIi05Wa6vVqvYqfBHMYw0S1xIxfZrw+TUfbAKXGDNp2GZ0apOjlCXWAY2wKbh4VNsgArdkinuXhODZZO4OdbDZV/JrkxvygxlhtmmPVcerKUIt8CoVOCTB72gfoa1tEX8dSFnWuYMfen1Otl1jatxXHtjk6spu2GBiDolavJGpXzWODbD/PzFAt1+nt6sfOSsKSFB9jEo8rUMzB7JUxBk/EqSrLacqnvHpWRhewHc5J0mCttdiCnQ/wQ1Em4i3ZkptC2NEIQ7TWojIOTI4yEQMxFDZYu+Ja1q28AhGjiXSAMUqALFenqPsl8rl2LB0xNLqXKb9GGDbQ9RLj00OEyeq3nAyrl26jt9hBrjYtTFm++CLaW3rJehlaCm3kcwW0hvsf/yoNv8bNl78TSzloo2gr9rLzwEOMTBxkwOpKc1dpjAXInj3UiyzrupStV13FA4/+ALLT86poLZuF4rk7gb9UStkqMepXA/cBWcACoRbZvDkvhW3Hjx9nfO8xblm+DcnkJmDZyhZmaLETNsPlcZ4bewnV2suNl76VRV3LJVYRaVppQSixQeKuhuIUuLaDSa21iKLhV+Vzs9mcAGowiCNgW8l3EHWG7HuEIUZb/P2//j7vfPUfk81kcVwJVMUZqDeqVGtlvv+Lz3DFtZek2QdGhkfwq4obL389a5ZvxhiEXZ/60ke44srLF/TEgoaUqaYsiQDbGNMeg1tNOXA5kAdMSi3Hk+t5ke7ubob3HILEyIqbKjmpgDCMMBjR5Y+P7mblqmu545q7aIRVIBKdrVCUKlMS+PlBlYybJ59to96oSArdAkBL2hxIrgbHzmHZCkyESjetjAG0AAFK3GVAAsnxmVFuuvyt8n0j0wBjMIBlbCw7Tz7Xwiu3v5NnD3yXnp4+jh48ziuvegvXXX4bM+VJCT6Vcvi3h77JpdsuXhCMlCVKwezgW/36j+/95udTQLY3vwnn7XyG0NrzPHSLRyWoJ6tTAZJKx498LGx2jx+k2LGCO669U1SRMUZW/s6XHuXw0C6W9m1mpnxC1Ev8c2HYuuWXAjrV0zL5pOGhUTSXsCtFAsAslSrgpZPW09XDkkUD6KgBWhgFKnFZLRtjoLe7n67RTXgNm7t/4z/QUiwyOjYK2NRrPj968B9RLdMU3PaXDaItyyQ2Z9ac/zrweZUcqPklsOUkgqKuOI8ikfrQ03u5OtbdtaCRRMESEYu6uO/4M7zmlo+yun9dajN4cud9PPr8T9i+8TUs7b1IGJDNZnAcjzCqcXx0L1vWXYWyJJ91RnZt7u22bQmgRieRe6iTiB6UlaIMBhifnODw4C5WDqyjo62X0YnjPL/3IY5P7WLTpo2ntT1Rn72B1QCs2J57DpAHNjb5y83GfEGUmz2M+aKaeEh6H4VCgaA7G9uIA6wo9kp0HDUVNnS0L2FJ9wCgJCr/t4f/BaMzvOKyd9Lfsw5NiOyPOLbYhZZiAcdR1P0ybS3tGHPy+8gFA6SsWNgVlZ9L0YMSUE3ifh89foA9h57GzvpEBOjI0JlbztoVW2lr74hB6KCQu4qd+x/Dc/K8dOhZ3PYyFw1slEWGUadKOApLtJ4Vk9gxOZY7QDfgpO5AwpDmve9TFqUtLPNdwo0bN7J/916mymU6Mq1C3UpYZW9llFtvvpuO1k60DnnpyIvYVp6L178SZUEm44r+ti2FagK5p6OPSPuJepLv2qyefmUaw3EslCVqTmwaaCzX4zP//IeE1Pj4n32M6667llwux/T0DD+7/xd89u/+iduufTstLW3kcgWODO9BYYEdyn2p13UqMYDlACGppBzcrmLf9zeUUl9LAcEgZzhIPJCpyWkAjh49ghSdtbfLpozjOIyOjnH8+CDValVGX/eyWK9vwXYsvGKEVv6CkeveHS9gTQeU/CozSvP+t3yCQj4DlqFeCbnvsXtY2reF5UvWkc9l8DyL8yXKQlgGiBdlJ/Vejp3lJw99jZ8/8W2+fs9X+bXX3pFOSXI1MSgP8fa3vZsPv+u/Mzx2jC99+0943eVv5sWpfSxe1sIZiLCjXlFzjzX8oaOU2jL3C6NIi8+YPFGhVqmzYeVVkhbPOBmsapGDQ3uYLk3Q1b6U26+9iVtvfBNBWItp/JTsZ+zZ/zzTlQqRqmC7SsplbNsWcNZdsplgyqaQXcRVW18tase2HCrVqmRwDxx7jmsufiPFQhbXUWjDSbUjq9CWEYaRxAyO7cqeh2U7UvSmLGHwgqpWmKEUrivXRMXYjJeGuf/Rb/HpT/7fMRivxRgJYKGpPOjmV97Mx//0D/jkX/5ZbPzXkq+OYmYOMF2fYDFnBIhoB5iX/d3oACtmuV9W6qUYisUixTVF9uw6wKqBTWJAo2S71HM9YUkQRpJKOHr4iKy8ga71EldsXnMV41MjMWiTHBt+KQZnjKHRowR+iOsG3H7N22MwF1P3a+TsDI16IF4KBro7B+jp7CY0NbRGjLmXdZN9dYsTk8c5NnSAYqeNcgN6unvx7YDO9m5KJwzVaYtFfX2JG6pIJVVrnmcnSU9RMTieje3DumVbeN0bbwOiearaknikwXvfdxfat/job3+QdyxxyCzdTvTC18+GqQvJEgdYNdfgCENS9BQsW7mY793/j7EK2YAOBVkkwm4EkhBs+EFaLC0qwHFdPNchX/DoaomNde8KlGWolCrUaoGU5hSKGbSREhqJ3Gs1H8fOsO/I4yzqGsC2IPCTCcy4SdFAnnt/+Q0efeEH/Ml//SPe/Z47ZUJj5hGFoQAwPDTK/T9+mJ2PHWJR91Lx5lI3W4rfLNV0sstKmSMFcBdt3kpXdwdgWEhsYaXPK26/jkJnG1ZLiMn1S93vGUtyAnkOkfscoGvunXNEDNbAyj4++7U/4oqLbmdTHLyVymWQ3E6ViZkRZipTdBU7UVYGXwcUcq0UykWmJqtksi7ZrJPaE/FaGo2I0A8FiDAIASQ6PjE9yJLupemOnvxuDKD8nYee/h7rt7fz3Z8OEgaB3OMlMYljO+SyedraOli/YRN3vfcunt55kKsufpVE2cIKUVEGB4WyZzsorbkeqvUJMl6RIKjhujnAYEw4y6uUBeQ36OpsYTCzlMWNMl1dXZyNqPndC1odoHP2TQt7VD09PbICf/CL/0m1VmOgb52AcO8j/wRGMaAP4OYLhHaRE/WAXOtSyk4HG9fdRnd7L8KeJHDzGyGqXMOYhIkSFxiMirho9Xa62voIogbZrIuX8Xh29yPsH3ya//LxD/Hq219HpTIlwWF+weMCGoXhk5/6a373tz7KkcH9LBtYieEkUzQGC0UiwrADh3dz+2teASBg7Nr1vCzEFSvWpPZERhRFbNq4kVWbNqOmL+L4xB68Nu98HSgsWnBKa5RWnot3tfWSTfzwoS/wo19+gS//rz/FN9PctOWD3LJ2HSs62unPatbnIwYaLxEN/YKXYgMdaZIU+8nADJKrao5tIhZ3r5B0iefaZHIOQ2OH+d7Pv8gn/vYPeeUrbqHRKJPPFyT6X0jSzywUcnziU3/Gz5/8Vlr4ljKUKNCgmhliJN/1zjvfDsC3vvUN7rzzPTEou/nJT36IUu6suVDK4Ybrb+SlwccYa+w6u4NFwAIecs4C3PnBEnMljSWEnlddfSWhNcMlF1/M+vXrGRw9gFI2uWyW9pZWulrj0dYmWdaZ8hiu7QkgWouHdAoeayRwSryrvQd38Du/9wG2bNmSVDNmTnPbVEkwuv6iVYyOH08Skfpk9aEhFUlQrll+kbAOIr785a8IO26++SaeeWYHWvtzXHfF4kVLqHCU3t7epnjtnMU5kzZIKShixLZu3cryFcvE+9gz+DPKLbcyNTOGY0Xkiy20F1vpb28lUpru9h5kV045DI8dlQkw2vxKKhs0tqPRTo3bb3u1pDaEFajTdCuV3L+kv0+Osvl+2By4iYeVslQ8OVeidKmm37NnL48//jgf/vBH+NKX/kkK6Wa70YY1q1dSyBU4z6IsoDGPS+bUoKQxRXdPD3hVdk4aSks/yrBzqdTHYispt5w+sZMv//DjvHjwKe659zPs3P8EtWpAPR5hoFlILEllgO1aaBNQbMmnicB5ti0Mw5dN79i2S3dvK1PTUwkYCpX8Hk09TaJAJwsGUYetrW14XoavfOWrlEozUp0/+28Yuno7yeQyAOfzxHBgAeUzwCMFZdahmauvvZSSeY6nDt7PqH0RY4t+i4rqYn1HnjcuL3JNdpDOke9yU0edK9dej448xGWuhbJS54AhwZu4z7ZNsZiju6sLY+aeUZW6WqampkSnz8EkUVEBJvDoau8jiSmRasfIYDdF/yaJPJUlOTKWL18mgeY3vvE1pqfLAs5sZhr6FvUJy89WFLAAjnULmKBJzhRsqfrQhsXL2lm6PsuBme/y+O4fMtP5BsqBodXRdHcupWvj7zDUcgfPHT7Ik7u/z/DEYYkd/HpAKrZjCQscx8YgG0Ny8NIPgkTVnMyx1WoVvvCFL/K9732fT3/6UwLKQlKr1ZHiN5DIPgZxblAm9mpqtColq8py+f3f/6gw77bb7uCVcXTe2toyh50Wg8cGCcNzY8YCyYTSAoAozlBkEk1ygnXVqlXozBAHRg9TXnwXFWcpkx2/wfef/CGP7/lHhmoPYreP8+zBnzBZHkOHCowwIykCsEFWs1SsyzgxdqLJ0TDCyscee0wOeL73ve/ni1/8x/l+pEGkVJrGD+pgoLnviolIbYgsgIkTVUaPT6Ejn0sv3c6jjz7MPXFO6/Of/2ySqmlGUQuLisVzsyHGqAUB2Qdw9iyZn5Lv7eth95GfMlFpMJx7Iz9+9J/ZHxv+tWtXsXzFAC3FFlauW8TgyGEwVmJLUr2vENFgMCxbshqjdKqn0VrsF88++xz33nt/bHS/yPDwCGNjQ7NUmrKU3Ldly1bx8lBNVtPImQ8g9ZwMmazDkZfGpIhBaz8G5RLe+tY3i1c5X4krYQjq5Pc+GzHzGTJkAUfS9+ffdHbAtLa2MrCqjR2Hvs2juz/PdLiPG2+8kc7OjtRbkeNh1caUMDJhgoCRgoqtUBhast2YyJplyMHhgQceFFDe/e67xGs7Fk8QqDkLRHHZxVfTku1Epe+l+yYGYV/qbRU7sux57pic4g2DMGWEXOdX0iiefvoZ8b7Onh0sJMMWsHseaoZzlo6ODlas7WHjJcu57rrrJFHZvHp379pDT8dSWalJwwDJNYEwA8sSA4yti9Sn3DQ4JRFhxV13vYe7734/QRCSy2VfhrkWkTbzKilNUsMrdsOGQkuWJx55jkcefoxqrSI2ZKGVr3VEGNbYv++gFG+crZelo9kvEWGPBTw+18vS5w6IqItsNisZ4WQiZ9NbGWaqY5ikqkN+nAxlG1AIa4x22PvcqASeTXhI5fng4KCorXXr1rJhw2YgXNC+KWZXEKbRvDHJ+0ahlc9A31q+8uWvypG7SqUsQM91s+v1hiyGhx54AhM5Z+1iaa3mAmKAHRZQmls8JIb23EUmPx1zRDo0DI7uFSAavkEZlcQKJDGBAqPwMjaHdo/h18Om+CfgD/7gY8zMlKRC5Dvf+VdAs5Dkch5Oxm6eCzHiqWhhipHkZECZygmXQ4cPy+ng8fHRNA5BDveUSkxOTvCud3yAnsxWXnXlO2JVeSxl7+nj8fIMeT6NQ15oTp3okAslaYJOVNpMZZJGUBN/vlGPRHejDJEwIz2BpMi1uDzz0H4J9FKgL774Mh566AEeeeQXDAyswJiIhSRb9HAdu8moW4kdEQcBdFL/Gxm6ujpY038Zf/3nn+Mzn/kMR48cF1cZSY3YAsYb3/Qm1ne+ios2bOXqba9iZjwQ5pyJYTdiv2bdb5LmZwespDH9DppE+toqLoSkeR+p9Ks2SrJDaJRhptSgUdOyhWu0GPkk8DQU2zM88rN9c4xbmLDPSv+fhUTZwrpZLe4irQX8KIwA0oBR3lu3+iK2rryFn/9gJx/56H/mg3d/KAbhLdz59vfxtjf8Dleveg+9XUtAzpyUeM0NH+T55144Y+/KmFlgZICfNYe+T9IkykAYXjiGAJJnavhl6dJjlBHD3qhGBHVDlIIRIS5xqlGff3o3SrlnEHgF1BtlKo1pUki0MQKGJBq1kYFBrn4QoYDFPf1sWXU9rdEm6qOdrC2+hjUtv8Zt2++iJdOJJSe/LIg0Ha0dbFv7BoaGhk7bwOv5gAB8sxmQx4EyoAFQ0mT4grZvlUP8OSUeTRQajIJKNaBSDgSYNGgLfSMpFj+s8Xf//TNo3TitJhRS6V6vI9vLo7uSHJxungEBJwhCUUvJW8Ke9vZuli1dyUVrriBrtTA4dpC9h55mcGQ/bsZGtB5ywIhG3Wd08rC0eTrdmCSK1EKA3BOXAblWchzhUWACiJrdMmMuLEtsqSx/gXI5lK3VUBsq9YBGPZRCtTQQNKHF+OQoY8NTDI8MyUZZFPkywS+jFpNKmBpPPfMElsklet5irghjwij5TE29XkUpLdvGbe1FNq7bxtqlF7NpzXYWLxrAWBplG7m/WvUpVaqMTO6Wtk2nK1EITbjZwIsxBjMAVlwGlL71i6b6rLSpMKgLAoiAcf3111Oxd7L74MMMD5cJQoMBJqd9qqVA1IhSlsQE3R19tLnL+dGPfiRAlMtVGg0fPctdMUnCcVI6LOzbt58P/faHKJWn5qqTuTVU8ns6NDy848e8dGQXEjSGobAhW3RwM0j1jG0nbaKwxHV9ds9DrFq79AzU6Hwv1hhzT3KNLGlDh7z4K0A1O/NhABgulMgkbNywEdr3snfoPo4PHaFaDQi1ZqYUiOdlkigebdPft5o//tgnePDBhwAjrmnMAik8iF1TcYMnJiYEFNfJxoHj/0mrt4SL110PmFllPSPjh6WAe7azYXFocE8SjSd3qiRWSWqAIx2IS35g8EWU8SjVhiXeOh3boZJuQcqat0B/FKsrFWOhFUDaDCW+DgJLmj8gW9BN9Lqw4IweUfhVh6u3vA7LDmktunhZJylQAKNhYnKcb9z3af70//ovvOH1r5P4QKLxMEKbSLrI/cu/fI1P/PWniAKLO+/4ffp6loLSzU2pYyb8EK1Drr/s9bOYE+lQasQWEHmvmGvnqz/8JK++7k4C3+LhPf9Mz5Li6XW9A2oliznyFHBDPP/VZqOe8v7jzYZGa1FbXFhJ1YfN4pUWkZrCWJGwpN7QBH5EvR4i+yMZS/Jh73vTf+Vv//xr/OeP/DFPPfUMDzz4U779nW/zJ3/05/ze7/4h3/3qE9yw9V1cufkOBhatBhXNqyzYtulmrrnkNfNWtmJO7iphlut4ckL4b/7pP/Kq696GbWeYqgxR8U+c/hMZGvNiD4B7UzAAUqOuY1viGWO+DtSbGwb4jQsPSLMqqfjDBL6Rui5L9DXoUIBJQHEAeMPNdxEML+Vzf/lj/u6/fZ//+bcPcuhZC3+snyVdm4VxW1ZfI4V4mPkUz2XyYkMWLujQaRkS+WyRWr3M/Y99Q1j17tf9ATmvhTDUNII6ruOctu0Ig1mA+IjwCZrEapqUIHnMzz/QLBpCPzXuF16M8jk+ukfsl1JGWGqARiOUbV+dVoxYEb09faxZdjnbNtzGNZfdQbHYSqFQlD38zWsvpVhoQbBWC7JywZ+lXSAKuRaxMd+697Ps2PUIa5dt56bL3yxH34IgIuPl2LP/UToO1jl+fOhU6ko0jZ4fDN4Tk2EiNhUncVigtcaVwM8BLwUMBfmi5sILsulk11Zy9dY3o/DJ5lw8T+FYCsuRfXV0ZMnZkS1rrkPrdG9DkcvksKW+S+Mk9xrM6TBUQKjWy0zOjPHUi/dzdGQvmdaIsAZvfeXHyOdyolaNVsLWatjghfu+QHcEv/QGufzyy/kVIg3NjJ7di1FrvdhxnBM/+rdvhCRiLdAN6DFjzC+AqBnPoHFBWJKuVDm9uv/5XRSO1qiVjkmhRBBFVGs+vq8lhY5WYJSok662ZTz2wv28EK/SA8de4ODxF+LX3+WRZ3/IocEXKVWnxF32nByOlSGXKcpROFt55LMt8joeUr5aq/o8+ux9/PKZ/8VPnvh7fvN9t/LNb32FjRs209+xVaJxMfRGSawCisNHn6Gl7nOsPiEJzpcXmbu5yUQb+Ie4lcnw3H5b6mX6LC6zLOvw3NZ+uYJGWec/r3XixAmGn9nP1a2rcbDZWx1l+bb34GaKWI5FxnMo5mxsR5HxXGGKMRaVaoVao4qFBSj2H9lJ/6YaQ0OjhA0Lv+7T2bqI7p5eBgeP0NLaQkuxjZ0v7pFtgcg0WLduDRsuWh4HkE/RxWWcmDnMzW9ayzVXXcOtN7+ZD/0f/w0gTbVQbzTkyN193/6r+PuuYWf9OMfafC677DJZXPMrdNRC7ZlqwHZg59yucs4Cbf3s2JYcia//j1LqPzSfG/EbFpmcviAsabdz5L0cRsEG08PjT36eTdvvxglsbCtHzYcsFsb42KEtrnCxkKVYzKYJO9bbm3hkxz/zmc/9DVs2b423YN/GscNDvOuDr+W22/5ICuHe+pbf5NrNb2JqZpz9U/fyht+8kW2XbecXP91BaA7T09nPsz+d4l+/9Jd8+N2fplKdSZqkgY6kzSzf/9GneWX7WrSjGLC7OBwdWyDYTBtizvOsFPC1GIgXWUDUKVr8HQHamz/Oy2kc7/wFjFpWnmbowRfZ3rlauoEaSzE9PsGzTsiSlbfTWegik7XJZVvwPI2d7C66rp2e8wAMtuXyxHMPMBrsoF6tsa7vFpb1rOOr9/0Fd//Wu/nO977N8uINLOrtZ3TyGC/ueQrfGufSyy/iyIs+oWnEQeSN9Pctp5DPUamWACthBzLZ93zvT7nSdNLa1goYUaVfH36MQmcrbY5Ndz5LaMB2XbAyeC19ONk8idQBG+iNAZk6NSDzgfkA8FkSOa+qq1lljYxivzjB+vZ+2TxyMi6SApmZ5lC9RK19BUv6NstefSHflRy4gXzOEVBs25IhuKA4cuwArmczsHi1pD9GR0f43Hf+E6+74QNsWLVNomzXzpPLtGCMkorL/kUracm3JkeWjXhSkqYPtSQ/bdvjGz//JBvLARt6V2BkizkUl/yno8/Q7VRpsR1spTAAGEI3g15/DZZtN59Hf1+sgb4QayAVX83ZdLZ+HLi8+X7LMmQL5rwB8uzTz7B5uo3eYideNiM1wjoKZa/ExuLo1DBPNk6wcvnNdLQtERbFJ7ekIDubsbClPawhIzFKkvYQxtjpPjg6kuPZoEzS4iPCoLGUlZYxpdMhYDR8yQDjh5oT4wfYt/d+eisVNvatxMlmMWiq5YrYqecmdtORmcFNupyCkhR9bdXlmGyBJnkgZsZNZ9smNpU3AseABpBJz8c16pDNGYw5d0DK0yXa1CLpg+KZTFoaLin6MAxY1rWEfr+Hh48+yPBkN7lCHxEBflAh6xVpKXTRUeyWvlyOrcQRcByraZItjIqkiZnCSvNaMiKMsIC0f1aoCQKk+ebekWc4vvdR7LFDbO9ZQ7GvD1xbWBwEmnICyIw/Ta8nu4pyUjiby1HuXS1gNDU7KQPvTFq3B2fTSDntozUY0+tNSqlvNbduigKFb51b6780mHK1whCJe5vPayI0jpwX9AgjDx2GWHmLm3IXM1abYKx+gonDDzGKYdPK6wh9X7wf13jScsnySRsCSDmqZSvZEVRoJJ0PEvVjONnCSSsc5eJm8oyVD3Jwz8/JTQyx3ivSvXQLypHuAdKIOQxD2c4tl0qM10soVcax2/GyeckwVNuXUMt3pmBoRPioPA7pPDTjt+TIWBT9LfAh5oiXMzhn+ZiKtInY/p89yaaom1BHtLS209LWQj6fk9Vm2ZZkcjGIaDS2UaAN040yT4y/xLGwRl/Pehb3rGOgd73EF6nH4zkOGkMSO2IrjQbR9dogYPhBxNTMMMdGdzE29ALdfsC1A5sJLYORViBSQYObzSBJ0NFhJqYnicoNHvb3c21HBrdYxPVcwmInk92r556u/VYMxptP50GUitOUG6/7NS/+Uk8AmwE1+9kh+qw7B42NjcGTg/SQlw4P+WyBtvZ2OuLh2BZOxktP32JQCY4Go5O+WZbLTK3EkZlRyjpkJgoIlIXnFWlr6SPMFPCy8cgUsbRm95HHKE0NYbkZelsW0ahMYYV1CrUS61oHyBVaeXByH9ctWk/ByRIFgXRPzWRzGAwzpWkGJwdplEvsK08R2ZNs7W4n11IkzLcz3rU6ZX6qL5+MQdh+us/RVWf4zMKCUmosQT1Dk2TyBts+Y5pI+1i1e4LuuoMf+aKq8tk83R1dOJ4nBXDSrEYMpkaTbnA5WIjKQRmhGsoARlEN6jTqVbFJE/UZfGMY8Ss8WzrAZZkB+nId4ChpO9iaK9Keb5UDpcq1sRXS1P/J0b1c3b2eSqNKm5clkytIe9jR8hiTlTGGYmBG/AkubsvT1t0JhfaYGWvAsprtxmFjzFUxU0fixjKG0xDnDHV+AGwADjFHGlVFJscZP9ilf8kSDry0j6F6C9241KM6UT3EmlRkc3np0ZvxPHEd0/6KKr66yZNwdNpyCQWWEvAKbgHprBBq2sIOaSubLY8z6ndySdcaArS0NM9lM7huPDIetutghIWarkyRWqNOaWJaGp1lihbT1SrVsMREbZJqvcbxcIY1nk2+kCPMFCnFYJAwo8mIvzl2bYcv2EPBjDFBTLsjwBWABsJZoNQUga9Q6sya0izRARV7gnFqgEJFhlK9RLk8LbuC8U4g0zMzlMrl+FqS49XlcplSJb6WypQrFdlDb9QaYnDDIECH0m0UFHi2x97qCJcWlhKhxTDHzCObK8QjK8e4EQ8rpF6pyTNM2qMMB8pDhLUaY9MTjMwMMVGZxK9V2dmYoE+FdLcWMG09zCzeKMxoOlYbAnfEc/WUZHIv/GPzRH1tV0o9DtSAHE1iO5DNaQynlpmxURrPPoUb+gzXNWWToUiRxeQkoec4Lhk7I1G47UnjmeT4wskI3Tr5aAtZ9UhsYREloLi+5t7xF7k6vxKVscnlC9hOfM3l5XO0NgJiGPhShVIulwhLdXaER1nqFNHKCJBWELFLz1CkyqaOFqL+Nfi9K5trVE0Cxk0xGA+nRvyCAxKjrizLUlrr9cDOl2uLmsmfevt3dHSUzPMxIEZTrwVSkzVlYByHJXTQRRHbceUDs44r+ai0EZmFkjSLdHgAAUFpg7Jt8aIUSjyyXdUh8qFNp1cgk8+Sz+UluWjHA4wA5/s+8pi9hi8R+IH6OENMsU61ggELi2FTp2JNsrUtD2suJWzrm5ujKiXMeOgCPXr11I9Diq8blVIPAD1pemDeM6rcl+fKvn37WD54QPoxinG2FGEjIAoMQ9owjk2namHAtOBZOXJJV2zE8QogaZCvlcYyQhUsbPHCbGUT+T479BCbVS84Dq0treTyOYlPSLtYNxpiM8JKgxkr4Fk9yEa6GdQz9JMnBMapELll1nd3YVZfhsnmm+MMCzistX5znFJ/KmXGOQNyDuC0J6BsBcK5zoJlGzI5syBbdjz4czabAMtx0kK1kw+erzeY8X1K2jAdQdEUaVcdeHi04OJgqBPgq5AQLf+FBMKgLFksYzGpy9QI6KaAp7LiVcWACKhSXY+mVq1JlD+iK/JYpU1eH65x2BHtZrFboGZCcpmIruWbiBatApgLxpNa69fGYAyf6/PVnfO0J16LaXpxvDK+Arx9fkZX9gRwM7Oeoy7G061XIJtBEoSijpRkUKU3VrFIplKhzfdZbOBEUGekMUhoHGpGAS4duPSZPBlsIiRWQQBF46kMEYoc8RWNMRH1Wh0hktaANO5HEplRhd2MsI1FtOgMj5rDrC/YuJ7G5Nowq7YRedmFWl5I0Hf7rW9RAKcBxoVnyJxSovcDfwO0zGWLaCQLHE/juLB/zy5ajhyg3XNki1SepOY4oDUqOYUbNnwpCw1D8ZwIwlDOaJggoq4NDQ0loA44WIDCUx4eGU6YKnll027aaMNDYaFAjLSUDhGgjBI27GKcLlxyuJTQtOZbqRRmWLxsLVHHItA67aqQquUy8J9iMP5HDIYXxxk+50EU51HiL6biL2ZiUFYnaftb0l3Hedu2yjC+bwddU8dlovKFPF4mK+kHExkBRI4RRJrQ6MQtFZdWQAmiCCJpUS7xhq1AAShRezIUyDhchzy95IwtsDgo4VJIgINDCZ+daoI24+LgsrhjCf1r1jJVdLHtpCBMWQZoAFngQWPMO2I2HD1Le3HhAZmflJTSoruVUp8CsswXMbyqNoM1tI9coyzpCdtzMUZJeY1rWWhOPt3AhBGT9Qa2MfEQJwBjFmhWJmkVObMhicmnpxtsYRVlAmZMnQYBJRpihyKFMKlPtcRALMJZ3Y/dUgRLsYAExpgPJvsZTnwNSeSCAXIBVFhnosLeAThABFiAkklD1ACEIbnSEPn6NDaarG2jDBhAgzRcDn1f7jtWqWJ8n27XRjmuAPJyMlouUa91scLtwbEcsplMwrCQkhNQUz6VLo9FKzYSOUrYqyCNKTRgAzXga8DvxWyYat7P+HcDCEC6K5YAtBH4CPBeRPABoQOkxlhhDLhhjVxUJxNU8cI6TtiQavO0CbMHPHDoKL22ojOXFUBfjoH7J0ssZg1t0mHIw+lpI8i7BFkHPxtfcyf7eKXVA0opvylX9w/Ap2UPfM6/6d8ZIAursfjaDXwBuAOwT8VSZbQMKwpw/CpeUCdDwMT4CQ6MnWBVxhbjrxBQ0wd1YByP0HIYN1k6iktQxSxkXLAUxrY4Dfm61vp3Y1d2aKFnDv57ByQFRQCIgQnjUqN+y7I+ALwWuISTEgEqHVwYMU3DnlP4fB/wVzEAE69+1VsdrTUxGCHA/16AzH9WYpSAlAO2AK8A3g2s56Q0ElCsdHB2opNhkmuGk7LTGHOPUuqHSZ1UFWCu9/S/MSDzJVUJTVH/bwBvBW4A7PPEFtPEwJ8B39Ra3xOrpGmAU6il/38Bkq5IwFFKmTiWCZqqKJdblnUFsAHYBCxKRitQBHJNwWcI1IASUAaOA8PAXuAZrfWLMQD7m+ImN3kOSCQR9v8H5P8FdKdwLi9BNikAAAAASUVORK5CYII=" + }; + var signinLink = document.getElementById('persona_login'); if (signinLink) { - signinLink.onclick = function() { navigator.id.request(); }; + signinLink.onclick = function() { navigator.id.request(requestParams); }; } var signinLink1 = document.getElementById('persona_login1'); if (signinLink1) { - signinLink1.onclick = function() { navigator.id.request(); }; + signinLink1.onclick = function() { navigator.id.request(requestParams); }; } var signoutLink = document.getElementById('logout'); @@ -33,11 +39,13 @@ $(document).ready(function () { } var logout_url = document.getElementById('_logout_url').value; + var persona_user = document.getElementById('_persona_user').value; navigator.id.watch({ + loggedInUser: persona_user || null, onlogin: function(assertion) { document.getElementById('_assertion').value = assertion; - document.getElementById('_persona_login').submit() + document.getElementById('_persona_login').submit(); }, onlogout: function() { $.ajax({ diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html index 08879da5..a022c62a 100644 --- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html +++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html @@ -17,9 +17,8 @@ #} {% block persona_edit_link %} - <p> - <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}"> - {% trans %}Edit your Persona email addresses{% endtrans %} - </a> - </p> + <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}"> + {% trans %}Persona's{% endtrans %} + </a> + · {% endblock %} diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html index 372bd246..03d63aae 100644 --- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html +++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html @@ -28,5 +28,11 @@ <input type="hidden" name="assertion" type="text" id="_assertion"/> <input type="hidden" name="_logout_url" type="text" id="_logout_url" value="{{ request.urlgen('mediagoblin.auth.logout') }}"/> + <input type="hidden" type="text" id="_persona_user" + {% if request.session.get('persona_login_email', False) %} + value="{{ request.session['persona_login_email'] }}"/> + {% else %} + value=""/> + {% endif %} </form> {% endblock %} diff --git a/mediagoblin/plugins/persona/views.py b/mediagoblin/plugins/persona/views.py index f3aff38d..1bba3b8c 100644 --- a/mediagoblin/plugins/persona/views.py +++ b/mediagoblin/plugins/persona/views.py @@ -64,6 +64,7 @@ def login(request): if user: request.session['user_id'] = unicode(user.id) + request.session['persona_login_email'] = email request.session.save() return redirect(request, "index") @@ -183,9 +184,11 @@ def add(request): new_entry.user_id = request.user.id new_entry.save() + request.session['persona_login_email'] = email + messages.add_message( request, messages.SUCCESS, - _('Your Person email address was saved successfully.')) + _('Your Persona email address was saved successfully.')) return redirect(request, 'mediagoblin.edit.account') diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 454eb09b..246091d6 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -14,12 +14,20 @@ # 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/>. +# Use an ordered dict if we can. If not, we'll just use a normal dict +# later. +try: + from collections import OrderedDict +except: + OrderedDict = None + import logging import os -from mediagoblin.db.util import atomic_update from mediagoblin import mg_globals as mgg - +from mediagoblin.db.util import atomic_update +from mediagoblin.db.models import MediaEntry +from mediagoblin.tools.pluginapi import hook_handle from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ _log = logging.getLogger(__name__) @@ -74,49 +82,89 @@ class FilenameBuilder(object): ext=self.ext) -class ProcessingState(object): - """ - The first and only argument to the "processor" of a media type - This could be thought of as a "request" to the processor - function. It has the main info for the request (media entry) - and a bunch of tools for the request on it. - It can get more fancy without impacting old media types. +class MediaProcessor(object): + """A particular processor for this media type. + + While the ProcessingManager handles all types of MediaProcessing + possible for a particular media type, a MediaProcessor can be + thought of as a *particular* processing action for a media type. + For example, you may have separate MediaProcessors for: + + - initial_processing: the intial processing of a media + - gen_thumb: generate a thumbnail + - resize: resize an image + - transcode: transcode a video + + ... etc. + + Some information on producing a new MediaProcessor for your media type: + + - You *must* supply a name attribute. This must be a class level + attribute, and a string. This will be used to determine the + subcommand of your process + - It's recommended that you supply a class level description + attribute. + - Supply a media_is_eligible classmethod. This will be used to + determine whether or not a media entry is eligible to use this + processor type. See the method documentation for details. + - To give "./bin/gmg reprocess run" abilities to this media type, + supply both gnerate_parser and parser_to_request classmethods. + - The process method will be what actually processes your media. """ - def __init__(self, entry): + # You MUST override this in the child MediaProcessor! + name = None + + # Optional, but will be used in various places to describe the + # action this MediaProcessor provides + description = None + + def __init__(self, manager, entry): + self.manager = manager self.entry = entry + self.entry_orig_state = entry.state + + # Should be initialized at time of processing, at least self.workbench = None - self.queued_filename = None - def set_workbench(self, wb): - self.workbench = wb + def __enter__(self): + self.workbench = mgg.workbench_manager.create() + return self + + def __exit__(self, *args): + self.workbench.destroy() + self.workbench = None - def get_queued_filename(self): + # @with_workbench + def process(self, **kwargs): """ - Get the a filename for the original, on local storage + Actually process this media entry. """ - if self.queued_filename is not None: - return self.queued_filename - queued_filepath = self.entry.queued_media_file - queued_filename = self.workbench.localized_file( - mgg.queue_store, queued_filepath, - 'source') - self.queued_filename = queued_filename - return queued_filename - - def copy_original(self, target_name, keyname=u"original"): - self.store_public(keyname, self.get_queued_filename(), target_name) - - def store_public(self, keyname, local_file, target_name=None): - if target_name is None: - target_name = os.path.basename(local_file) - target_filepath = create_pub_filepath(self.entry, target_name) - if keyname in self.entry.media_files: - _log.warn("store_public: keyname %r already used for file %r, " - "replacing with %r", keyname, - self.entry.media_files[keyname], target_filepath) - mgg.public_store.copy_local_to_storage(local_file, target_filepath) - self.entry.media_files[keyname] = target_filepath + raise NotImplementedError + + @classmethod + def media_is_eligible(cls, entry=None, state=None): + raise NotImplementedError + + ############################### + # Command line interface things + ############################### + + @classmethod + def generate_parser(cls): + raise NotImplementedError + + @classmethod + def args_to_request(cls, args): + raise NotImplementedError + + ########################################## + # THE FUTURE: web interface things here :) + ########################################## + + ##################### + # Some common "steps" + ##################### def delete_queue_file(self): # Remove queued media file from storage and database. @@ -124,9 +172,132 @@ class ProcessingState(object): # be removed too, but fail if the directory is not empty to be on # the super-safe side. queued_filepath = self.entry.queued_media_file - mgg.queue_store.delete_file(queued_filepath) # rm file - mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir - self.entry.queued_media_file = [] + if queued_filepath: + mgg.queue_store.delete_file(queued_filepath) # rm file + mgg.queue_store.delete_dir(queued_filepath[:-1]) # rm dir + self.entry.queued_media_file = [] + + +class ProcessingKeyError(Exception): pass +class ProcessorDoesNotExist(ProcessingKeyError): pass +class ProcessorNotEligible(ProcessingKeyError): pass +class ProcessingManagerDoesNotExist(ProcessingKeyError): pass + + + +class ProcessingManager(object): + """Manages all the processing actions available for a media type + + Specific processing actions, MediaProcessor subclasses, are added + to the ProcessingManager. + """ + def __init__(self): + # Dict of all MediaProcessors of this media type + if OrderedDict is not None: + self.processors = OrderedDict() + else: + self.processors = {} + + def add_processor(self, processor): + """ + Add a processor class to this media type + """ + name = processor.name + if name is None: + raise AttributeError("Processor class's .name attribute not set") + + self.processors[name] = processor + + def list_eligible_processors(self, entry): + """ + List all processors that this media entry is eligible to be processed + for. + """ + return [ + processor + for processor in self.processors.values() + if processor.media_is_eligible(entry=entry)] + + def list_all_processors_by_state(self, state): + """ + List all processors that this media state is eligible to be processed + for. + """ + return [ + processor + for processor in self.processors.values() + if processor.media_is_eligible(state=state)] + + + def list_all_processors(self): + return self.processors.values() + + def gen_process_request_via_cli(self, subparser): + # Got to figure out what actually goes here before I can write this properly + pass + + def get_processor(self, key, entry=None): + """ + Get the processor with this key. + + If entry supplied, make sure this entry is actually compatible; + otherwise raise error. + """ + try: + processor = self.processors[key] + except KeyError: + import pdb + pdb.set_trace() + raise ProcessorDoesNotExist( + "'%s' processor does not exist for this media type" % key) + + if entry and not processor.media_is_eligible(entry): + raise ProcessorNotEligible( + "This entry is not eligible for processor with name '%s'" % key) + + return processor + + +def request_from_args(args, which_args): + """ + Generate a request from the values of some argparse parsed args + """ + request = {} + for arg in which_args: + request[arg] = getattr(args, arg) + + return request + + +class MediaEntryNotFound(Exception): pass + + +def get_processing_manager_for_type(media_type): + """ + Get the appropriate media manager for this type + """ + manager_class = hook_handle(('reprocess_manager', media_type)) + if not manager_class: + raise ProcessingManagerDoesNotExist( + "A processing manager does not exist for {0}".format(media_type)) + manager = manager_class() + + return manager + + +def get_entry_and_processing_manager(media_id): + """ + Get a MediaEntry, its media type, and its manager all in one go. + + Returns a tuple of: `(entry, media_type, media_manager)` + """ + entry = MediaEntry.query.filter_by(id=media_id).first() + if entry is None: + raise MediaEntryNotFound("Can't find media with id '%s'" % media_id) + + manager = get_processing_manager_for_type(entry.media_type) + + return entry, manager def mark_entry_failed(entry_id, exc): @@ -165,6 +336,65 @@ def mark_entry_failed(entry_id, exc): u'fail_metadata': {}}) +def get_process_filename(entry, workbench, acceptable_files): + """ + Try and get the queued file if available, otherwise return the first file + in the acceptable_files that we have. + + If no acceptable_files, raise ProcessFileNotFound + """ + if entry.queued_media_file: + filepath = entry.queued_media_file + storage = mgg.queue_store + else: + for keyname in acceptable_files: + if entry.media_files.get(keyname): + filepath = entry.media_files[keyname] + storage = mgg.public_store + break + + if not filepath: + raise ProcessFileNotFound() + + filename = workbench.localized_file( + storage, filepath, + 'source') + + if not os.path.exists(filename): + raise ProcessFileNotFound() + + return filename + + +def store_public(entry, keyname, local_file, target_name=None, + delete_if_exists=True): + if target_name is None: + target_name = os.path.basename(local_file) + target_filepath = create_pub_filepath(entry, target_name) + + if keyname in entry.media_files: + _log.warn("store_public: keyname %r already used for file %r, " + "replacing with %r", keyname, + entry.media_files[keyname], target_filepath) + if delete_if_exists: + mgg.public_store.delete_file(entry.media_files[keyname]) + + try: + mgg.public_store.copy_local_to_storage(local_file, target_filepath) + except: + raise PublicStoreFail(keyname=keyname) + + # raise an error if the file failed to copy + if not mgg.public_store.file_exists(target_filepath): + raise PublicStoreFail(keyname=keyname) + + entry.media_files[keyname] = target_filepath + + +def copy_original(entry, orig_filename, target_name, keyname=u"original"): + store_public(entry, keyname, orig_filename, target_name) + + class BaseProcessingFail(Exception): """ Base exception that all other processing failure messages should @@ -190,3 +420,18 @@ class BadMediaFail(BaseProcessingFail): for the media type specified. """ general_message = _(u'Invalid file given for media type.') + + +class PublicStoreFail(BaseProcessingFail): + """ + Error that should be raised when copying to public store fails + """ + general_message = _('Copying to public storage failed.') + + +class ProcessFileNotFound(BaseProcessingFail): + """ + Error that should be raised when an acceptable file for processing + is not found. + """ + general_message = _(u'An acceptable processing file was not found') diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 05cac844..7f683485 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -22,10 +22,9 @@ import celery from celery.registry import tasks from mediagoblin import mg_globals as mgg -from mediagoblin.db.models import MediaEntry -from mediagoblin.processing import (mark_entry_failed, BaseProcessingFail, - ProcessingState) +from . import mark_entry_failed, BaseProcessingFail from mediagoblin.tools.processing import json_processing_callback +from mediagoblin.processing import get_entry_and_processing_manager _log = logging.getLogger(__name__) logging.basicConfig() @@ -70,30 +69,43 @@ class ProcessMedia(celery.Task): """ Pass this entry off for processing. """ - track_started=True - - def run(self, media_id, feed_url): + def run(self, media_id, feed_url, reprocess_action, reprocess_info=None): """ Pass the media entry off to the appropriate processing function (for now just process_image...) :param feed_url: The feed URL that the PuSH server needs to be updated for. + :param reprocess: A dict containing all of the necessary reprocessing + info for the media_type. """ - entry = MediaEntry.query.get(media_id) + reprocess_info = reprocess_info or {} + entry, manager = get_entry_and_processing_manager(media_id) # Try to process, and handle expected errors. try: - entry.state = u'processing' - entry.save() - - _log.debug('Processing {0}'.format(entry)) - - proc_state = ProcessingState(entry) - with mgg.workbench_manager.create() as workbench: - proc_state.set_workbench(workbench) - # run the processing code - entry.media_manager.processor(proc_state) + processor_class = manager.get_processor(reprocess_action, entry) + + with processor_class(manager, entry) as processor: + # Initial state change has to be here because + # the entry.state gets recorded on processor_class init + entry.state = u'processing' + entry.save() + + _log.debug('Processing {0}'.format(entry)) + + try: + processor.process(**reprocess_info) + except Exception as exc: + if processor.entry_orig_state == 'processed': + _log.error( + 'Entry {0} failed to process due to the following' + ' error: {1}'.format(entry.id, exc)) + _log.info( + 'Setting entry.state back to "processed"') + pass + else: + raise # We set the state to processed and save the entry here so there's # no need to save at the end of the processing stage, probably ;) diff --git a/mediagoblin/static/js/notifications.js b/mediagoblin/static/js/notifications.js index 0153463a..78694f59 100644 --- a/mediagoblin/static/js/notifications.js +++ b/mediagoblin/static/js/notifications.js @@ -33,4 +33,17 @@ var notifications = {}; $(document).ready(function () { notifications.init(); + + var mark_all_comments_seen = document.getElementById('mark_all_comments_seen'); + + if (mark_all_comments_seen) { + mark_all_comments_seen.href = '#'; + mark_all_comments_seen.onclick = function() { + $.ajax({ + type: 'GET', + url: mark_all_comments_seen_url, + success: function(res, status, xhr) { window.location.reload(); }, + }); + } + } }); diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index 33687a72..1bbf2cb8 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -76,17 +76,21 @@ def prepare_queue_task(app, entry, filename): return queue_file -def run_process_media(entry, feed_url=None): +def run_process_media(entry, feed_url=None, + reprocess_action="initial", reprocess_info=None): """Process the media asynchronously :param entry: MediaEntry() instance to be processed. :param feed_url: A string indicating the feed_url that the PuSH servers should be notified of. This will be sth like: `request.urlgen( 'mediagoblin.user_pages.atom_feed',qualified=True, - user=request.user.username)`""" + user=request.user.username)` + :param reprocess_action: What particular action should be run. + :param reprocess_info: A dict containing all of the necessary reprocessing + info for the given media_type""" try: ProcessMedia().apply_async( - [entry.id, feed_url], {}, + [entry.id, feed_url, reprocess_action, reprocess_info], {}, task_id=entry.queued_task_id) except BaseException as exc: # The purpose of this section is because when running in "lazy" diff --git a/mediagoblin/templates/mediagoblin/api/authorize.html b/mediagoblin/templates/mediagoblin/api/authorize.html index d0ec2616..93cdc7e3 100644 --- a/mediagoblin/templates/mediagoblin/api/authorize.html +++ b/mediagoblin/templates/mediagoblin/api/authorize.html @@ -41,7 +41,7 @@ {% trans %}Applications with access to your account can: {% endtrans %} <ul> <li>{% trans %}Post new media as you{% endtrans %}</li> - <li>{% trans %}See your information (e.g profile, meida, etc...){% endtrans %}</li> + <li>{% trans %}See your information (e.g profile, media, etc...){% endtrans %}</li> <li>{% trans %}Change your information{% endtrans %}</li> </ul> <br /> diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 938dac75..945d5ee3 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -37,6 +37,9 @@ src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script> <script type="text/javascript" src="{{ request.staticdirect('/js/notifications.js') }}"></script> + <script> + var mark_all_comments_seen_url = "{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}" + </script> {# For clarification, the difference between the extra_head.html template # and the head template hook is that the former should be used by diff --git a/mediagoblin/templates/mediagoblin/edit/change_email.html b/mediagoblin/templates/mediagoblin/edit/change_email.html new file mode 100644 index 00000000..76cc4771 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/edit/change_email.html @@ -0,0 +1,45 @@ +{# +# 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 username=user.username -%} + Changing {{ username }}'s email + {%- endtrans %} — {{ super() }} +{%- endblock %} + +{% block mediagoblin_content %} + <form action="{{ request.urlgen('mediagoblin.edit.email') }}" + method="POST" enctype="multipart/form-data"> + <div class="form_box edit_box"> + <h1> + {%- trans username=user.username -%} + Changing {{ username }}'s email + {%- endtrans -%} + </h1> + {{ wtforms_util.render_divs(form, True) }} + {{ csrf_token }} + <div class="form_submit_buttons"> + <input type="submit" value="{% trans %}Save{% endtrans %}" + class="button_form" /> + </div> + </div> + </form> +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 51293acb..14011daa 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,14 +41,6 @@ Changing {{ username }}'s account settings {%- endtrans -%} </h1> - {% if pass_auth is defined %} - <p> - <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> - {% trans %}Change your password.{% endtrans %} - </a> - </p> - {% endif %} - {% 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" /> @@ -60,5 +52,16 @@ <a href="{{ request.urlgen('mediagoblin.edit.delete_account') }}"> {%- trans %}Delete my account{% endtrans -%} </a> + · + {% template_hook("edit_link") %} + <a href="{{ request.urlgen('mediagoblin.edit.email') }}"> + {% trans %}Email{% endtrans %} + </a> + {% if pass_auth is defined %} + · + <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> + {% trans %}Password{% endtrans %} + </a> + {% endif %} </div> {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html index 70d7935a..55759a39 100644 --- a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html +++ b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html @@ -36,5 +36,9 @@ </li> {% endfor %} </ul> + <a href="{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}?next={{ + request.base_url|urlencode }}" id="mark_all_comments_seen"> + {% trans %}Mark all read{% endtrans %} + </a> </div> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/pdf.html b/mediagoblin/templates/mediagoblin/media_displays/pdf.html index 9319e87c..a615cba6 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/pdf.html +++ b/mediagoblin/templates/mediagoblin/media_displays/pdf.html @@ -29,7 +29,7 @@ media.media_files['original']) %} {% endif %} -{% set pdf_js = global_config.get('media_type:mediagoblin.media_types.pdf', {}).get('pdf_js', False) %} +{% set pdf_js = global_config['plugins'].get('mediagoblin.media_types.pdf', {}).get('pdf_js', False) %} {% if pdf_js %} {% block mediagoblin_html_tag %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index b0854c9f..e35169bf 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -30,7 +30,7 @@ {% set display_type, display_path = media.get_display_media() %} <video controls - {% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} + {% if global_config['plugins']['mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} preload="auto" class="video-js vjs-mg-skin" data-setup='{"height": {{ media.media_data.height }}, "width": {{ media.media_data.width }} }'> @@ -62,11 +62,11 @@ </a> </li> {% endif %} - {% if 'webm_640' in media.media_files %} + {% if 'webm_video' in media.media_files %} <li> <a href="{{ request.app.public_store.file_url( - media.media_files.webm_640) }}"> - {%- trans %}WebM file (640p; VP8/Vorbis){% endtrans -%} + media.media_files.webm_video) }}"> + {%- trans %}WebM file (VP8/Vorbis){% endtrans -%} </a> </li> {% endif %} diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py index 8db8a00d..7b58cb9b 100644 --- a/mediagoblin/tests/test_edit.py +++ b/mediagoblin/tests/test_edit.py @@ -150,26 +150,26 @@ class TestUserEdit(object): # Test email already in db template.clear_test_template_context() test_app.post( - '/edit/account/', { + '/edit/email/', { 'new_email': 'chris@example.com', 'password': 'toast'}) # Check form errors context = template.TEMPLATE_TEST_CONTEXT[ - 'mediagoblin/edit/edit_account.html'] + 'mediagoblin/edit/change_email.html'] assert context['form'].new_email.errors == [ u'Sorry, a user with that email address already exists.'] # Test successful email change template.clear_test_template_context() res = test_app.post( - '/edit/account/', { + '/edit/email/', { 'new_email': 'new@example.com', 'password': 'toast'}) res.follow() # Correct redirect? - assert urlparse.urlsplit(res.location)[2] == '/u/chris/' + assert urlparse.urlsplit(res.location)[2] == '/edit/account/' # Make sure we get email verification and try verifying assert len(mail.EMAIL_TEST_INBOX) == 1 diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py index 2b414590..0908cb34 100644 --- a/mediagoblin/tests/test_notifications.py +++ b/mediagoblin/tests/test_notifications.py @@ -153,3 +153,56 @@ otherperson@example.com\n\nSGkgb3RoZXJwZXJzb24sCmNocmlzIGNvbW1lbnRlZCBvbiB5b3VyI # User should not have been notified assert len(notifications) == 1 + + def test_mark_all_comment_notifications_seen(self): + """ Test that mark_all_comments_seen works""" + + user = fixture_add_user('otherperson', password='nosreprehto') + + media_entry = fixture_media_entry(uploader=user.id, state=u'processed') + + fixture_comment_subscription(media_entry) + + media_uri_id = '/u/{0}/m/{1}/'.format(user.username, + media_entry.id) + + # add 2 comments + self.test_app.post( + media_uri_id + 'comment/add/', + { + 'comment_content': u'Test comment #43' + } + ) + + self.test_app.post( + media_uri_id + 'comment/add/', + { + 'comment_content': u'Test comment #44' + } + ) + + notifications = Notification.query.filter_by( + user_id=user.id).all() + + assert len(notifications) == 2 + + # both comments should not be marked seen + assert notifications[0].seen == False + assert notifications[1].seen == False + + # login with other user to mark notifications seen + self.logout() + self.login('otherperson', 'nosreprehto') + + # mark all comment notifications seen + res = self.test_app.get('/notifications/comments/mark_all_seen/') + res.follow() + + assert urlparse.urlsplit(res.location)[2] == '/' + + notifications = Notification.query.filter_by( + user_id=user.id).all() + + # both notifications should be marked seen + assert notifications[0].seen == True + assert notifications[1].seen == True diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 3f98aa8a..1eabe9f1 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -252,7 +252,7 @@ def get_hook_templates(hook_name): .. code-block:: html+jinja - {% template_hook "media_sidebar" %} + {% template_hook("media_sidebar") %} ... which will include all templates for you, partly using this method. diff --git a/mediagoblin/tools/staticdirect.py b/mediagoblin/tools/staticdirect.py index ef8b20d0..8381b8b6 100644 --- a/mediagoblin/tools/staticdirect.py +++ b/mediagoblin/tools/staticdirect.py @@ -35,7 +35,8 @@ class StaticDirect(object): staticdirect to. In general, you should supply a None domain, as that's the "default" domain. - Things work like this: + Things work like this:: + >>> staticdirect = StaticDirect( ... {None: "/static/", ... "theme": "http://example.org/themestatic/"}) @@ -69,17 +70,18 @@ class PluginStatic(object): This has two mandatory attributes that you must pass in on class init: - - name: this name will be both used for lookup in "urlgen" for - your plugin's static resources and for the subdirectory that - it'll be "mounted" to for serving via your web browser. It - *MUST* be unique. If writing a plugin bundled with MediaGoblin - please use the pattern 'coreplugin__foo' where 'foo' is your - plugin name. All external plugins should use their modulename, - so if your plugin is 'mg_bettertags' you should also call this - name 'mg_bettertags'. - - file_path: the directory your plugin's static resources are - located in. It's recommended that you use - pkg_resources.resource_filename() for this. + + - *name:* this name will be both used for lookup in "urlgen" for + your plugin's static resources and for the subdirectory that + it'll be "mounted" to for serving via your web browser. It + *MUST* be unique. If writing a plugin bundled with MediaGoblin + please use the pattern 'coreplugin__foo' where 'foo' is your + plugin name. All external plugins should use their modulename, + so if your plugin is 'mg_bettertags' you should also call this + name 'mg_bettertags'. + - *file_path:* the directory your plugin's static resources are + located in. It's recommended that you use + pkg_resources.resource_filename() for this. An example of using this:: @@ -48,7 +48,7 @@ setup( 'pytest>=2.3.1', 'pytest-xdist', 'werkzeug>=0.7', - 'celery', + 'celery>=3.0', 'kombu', 'jinja2', 'sphinx', @@ -63,7 +63,7 @@ setup( 'itsdangerous', 'pytz', 'six', - 'oauthlib', + 'oauthlib==0.5.0', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from |