diff --git a/FOO300 b/FOO300 deleted file mode 100644 index 0acf17a8..00000000 --- a/FOO300 +++ /dev/null @@ -1,15 +0,0 @@ - -This certifies that GNU MediaGoblin has been given the designation of: - - FOO 300 - -In the Foo Communications ("FooCorp") catalogue of permanent record. - -Signed: - - - - - Matt Lee - - Foo Communications, LLC \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index b3ae7b75..0a39ce84 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,11 @@ recursive-include mediagoblin/i18n *.mo -recursive-include mediagoblin/templates *.html *.txt *.xml -recursive-include mediagoblin/static *.js *.css *.png *.svg *.ico -recursive-include mediagoblin/tests *.ini +recursive-include mediagoblin *.js *.css *.png *.svg *.ico +recursive-include mediagoblin *.ini +recursive-include mediagoblin *.html *.txt recursive-include docs *.rst *.html +include mediagoblin.ini mediagoblin/config_spec.ini paste.ini include mediagoblin/config_spec.ini graft extlib +graft licenses +include COPYING AUTHORS +include lazyserver.sh lazystarter.sh lazycelery.sh diff --git a/babel.ini b/babel.ini index 1a8231f5..1c5e54f0 100644 --- a/babel.ini +++ b/babel.ini @@ -1,10 +1,10 @@ # Extraction from Python source files [python: mediagoblin/**.py] # Extraction from Genshi HTML and text templates -[jinja2: mediagoblin/templates/**.html] +[jinja2: mediagoblin/**/templates/**.html] # Extract jinja templates (html) encoding = utf-8 -extensions = jinja2.ext.autoescape +extensions = jinja2.ext.autoescape, mediagoblin.tools.template.TemplateHookExtension [jinja2: mediagoblin/templates/**.txt] # Extract jinja templates (text) diff --git a/docs/source/conf.py b/docs/source/conf.py index 4209acc8..0b2bccac 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,7 +26,8 @@ sys.path.insert(0, os.path.abspath(os.path.join('..', '..'))) # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = [] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx'] +intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)} # Add any paths that contain templates here, relative to this directory. templates_path = ['source/_templates'] diff --git a/docs/source/siteadmin/codebase.rst b/docs/source/devel/codebase.rst similarity index 100% rename from docs/source/siteadmin/codebase.rst rename to docs/source/devel/codebase.rst diff --git a/docs/source/index.rst b/docs/source/index.rst index ac8bd110..abd891a0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -44,7 +44,6 @@ MediaGoblin website. It is written for site administrators. siteadmin/relnotes siteadmin/theming siteadmin/plugins - siteadmin/codebase .. _core-plugin-section: @@ -58,6 +57,7 @@ Part 2: Core plugin documentation plugindocs/flatpagesfile plugindocs/sampleplugin plugindocs/oauth + plugindocs/trim_whitespace Part 3: Plugin Writer's Guide @@ -70,6 +70,19 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/foreward pluginwriter/quickstart + pluginwriter/database + pluginwriter/api + + +Part 4: Developer's Zone +======================== + +This chapter contains various information for developers. + +.. toctree:: + :maxdepth: 1 + + devel/codebase Indices and tables diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst new file mode 100644 index 00000000..42dc3a3d --- /dev/null +++ b/docs/source/pluginwriter/api.rst @@ -0,0 +1,24 @@ +.. MediaGoblin Documentation + + Written in 2013 by MediaGoblin contributors + + To the extent possible under law, the author(s) have dedicated all + copyright and related and neighboring rights to this software to + the public domain worldwide. This software is distributed without + any warranty. + + You should have received a copy of the CC0 Public Domain + Dedication along with this software. If not, see + . + + +========== +Plugin API +========== + +:mod:`pluginapi` Module +----------------------- + +.. automodule:: mediagoblin.tools.pluginapi + :members: get_config, register_routes, register_template_path, + register_template_hooks, get_hook_templates diff --git a/docs/source/pluginwriter/database.rst b/docs/source/pluginwriter/database.rst new file mode 100644 index 00000000..58edf3a0 --- /dev/null +++ b/docs/source/pluginwriter/database.rst @@ -0,0 +1,111 @@ +.. MediaGoblin Documentation + + Written in 2013 by MediaGoblin contributors + + To the extent possible under law, the author(s) have dedicated all + copyright and related and neighboring rights to this software to + the public domain worldwide. This software is distributed without + any warranty. + + You should have received a copy of the CC0 Public Domain + Dedication along with this software. If not, see + . + + +======== +Database +======== + + +Accessing Existing Data +======================= + +If your plugin wants to access existing data, this is quite +straight forward. Just import the appropiate models and use +the full power of SQLAlchemy. Take a look at the (upcoming) +database section in the Developer's Chapter. + + +Creating new Tables +=================== + +If your plugin needs some new space to store data, you +should create a new table. Please do not modify core +tables. Not doing so might seem inefficient and possibly +is. It will help keep things sane and easier to upgrade +versions later. + +So if you create a new plugin and need new tables, create a +file named ``models.py`` in your plugin directory. You +might take a look at the core's db.models for some ideas. +Here's a simple one: + +.. code-block:: python + + from mediagoblin.db.base import Base + from sqlalchemy import Column, Integer, Unicode, ForeignKey + + class MediaSecurity(Base): + __tablename__ = "yourplugin__media_security" + + # The primary key *and* reference to the main media_entry + media_entry = Column(Integer, ForeignKey('core__media_entries.id'), + primary_key=True) + get_media_entry = relationship("MediaEntry", + backref=backref("security_rating", cascade="all, delete-orphan")) + + rating = Column(Unicode) + + MODELS = [MediaSecurity] + +That's it. + +Some notes: + +* Make sure all your ``__tablename__`` start with your + plugin's name so the tables of various plugins can't + conflict in the database. (Conflicts in python naming are + much easier to fix later). +* Try to get your database design as good as possible in + the first attempt. Changing the database design later, + when people already have data using the old design, is + possible (see next chapter), but it's not easy. + + +Changing the Database Schema Later +================================== + +If your plugin is in use and instances use it to store some +data, changing the database design is a tricky thing. + +1. Make up your mind how the new schema should look like. +2. Change ``models.py`` to contain the new schema. Keep a + copy of the old version around for your personal + reference later. +3. Now make up your mind (possibly using your old and new + ``models.py``) what steps in SQL are needed to convert + the old schema to the new one. + This is called a "migration". +4. Create a file ``migrations.py`` that will contain all + your migrations and add your new migration. + +Take a look at the core's ``db/migrations.py`` for some +good examples on what you might be able to do. Here's a +simple one to add one column: + +.. code-block:: python + + from mediagoblin.db.migration_tools import RegisterMigration, inspect_table + from sqlalchemy import MetaData, Column, Integer + + MIGRATIONS = {} + + @RegisterMigration(1, MIGRATIONS) + def add_license_preference(db): + metadata = MetaData(bind=db.bind) + + security_table = inspect_table(metadata, 'yourplugin__media_security') + + col = Column('security_level', Integer) + col.create(security_table) + db.commit() diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 91406f96..9b2324ae 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -282,6 +282,10 @@ this ``nginx.conf`` file should be modeled on the following:: # Change this to update the upload size limit for your users client_max_body_size 8m; + # prevent attacks (someone uploading a .txt file that the browser + # interprets as an HTML file, etc.) + add_header X-Content-Type-Options nosniff; + server_name mediagoblin.example.org www.mediagoblin.example.org; access_log /var/log/nginx/mediagoblin.example.access.log; error_log /var/log/nginx/mediagoblin.example.error.log; diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 8fbce5e4..23d3f3b9 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -71,16 +71,24 @@ Video To enable video, first install gstreamer and the python-gstreamer bindings (as well as whatever gstremaer extensions you want, -good/bad/ugly). On Debianoid systems:: +good/bad/ugly). On Debianoid systems - sudo apt-get install python-gst0.10 gstreamer0.10-plugins-{base,bad,good,ugly} \ +.. code-block:: bash + + sudo apt-get install python-gst0.10 \ + gstreamer0.10-plugins-base \ + gstreamer0.10-plugins-bad \ + gstreamer0.10-plugins-good \ + gstreamer0.10-plugins-ugly \ gstreamer0.10-ffmpeg Add ``mediagoblin.media_types.video`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. -Run:: +Run + +.. code-block:: bash ./bin/gmg dbupdate @@ -108,7 +116,9 @@ To install these on Debianoid systems, run:: The ``scikits.audiolab`` package you will install in the next step depends on the ``libsndfile1-dev`` package, so we should install it. -On Debianoid systems, run:: +On Debianoid systems, run + +.. code-block:: bash sudo apt-get install libsndfile1-dev @@ -126,7 +136,9 @@ Then install ``scikits.audiolab`` for the spectrograms:: Add ``mediagoblin.media_types.audio`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. -Run:: +Run + +.. code-block:: bash ./bin/gmg dbupdate @@ -138,7 +150,9 @@ Ascii art To enable ascii art support, first install the `chardet `_ -library, which is necessary for creating thumbnails of ascii art:: +library, which is necessary for creating thumbnails of ascii art + +.. code-block:: bash ./bin/easy_install chardet @@ -152,7 +166,9 @@ the list would look like this:: media_types = mediagoblin.media_types.image, mediagoblin.media_types.ascii -Run:: +Run + +.. code-block:: bash ./bin/gmg dbupdate @@ -171,7 +187,9 @@ is surely not to work prior to Blender 2.5X). Add ``mediagoblin.media_types.stl`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. -Run:: +Run + +.. code-block:: bash ./bin/gmg dbupdate diff --git a/docs/source/siteadmin/production-deployments.rst b/docs/source/siteadmin/production-deployments.rst index 356fab7f..0ed5ac6a 100644 --- a/docs/source/siteadmin/production-deployments.rst +++ b/docs/source/siteadmin/production-deployments.rst @@ -77,6 +77,52 @@ Modify your existing MediaGoblin and application init scripts, if necessary, to prevent them from starting their own ``celeryd`` processes. +Monitor exceptions +------------------ + +This is an example config using raven_ to report exceptions and +:py:mod:`logging` messages to a sentry_ instance + +.. _raven: http://raven.readthedocs.org/ +.. _sentry: https://github.com/getsentry + +.. code-block:: ini + + [pipeline:main] + pipeline = + errors + raven + routing + + [loggers] + keys = root, sentry + + [handlers] + keys = console, sentry + + [formatters] + keys = generic + + [logger_root] + level = INFO + handlers = console, sentry + + [logger_sentry] + level = WARN + handlers = console + qualname = sentry.errors + propagate = 0 + + [handler_sentry] + class = raven.handlers.logging.SentryHandler + args = ('http://public:secret@example.com/1',) + level = WARNING + formatter = generic + + [filter:raven] + use = egg:raven#raven + dsn = http://71727ea2c69043e4bbcd793bb0115cd4:e9cedccb32d9482d81f99eeca8b1ad30@sentry.talka.tv/3 + .. _init-script: Use an Init Script diff --git a/extlib/html5shiv/html5shiv.js b/extlib/html5shiv/html5shiv.js deleted file mode 100644 index 8de0ff54..00000000 --- a/extlib/html5shiv/html5shiv.js +++ /dev/null @@ -1,3 +0,0 @@ -// HTML5 Shiv v3 | @jon_neal @afarkas @rem | MIT/GPL2 Licensed -// Uncompressed source: https://github.com/aFarkas/html5shiv -(function(a,b){var c=function(a){return a.innerHTML="",a.childNodes.length===1}(b.createElement("a")),d=function(a,b,c){return b.appendChild(a),(c=(c?c(a):a.currentStyle).display)&&b.removeChild(a)&&c==="block"}(b.createElement("nav"),b.documentElement,a.getComputedStyle),e={elements:"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video".split(" "),shivDocument:function(a){a=a||b;if(a.documentShived)return;a.documentShived=!0;var f=a.createElement,g=a.createDocumentFragment,h=a.getElementsByTagName("head")[0],i=function(a){f(a)};c||(e.elements.join(" ").replace(/\w+/g,i),a.createElement=function(a){var b=f(a);return b.canHaveChildren&&e.shivDocument(b.document),b},a.createDocumentFragment=function(){return e.shivDocument(g())});if(!d&&h){var j=f("div");j.innerHTML=["x"].join(""),h.insertBefore(j.lastChild,h.firstChild)}return a}};e.shivDocument(b),a.html5=e})(this,document) \ No newline at end of file diff --git a/extlib/html5shiv/MIT.txt b/extlib/jquery/MIT-LICENSE.txt similarity index 93% rename from extlib/html5shiv/MIT.txt rename to extlib/jquery/MIT-LICENSE.txt index 5a2aeb47..957f26d3 100644 --- a/extlib/html5shiv/MIT.txt +++ b/extlib/jquery/MIT-LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) +Copyright 2013 jQuery Foundation and other contributors +http://jquery.com/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/extlib/jquery/MIT.txt b/extlib/jquery/MIT.txt deleted file mode 100644 index 5a2aeb47..00000000 --- a/extlib/jquery/MIT.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/mediagoblin.ini b/mediagoblin.ini index aee48595..bed69737 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -1,5 +1,9 @@ # If you want to make changes to this file, first copy it to # mediagoblin_local.ini, then make the changes there. +# +# If you don't see what you need here, have a look at mediagoblin/config_spec.ini +# It defines types and defaults so it’s a good place to look for documentation +# or to find hidden options that we didn’t tell you about. :) [mediagoblin] direct_remote_path = /mgoblin_static/ @@ -27,9 +31,6 @@ allow_registration = true ## install other themes. # theme = airy -# Should geotagged images be displayed with a map of the location? -geolocation_map_visible = true - [storage:queuestore] base_dir = %(here)s/user_dev/media/queue @@ -43,3 +44,4 @@ base_url = /mgoblin_media/ # place plugins here---each in their own subsection of [plugins]. see # documentation for details. [plugins] +[[mediagoblin.plugins.geolocation]] diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 10fbf4a3..607d599b 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -21,7 +21,7 @@ from mediagoblin.routing import get_url_map from mediagoblin.tools.routing import endpoint_to_controller from werkzeug.wrappers import Request -from werkzeug.exceptions import HTTPException, NotFound +from werkzeug.exceptions import HTTPException from werkzeug.routing import RequestRedirect from mediagoblin import meddleware, __version__ diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py index 7cae951a..8f091d21 100644 --- a/mediagoblin/auth/forms.py +++ b/mediagoblin/auth/forms.py @@ -15,7 +15,6 @@ # along with this program. If not, see . import wtforms -import re from mediagoblin.tools.mail import normalize_email from mediagoblin.tools.translate import fake_ugettext_passthrough as _ diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 712d087e..44f6a68f 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -55,7 +55,6 @@ csrf_cookie_name = string(default='mediagoblin_csrftoken') push_urls = string_list(default=list()) exif_visible = boolean(default=False) -geolocation_map_visible = boolean(default=False) # Theming stuff theme_install_dir = string(default="%(here)s/user_dev/themes/") @@ -86,6 +85,10 @@ 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") + [media_type:mediagoblin.media_types.video] # Should we keep the original file? keep_original = boolean(default=False) @@ -97,6 +100,9 @@ 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=True) + [[skip_transcode]] mime_types = string_list(default=list("video/webm")) container_formats = string_list(default=list("Matroska")) @@ -104,9 +110,10 @@ 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 qualiy +# vorbisenc quality quality = float(default=0.3) create_spectrogram = boolean(default=True) spectrogram_fft_size = integer(default=4096) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 3f43c789..167c4f87 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -21,6 +21,7 @@ from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, ForeignKey) from sqlalchemy.exc import ProgrammingError from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.sql import and_ from migrate.changeset.constraint import UniqueConstraint from mediagoblin.db.migration_tools import RegisterMigration, inspect_table @@ -190,9 +191,63 @@ def fix_CollectionItem_v0_constraint(db_conn): def add_license_preference(db): metadata = MetaData(bind=db.bind) - user_table = Table('core__users', metadata, autoload=True, - autoload_with=db.bind) + user_table = inspect_table(metadata, 'core__users') - col = Column('license_preference', Unicode, default=u'') + col = Column('license_preference', Unicode) col.create(user_table) db.commit() + + +@RegisterMigration(9, MIGRATIONS) +def mediaentry_new_slug_era(db): + """ + Update for the new era for media type slugs. + + Entries without slugs now display differently in the url like: + /u/cwebber/m/id=251/ + + ... because of this, we should back-convert: + - entries without slugs should be converted to use the id, if possible, to + make old urls still work + - slugs with = (or also : which is now also not allowed) to have those + stripped out (small possibility of breakage here sadly) + """ + import uuid + + def slug_and_user_combo_exists(slug, uploader): + return db.execute( + media_table.select( + and_(media_table.c.uploader==uploader, + media_table.c.slug==slug))).first() is not None + + def append_garbage_till_unique(row, new_slug): + """ + Attach junk to this row until it's unique, then save it + """ + if slug_and_user_combo_exists(new_slug, row.uploader): + # okay, still no success; + # let's whack junk on there till it's unique. + new_slug += '-' + uuid.uuid4().hex[:4] + # keep going if necessary! + while slug_and_user_combo_exists(new_slug, row.uploader): + new_slug += uuid.uuid4().hex[:4] + + db.execute( + media_table.update(). \ + where(media_table.c.id==row.id). \ + values(slug=new_slug)) + + metadata = MetaData(bind=db.bind) + + media_table = inspect_table(metadata, 'core__media_entries') + + for row in db.execute(media_table.select()): + # no slug, try setting to an id + if not row.slug: + append_garbage_till_unique(row, unicode(row.id)) + # has "=" or ":" in it... we're getting rid of those + elif u"=" in row.slug or u":" in row.slug: + append_garbage_till_unique( + row, row.slug.replace(u"=", u"-").replace(u":", u"-")) + + db.commit() diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 001b7826..6789a970 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -27,6 +27,8 @@ These functions now live here and get "mixed in" into the real objects. """ +import uuid + from werkzeug.utils import cached_property from mediagoblin import mg_globals @@ -52,19 +54,69 @@ class UserMixin(object): class MediaEntryMixin(object): def generate_slug(self): + """ + Generate a unique slug for this MediaEntry. + + This one does not *force* slugs, but usually it will probably result + in a niceish one. + + The end *result* of the algorithm will result in these resolutions for + these situations: + - If we have a slug, make sure it's clean and sanitized, and if it's + unique, we'll use that. + - If we have a title, slugify it, and if it's unique, we'll use that. + - If we can't get any sort of thing that looks like it'll be a useful + slug out of a title or an existing slug, bail, and don't set the + slug at all. Don't try to create something just because. Make + sure we have a reasonable basis for a slug first. + - If we have a reasonable basis for a slug (either based on existing + slug or slugified title) but it's not unique, first try appending + the entry's id, if that exists + - If that doesn't result in something unique, tack on some randomly + generated bits until it's unique. That'll be a little bit of junk, + but at least it has the basis of a nice slug. + """ # import this here due to a cyclic import issue # (db.models -> db.mixin -> db.util -> db.models) from mediagoblin.db.util import check_media_slug_used - self.slug = slugify(self.title) + #Is already a slug assigned? Check if it is valid + if self.slug: + self.slug = slugify(self.slug) + + # otherwise, try to use the title. + elif self.title: + # assign slug based on title + self.slug = slugify(self.title) + + # We don't want any empty string slugs + if self.slug == u"": + self.slug = None - duplicate = check_media_slug_used(self.uploader, self.slug, self.id) - - if duplicate: - if self.id is not None: - self.slug = u"%s-%s" % (self.id, self.slug) - else: - self.slug = None + # Do we have anything at this point? + # If not, we're not going to get a slug + # so just return... we're not going to force one. + if not self.slug: + return # giving up! + + # Otherwise, let's see if this is unique. + if check_media_slug_used(self.uploader, self.slug, self.id): + # It looks like it's being used... lame. + + # Can we just append the object's id to the end? + if self.id: + slug_with_id = u"%s-%s" % (self.slug, self.id) + if not check_media_slug_used(self.uploader, + slug_with_id, self.id): + self.slug = slug_with_id + return # success! + + # okay, still no success; + # let's whack junk on there till it's unique. + self.slug += '-' + uuid.uuid4().hex[:4] + # keep going if necessary! + while check_media_slug_used(self.uploader, self.slug, self.id): + self.slug += uuid.uuid4().hex[:4] @property def description_html(self): @@ -98,8 +150,10 @@ class MediaEntryMixin(object): @property def slug_or_id(self): - return (self.slug or self.id) - + if self.slug: + return self.slug + else: + return u'id:%s' % self.id def url_for_self(self, urlgen, **extra_args): """ diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 7e2cc7d2..2f58503f 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -20,7 +20,6 @@ TODO: indexes on foreignkeys, where useful. import logging import datetime -import sys from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \ Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \ @@ -32,9 +31,10 @@ from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.util import memoized_property from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded -from mediagoblin.db.base import Base, DictReadAttrProxy, Session +from mediagoblin.db.base import Base, DictReadAttrProxy from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, MediaCommentMixin, CollectionMixin, CollectionItemMixin from mediagoblin.tools.files import delete_media_files +from mediagoblin.tools.common import import_component # It's actually kind of annoying how sqlalchemy-migrate does this, if # I understand it right, but whatever. Anyway, don't remove this :P @@ -84,9 +84,7 @@ class User(Base, UserMixin): def delete(self, **kwargs): """Deletes a User and all related entries/comments/files/...""" - # Delete this user's Collections and all contained CollectionItems - for collection in self.collections: - collection.delete(commit=False) + # Collections get deleted by relationships. media_entries = MediaEntry.query.filter(MediaEntry.uploader == self.id) for media in media_entries: @@ -147,6 +145,7 @@ class MediaEntry(Base, MediaEntryMixin): ) attachment_files_helper = relationship("MediaAttachmentFile", + cascade="all, delete-orphan", order_by="MediaAttachmentFile.created" ) attachment_files = association_proxy("attachment_files_helper", "dict_view", @@ -167,7 +166,6 @@ class MediaEntry(Base, MediaEntryMixin): collections = association_proxy("collections_helper", "in_collection") ## TODO - # media_data # fail_error def get_comments(self, ascending=False): @@ -197,40 +195,31 @@ class MediaEntry(Base, MediaEntryMixin): if media is not None: return media.url_for_self(urlgen) - #@memoized_property @property def media_data(self): - session = Session() - - return session.query(self.media_data_table).filter_by( - media_entry=self.id).first() + return getattr(self, self.media_data_ref) def media_data_init(self, **kwargs): """ Initialize or update the contents of a media entry's media_data row """ - session = Session() + media_data = self.media_data - media_data = session.query(self.media_data_table).filter_by( - media_entry=self.id).first() - - # No media data, so actually add a new one if media_data is None: - media_data = self.media_data_table( - media_entry=self.id, - **kwargs) - session.add(media_data) - # Update old media data + # Get the correct table: + table = import_component(self.media_type + '.models:DATA_MODEL') + # No media data, so actually add a new one + media_data = table(**kwargs) + # Get the relationship set up. + media_data.get_media_entry = self else: + # Update old media data for field, value in kwargs.iteritems(): setattr(media_data, field, value) @memoized_property - def media_data_table(self): - # TODO: memoize this - models_module = self.media_type + '.models' - __import__(models_module) - return sys.modules[models_module].DATA_MODEL + def media_data_ref(self): + return import_component(self.media_type + '.models:BACKREF_NAME') def __repr__(self): safe_title = self.title.encode('ascii', 'replace') @@ -395,7 +384,13 @@ class MediaComment(Base, MediaCommentMixin): created = Column(DateTime, nullable=False, default=datetime.datetime.now) content = Column(UnicodeText, nullable=False) - get_author = relationship(User) + # Cascade: Comments are owned by their creator. So do the full thing. + # lazy=dynamic: People might post a *lot* of comments, so make + # the "posted_comments" a query-like thing. + get_author = relationship(User, + backref=backref("posted_comments", + lazy="dynamic", + cascade="all, delete-orphan")) class Collection(Base, CollectionMixin): @@ -415,7 +410,10 @@ class Collection(Base, CollectionMixin): # TODO: No of items in Collection. Badly named, can we migrate to num_items? items = Column(Integer, default=0) - get_creator = relationship(User, backref="collections") + # Cascade: Collections are owned by their creator. So do the full thing. + get_creator = relationship(User, + backref=backref("collections", + cascade="all, delete-orphan")) def get_collection_items(self, ascending=False): #TODO, is this still needed with self.collection_items being available? @@ -436,7 +434,9 @@ class CollectionItem(Base, CollectionItemMixin): note = Column(UnicodeText, nullable=True) added = Column(DateTime, nullable=False, default=datetime.datetime.now) position = Column(Integer) - in_collection = relationship("Collection", + + # Cascade: CollectionItems are owned by their Collection. So do the full thing. + in_collection = relationship(Collection, backref=backref( "collection_items", cascade="all, delete-orphan")) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 09235614..fbf7b188 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -125,24 +125,29 @@ def get_user_media_entry(controller): if not user: raise NotFound() - media = MediaEntry.query.filter_by( - slug = request.matchdict['media'], - state = u'processed', - uploader = user.id).first() + media = None - if not media: - # no media via slug? Grab it via object id + # might not be a slug, might be an id, but whatever + media_slug = request.matchdict['media'] + + # if it starts with id: it actually isn't a slug, it's an id. + if media_slug.startswith(u'id:'): try: media = MediaEntry.query.filter_by( - id = int(request.matchdict['media']), - state = u'processed', - uploader = user.id).first() + id=int(media_slug[3:]), + state=u'processed', + uploader=user.id).first() except ValueError: - # media "id" was no int raise NotFound() + else: + # no magical id: stuff? It's a slug! + media = MediaEntry.query.filter_by( + slug=media_slug, + state=u'processed', + uploader=user.id).first() if not media: - # no media by that id? Okay, 404. + # Didn't find anything? Okay, 404. raise NotFound() return controller(request, media=media, *args, **kwargs) @@ -187,10 +192,6 @@ def get_user_collection_item(controller): if not user: return render_404(request) - collection = request.db.Collection.find_one( - {'slug': request.matchdict['collection'], - 'creator': user.id}) - collection_item = request.db.CollectionItem.find_one( {'id': request.matchdict['collection_item'] }) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 25a617fd..cdb5c713 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from cgi import FieldStorage from datetime import datetime from werkzeug.exceptions import Forbidden @@ -28,7 +27,7 @@ from mediagoblin.edit import forms from mediagoblin.edit.lib import may_edit_media from mediagoblin.decorators import (require_active_login, active_user_from_url, get_media_entry_by_id, - get_user_media_entry, user_may_alter_collection, get_user_collection) + user_may_alter_collection, get_user_collection) from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.text import ( @@ -99,7 +98,7 @@ UNSAFE_MIMETYPES = [ 'text/svg+xml'] -@get_user_media_entry +@get_media_entry_by_id @require_active_login def edit_attachments(request, media): if mg_globals.app_config['allow_attachments']: diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo index d8d02ded..574cb807 100644 Binary files a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po index 6bdfacc6..ca35e27c 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -21,82 +21,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "اسم المستخدم" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "كلمة السر" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "عنوان البريد الإلكتروني" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "عفوًا، التسجيل غير متاح هنا." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "مفتاح التحقق أو معرف المستخدم خاطئ" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "أعدنا إرسال رسالة التحقق." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "العنوان" @@ -105,8 +119,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -121,11 +135,11 @@ msgstr "الوسوم" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "المسار" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "لا يمكن ترك المسار فارغًا" @@ -164,65 +178,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -238,6 +268,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -247,6 +284,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,11 +355,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -321,56 +382,71 @@ msgstr "" msgid "File" msgstr "الملف" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "يجب أن تضع ملفًا." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "يا سلام! نُشرَت!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "شعار ميدياغوبلن" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "أضف وسائط" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "أضف وسائط" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -435,7 +490,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "أحدث الوسائط" @@ -541,6 +596,11 @@ msgid "" "%(verification_url)s" msgstr "أهلًا يا %(username)s،\n\nافتح الرابط التالي\nفي متصفحك لتفعيل حسابك في غنو ميدياغوبلن:\n\n%(verification_url)s" +#: 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 @@ -548,34 +608,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -588,13 +664,17 @@ msgstr "تحرير %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "تحرير ملف %(username)s الشخصي" @@ -610,7 +690,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -633,7 +713,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -645,8 +725,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -691,21 +771,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -713,12 +793,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -735,12 +809,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -750,11 +824,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "أتود حقًا حذف %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -764,6 +833,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +855,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "وسائط %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -887,27 +963,31 @@ msgstr "إن كنت أنت ذلك الشخص لكنك فقدت رسالة الت msgid "Here's a spot to tell others about yourself." msgstr "هذه زاوية لتخبر الآخرين فيها عن نفسك." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "أظهِر كل وسائط %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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:157 +#: 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..." @@ -917,28 +997,24 @@ msgstr "لا يبدو أنه توجد أي وسائط هنا حتى الآن..." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -969,49 +1045,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "ويحي!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "أنا متأكد من رغبتي بحذف هذا العمل" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1019,74 +1110,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index ae6216cf..6dac0a74 100644 Binary files a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index 79f26e8f..4ea2a74f 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -21,82 +21,96 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nom d'usuari" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Contrasenya" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adreça electrònica" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nom d'usuari o correu" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Entrada incorrecte" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Lamentablement aquest usuari ja existeix." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Torna'm a enviar el correu de verificació" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "No es troba ningu amb aquest nom d'usuari o correu electrònic." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Títol" @@ -105,8 +119,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -121,11 +135,11 @@ msgstr "Etiquetes" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Llimac" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "El llimac no pot ésser buit" @@ -164,65 +178,81 @@ msgstr "Introdueix la teva contrasenya antiga per comprovar que aquest compte é msgid "New password" msgstr "Nova contrasenya" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "Envia'm correu quan d'altres comentin al meu mitjà" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "La part del títol de l'adreça d'aquesta col.lecció. Normalment no cal que canviis això." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Els canvis al perfil s'han guardat" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Els detalls del compte s'han guardat" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Contrasenya errònia" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Els detalls del compte s'han guardat" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ja tens una col.lecció anomenada \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Estas editant la col.lecció d'un altre usuari. Prossegueix amb cautela." @@ -238,6 +268,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "Tot i així, l'enllaç antic al directori s'ha trobat; eliminat.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -247,6 +284,15 @@ msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :(" msgid "Video transcoding failed" msgstr "La transformació del vídeo ha fallat" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Ubicació" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Veure a OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID del client" @@ -309,11 +355,26 @@ 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:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "El client {0} ha sigut enregistrat!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és vàlid." @@ -321,56 +382,71 @@ msgstr "Aquest tipus de fitxer no és vàlid." msgid "File" msgstr "Fitxer" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Heu d'escollir un fitxer." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Visca! S'ha enviat!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "S'ha afegit la col.leccio \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logo de mediagoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Tots els fitxers" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Alimentat per MediaGoblin, un projecte GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Tots els fitxers" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Modificar els ajustaments del compte" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Quadre de processament de fitxers" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "El lloc esta usant MediaGoblin, una gran i extraordinària peça de software per allotjar mitjans." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Per afegir el teu propi mitjà, col.locar comentaris, i més, pots conectar-te amb el teu compte MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "No en tens una encara? Es fàcil!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -435,7 +490,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Crear un compte a aquest lloc \no\n Preparar MediaGoblin al teu propi servidor" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mitjans més recents" @@ -541,6 +596,11 @@ msgid "" "%(verification_url)s" msgstr "Hi %(username)s,\n\nto activate your GNU MediaGoblin account, open the following URL in\nyour web browser:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logo de mediagoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -548,34 +608,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editant afegits per a %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancel·la" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Desa els canvis" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Esborrar permanentment" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -588,13 +664,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Editant %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Editant perfil de %(username)s" @@ -610,7 +690,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Descarregar" @@ -633,7 +713,7 @@ msgid "" msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'àudio, a \n » http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Arxiu original" @@ -645,8 +725,8 @@ msgstr "Arxiu WebM (Vorbis codec)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Imatge per %(media_title)s" @@ -691,21 +771,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Ho sento, aquest video no funcionarà perquè \n » el teu navegador web no té suport per videos \n » HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Pots obtenir un navegador web modern que \n » podrà reproduir aquest vídeo, a \n » http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "Arxiu WebM (640p; VP8/Vorbis)" @@ -713,12 +793,6 @@ msgstr "Arxiu WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Afegir a la col.lecció" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Afegir" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -735,12 +809,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s per a %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Editar" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Esborrar" @@ -750,11 +824,6 @@ msgstr "Esborrar" msgid "Really delete %(title)s?" msgstr "Realment vols esborrar %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Esborrar permanentment" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -764,6 +833,16 @@ msgstr "Relment eliminar %(media_title)s de %(collection_title)s?" msgid "Remove" msgstr "Eliminar" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +855,53 @@ msgstr "Hola %(username)s,\n%(comment_author)s ha comentat el teu post (%(commen msgid "%(username)s's media" msgstr "Mitjà de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)s's media" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Navegant mitjà per a %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Afegeix un comentari" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Pots usar Markdown per donar format." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Afegir aquest comentari" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "a" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Afegit el

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" +#: 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:35 -#, python-format -msgid "Add %(title)s to collection" -msgstr "Afegir %(title)s a la col.lecció" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Afegir una nova col.lecció" @@ -887,27 +963,31 @@ msgstr "Si siu aqeust usuari però heu perdut el correu de verificació, podeu < msgid "Here's a spot to tell others about yourself." msgstr "Aqui hi ha un espai per explicar de tu als demés" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Edita el perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Aquest usuari encara no ha escrit res al seu perfil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "View all of %(username)s's media" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Aqui és on apareixerà el teu mitjà, però sembla que encara no hi has afegit res." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -917,28 +997,24 @@ msgstr "Sembla que no hi ha cap mitjà aqui encara..." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "A les col.leccions (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "Icona RSS" #: 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/geolocation_map.html:25 -msgid "Location" -msgstr "Ubicació" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Veure a OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tots els drets reservats" @@ -969,49 +1045,64 @@ msgstr "més antic" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "No s'ha pogut llegir l'arxiu d'imatge" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Pots usar Markdown per donar format." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Estic segur que vull esborrar això" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Estic segur que vull esborrar aquest element de la col.lecció" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Sel.leccionar --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Incluir una nota" @@ -1019,74 +1110,69 @@ msgstr "Incluir una nota" msgid "commented on your post" msgstr "comentat al teu post" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +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:236 msgid "You have to select or add a collection" msgstr "Has de sel.leccionar o afegir una col.lecció" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" ja és a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" afegir a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:261 -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:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Sembla que falten alguns arxius amb aquesta entrada. Tot i així s'eliminen." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Has esborrat el mitjà" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Has esborrat la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Ets a punt d'esborrar la col.lecció d'un altre usuari. Prossegueix amb cautela." diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo index 9d9955ce..a12d23c6 100644 Binary files a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index c0677f43..9362aade 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -21,82 +21,96 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brugernavn eller email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Forkert input" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Desværre, det brugernavn er allerede brugt" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Email til godkendelse sendt igen." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Vi kunne ikke dit brugernavn eller email." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" @@ -105,8 +119,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -121,11 +135,11 @@ msgstr "Tags" msgid "Separate tags by commas." msgstr "Separer tags med kommaer." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -164,65 +178,81 @@ msgstr "Skriv dit gamle kodeord for at bevise det er din konto." msgid "New password" msgstr "Ny kodeord" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "Email mig når andre kommenterer på mine medier" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Kontoindstillinger gemt" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Kontoindstillinger gemt" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du er ved at ændre en anden bruger's samling. Pas på." @@ -238,6 +268,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -247,6 +284,15 @@ msgstr "Desværre, jeg understøtter ikke den filtype :(" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,11 +355,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "Dette felt er nødvendigt for offentlige klienter" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klienten {0} er blevet registreret!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." @@ -321,56 +382,71 @@ msgstr "Forkert fil for medietypen." msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Du må give mig en fil" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Juhuu! Delt!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin logo" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Har du ikke en endnu? Det er let!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -435,7 +490,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -541,6 +596,11 @@ msgid "" "%(verification_url)s" msgstr "" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin logo" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -548,34 +608,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Afbryd" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Gem ændringer" +#: 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:47 +#: 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 @@ -588,13 +664,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Redigerer %(username)s profil" @@ -610,7 +690,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -633,7 +713,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -645,8 +725,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -691,21 +771,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -713,12 +793,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -735,12 +809,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -750,11 +824,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -764,6 +833,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +855,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -887,27 +963,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "Her kan du fortælle andre om dig selv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Ret profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -917,28 +997,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -969,49 +1045,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1019,74 +1110,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo index 6374be42..be8d9796 100644 Binary files a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index d3a56821..ac3282cb 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -1,11 +1,12 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: # , 2011. # , 2011. # Elrond , 2011-2012. +# Elrond , 2013. # , 2011, 2012. # Jakob Kramer , 2012. # Jan-Christoph Borchardt , 2011. @@ -20,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" @@ -31,82 +32,96 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Benutzername" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Passwort" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-Mail-Adresse" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Benutzername oder E-Mail-Adresse" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Fehlerhafte Eingabe" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Aktivierungsmail wurde erneut versandt." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "Es konnte niemand mit diesem Benutzernamen gefunden werden." + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Es konnte niemand mit diesem Nutzernamen oder Email gefunden werden." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" @@ -115,8 +130,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -131,11 +146,11 @@ msgstr "Schlagwörter" msgid "Separate tags by commas." msgstr "Kommaseparierte Schlagwörter" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Kurztitel" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Bitte gib einen Kurztitel ein" @@ -174,65 +189,81 @@ msgstr "Gib dein altes Passwort ein, um zu bestätigen, dass du dieses Konto bes msgid "New password" msgstr "Neues Passwort" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Der Titelteil dieser Sammlungsadresse. Du musst ihn normalerweise nicht ändern." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Diesen Kurztitel hast du bereits vergeben." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Sie haben den Anhang %s hinzugefügt!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Das Profil wurde aktualisiert" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Kontoeinstellungen gespeichert" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Falsches Passwort" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Kontoeinstellungen gespeichert" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" -msgstr "Du hast bereits eine Sammlung mit Namen \"%s\"!" +msgstr "Du hast bereits eine Sammlung mit Namen »%s«!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "Eine Sammlung mit diesem Kürzel existiert bereits für diesen Benutzer." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du bearbeitest die Sammlung eines anderen Benutzers. Sei vorsichtig." @@ -248,6 +279,13 @@ msgstr "Für dieses Theme gibt es kein asset-Verzeichnis\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Trotzdem wurde eine alte Verknüpfung gefunden; sie wurde entfernt\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -257,6 +295,15 @@ msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt." msgid "Video transcoding failed" msgstr "Videokonvertierung fehlgeschlagen" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Aufnahmeort" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "In OpenStreetMap öffnen" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Client-ID" @@ -319,11 +366,26 @@ 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:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Client {0} wurde registriert!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein." @@ -331,56 +393,71 @@ msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein." msgid "File" msgstr "Datei" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Du musst eine Datei angeben." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "JAAA! Geschafft!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" -msgstr "Sammlung \"%s\" hinzugefügt!" +msgstr "Sammlung »%s« hinzugefügt!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin Logo" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "%(user_name)ss Konto" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "abmelden" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Medien hinzufügen" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Bitte bestätige Deine E-Mail-Adresse!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "abmelden" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Diese Seite setzt das GNU-Projekt MediaGoblin ein." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "%(user_name)ss Konto" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Medien hinzufügen" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr " Neues Album erstellen" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Kontoeinstellungen ändern" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Medienverarbeitung" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Diese Webseite setzt MediaGoblin ein, eine großartige Software für Medienhosting." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Melde Dich mit Deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, andere zu kommentieren und vieles mehr." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Hast du noch keinen? Das geht ganz einfach!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -445,7 +501,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Registriere dich auf dieser Seite oder Installiere MediaGoblin auf deinem eigenen Server" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Neuste Medien" @@ -551,6 +607,11 @@ msgid "" "%(verification_url)s" msgstr "Hallo %(username)s,\n\num deinNutzerkonto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin Logo" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -558,34 +619,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Bearbeite Anhänge von %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Anhänge" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Anhang hinzufügen" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Abbrechen" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Änderungen speichern" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Dauerhaft löschen" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -598,13 +675,17 @@ msgstr "%(media_title)s bearbeiten" msgid "Changing %(username)s's account settings" msgstr "%(username)ss Kontoeinstellungen ändern" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Bearbeite %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "%(username)ss Profil bearbeiten" @@ -620,7 +701,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Download" @@ -643,7 +724,7 @@ msgid "" msgstr "Hol dir auf http://getfirefox.com einen modernen Webbrowser, der dieses Audiostück abspielen kann!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Originaldatei" @@ -655,8 +736,8 @@ msgstr "WebM-Datei (Vorbis-Codec)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Bild für %(media_title)s" @@ -687,7 +768,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 msgid "WebGL" -msgstr "" +msgstr "WebGL" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 msgid "Download model" @@ -695,27 +776,27 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 msgid "File Format" -msgstr "" +msgstr "Dateiformat" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 msgid "Object Height" msgstr "Objekthöhe" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:40 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." msgstr "Entschuldige, dieses Video wird nicht funktionieren, weil dein Webbrowser kein HTML5-Video unterstützt." -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "Hol dir auf http://getfirefox.com einen modernen Webbrowser, der dieses Video abspielen kann!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM-Datei (640p; VP8/Vorbis)" @@ -723,12 +804,6 @@ msgstr "WebM-Datei (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Eine Sammlung hinzufügen" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Hinzufügen" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -737,20 +812,20 @@ msgstr "Deine Medien" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "%(collection_title)s (%(username)s's collection)" +msgstr "%(collection_title)s (ein Album von %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by %(username)s" -msgstr "%(collection_title)s by %(username)s" +msgstr "%(collection_title)s von %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Bearbeiten" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Löschen" @@ -760,11 +835,6 @@ msgstr "Löschen" msgid "Really delete %(title)s?" msgstr "Möchtest du %(title)s wirklich löschen?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Dauerhaft löschen" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -774,6 +844,16 @@ msgstr "Wirklich %(media_title)s aus %(collection_title)s entfernen?" msgid "Remove" msgstr "Entfernen" +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Alben von %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Alben von %(username)s" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -786,56 +866,53 @@ msgstr "Hallo %(username)s,\n%(comment_author)s hat dein Medium (%(comment_url)s msgid "%(username)s's media" msgstr "%(username)ss Medien" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)ss Medien" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Medien von %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Einen Kommentar schreiben" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Die Texte lassen sich durch Markdown formatieren." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Kommentar absenden" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "um" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Veröffentlicht am

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Medien zu einem Album hinzufügen" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "%(title)s zur Sammlung hinzufügen" +msgid "Add “%(media_title)s” to a collection" +msgstr "»%(media_title)s« zu einem Album hinzufügen" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Eine neue Sammlung hinzufügen" @@ -897,27 +974,31 @@ msgstr "Wenn dir dieses Konto gehört und die Aktivierungsmail verloren gegangen msgid "Here's a spot to tell others about yourself." msgstr "Hier kannst Du Dich selbst beschreiben." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Profil bearbeiten" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Dieser Benutzer hat (noch) keine Daten in seinem Profil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Alle Medien von %(username)s anschauen" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Hier erscheinen deine Medien, sobald du etwas hochgeladen hast." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -927,28 +1008,24 @@ msgstr "Scheinbar gibt es hier noch nichts …" msgid "(remove)" msgstr "(entfernen)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "In den Sammlungen (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "Feed-Symbol" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom-Feed" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Aufnahmeort" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "In OpenStreetMap öffnen" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle Rechte vorbehalten" @@ -979,49 +1056,64 @@ msgstr "älter" msgid "Tagged with" msgstr "Schlagwörter" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Die Bilddatei konnte nicht gelesen werden." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Hoppla!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Ein Fehler trat auf" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Funktion nicht erlaubt" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "So nicht!

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:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Tut uns Leid, aber unter der angegebenen Adresse gibt es keine Seite!

Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell verschoben oder gelöscht." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "Kommentar" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Die Texte lassen sich durch Markdown formatieren." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Ja, wirklich löschen" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Ich bin sicher, dass ich dieses Objekt aus der Sammlung entfernen möchte" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "Album" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Auswählen --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Notiz anfügen" @@ -1029,74 +1121,69 @@ msgstr "Notiz anfügen" msgid "commented on your post" msgstr "hat dein Medium kommentiert" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Hoppla, der Kommentartext fehlte." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Dein Kommentar wurde angenommen!" -#: mediagoblin/user_pages/views.py:230 -msgid "You have to select or add a collection" -msgstr "Du musst eine Sammlung auswählen oder hinzufügen" - -#: mediagoblin/user_pages/views.py:238 -#, python-format -msgid "\"%s\" already in collection \"%s\"" -msgstr "\"%s\" ist bereits in der Sammlung \"%s\"" - -#: mediagoblin/user_pages/views.py:253 -#, python-format -msgid "\"%s\" added to collection \"%s\"" -msgstr "\"%s\" zur Sammlung \"%s\" hinzugefügt" - -#: mediagoblin/user_pages/views.py:261 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "Bitte prüfe deinen Einträge und versuche erneut." -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Manche Dateien dieses Eintrags scheinen zu fehlen. Es wird trotzdem gelöscht." +#: mediagoblin/user_pages/views.py:236 +msgid "You have to select or add a collection" +msgstr "Du musst eine Sammlung auswählen oder hinzufügen" -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:248 +#, python-format +msgid "\"%s\" already in collection \"%s\"" +msgstr "»%s« ist bereits in der Sammlung »%s«" + +#: mediagoblin/user_pages/views.py:265 +#, python-format +msgid "\"%s\" added to collection \"%s\"" +msgstr "»%s« zur Sammlung »%s« hinzugefügt" + +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Du hast das Medium gelöscht." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "Du hast die Sammlung \"%s\" gelöscht" +msgstr "Du hast die Sammlung »%s« gelöscht" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 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 3ac01f5a..35baf93b 100644 --- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po @@ -1,14 +1,14 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2012. +# FIRST AUTHOR , 2013. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-12-20 10:11-0600\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,81 +17,95 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been " +"sent with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" @@ -100,8 +114,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " Make sure to permit the settings of cookies for " +"this domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -243,6 +280,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,11 +355,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -321,56 +382,72 @@ msgstr "" msgid "File" msgstr "" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU " +"project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, " "an extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your" " MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an " @@ -438,7 +494,7 @@ msgid "" "your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -543,6 +599,11 @@ msgid "" "%(verification_url)s" 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 @@ -550,34 +611,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -590,13 +667,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "" @@ -612,7 +693,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -635,7 +716,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -647,8 +728,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -693,21 +774,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -715,12 +796,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -737,12 +812,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -752,11 +827,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -766,6 +836,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,56 +859,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown " -"for formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -888,27 +965,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -918,28 +999,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -970,49 +1047,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're " "sure the address is correct, maybe the page you're looking for has been " "moved or deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown " +"for formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1020,74 +1112,70 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed " "with caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were " "sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo index 28500ceb..d34a2c1e 100644 Binary files a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index 3b1dce48..5787d250 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -1,8 +1,9 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: +# , 2013. # , 2011-2012. # Fernando Inocencio , 2011. # , 2011. @@ -10,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -21,82 +22,96 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Uzantnomo" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Pasvorto" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Retpoŝtadreso" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Salutnomo aŭ retpoŝtadreso" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "La enigitaĵo malĝustas" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Bedaŭrinde, uzanto kun tiu nomo jam ekzistas." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 msgid "You've already verified your email address!" msgstr "Vi jam konfirmis vian retpoŝtadreson!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "Resendi vian kontrol-mesaĝon." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Mi trovis neniun kun tiu salutnomo aŭ retpoŝtadreso." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" @@ -105,8 +120,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -121,11 +136,11 @@ msgstr "Etikedoj" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "La distingiga adresparto" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "La distingiga adresparto ne povas esti malplena" @@ -164,65 +179,81 @@ msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via." msgid "New password" msgstr "La nova pasvorto" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "La distingiga adresparto de ĉi tiu kolekto. Ordinare ne necesas ĝin ŝanĝi." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilŝanĝoj estis konservitaj" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Kontagordoj estis konservitaj" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Malĝusta pasvorto" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Kontagordoj estis konservitaj" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vi jam havas kolekton kun la nomo «%s»!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme." @@ -238,6 +269,13 @@ msgstr "Mankas dosierujo kun aspektiloj por la etoso\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Tamen trovitas — kaj forigitas — malnova simbola ligilo al dosierujo.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -247,6 +285,15 @@ msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :(" msgid "Video transcoding failed" msgstr "Malsukcesis transkodado de filmo" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Loko" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Vidi sur OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,11 +356,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." @@ -321,56 +383,71 @@ msgstr "La provizita dosiero ne konformas al la informtipo." msgid "File" msgstr "Dosiero" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Vi devas provizi dosieron." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Hura! Alŝutitas!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekto «%s» aldonitas!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Emblemo de MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Aldoni dosieron" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoŝtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Funkcias per MediaGoblin, unu el la projektoj de GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Aldoni dosieron" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Krei novan kolekton" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Ŝanĝi kontagordojn" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Kontrolejo pri dosierpreparado." + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Ĉi tiu retpaĝaro funkcias per MediaGoblin, eksterordinare bonega programaro por gastigado de aŭd‐vid‐dosieroj." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Por aldoni viajn proprajn dosierojn, afiŝi komentariojn ktp, vi povas ensaluti je via MediaGoblina konto." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Ĉu vi ankoraŭ ne havas tian? Ne malĝoju!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -435,7 +491,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Kreu konton en ĉi tiu retejo\n aŭ\n ekfunkciigu MediaGoblin’on en via propra servilo" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Laste aldonitaj dosieroj" @@ -541,6 +597,11 @@ msgid "" "%(verification_url)s" msgstr "Sal %(username)s,\n\npor aktivigi vian GNU MediaGoblin konton, malfermu la sekvantan URLon en via retumilo:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Emblemo de MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -548,34 +609,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Aldoni kundosierojn por %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Kundosieroj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Aldoni kundosieron" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Nuligi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Konservi ŝanĝojn" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Forigi senrevene" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -588,13 +665,17 @@ 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:62 +msgid "Delete my account" +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:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Redaktado de l’profilo de %(username)s'" @@ -610,7 +691,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Elŝuti" @@ -633,7 +714,7 @@ msgid "" msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon ĉe \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "originalan dosieron" @@ -645,8 +726,8 @@ msgstr "WebMan dosieron (kun Vorbisa kodaĵo)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Bildo de «%(media_title)s»" @@ -691,21 +772,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Bedaŭrinde ĉi tiu filmo ne spekteblas, ĉar\n» via TTT-legilo ne subtenas montradon\n» de filmoj laŭ HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Vi povas akiri modernan TTT-legilon,\n» kapablan montri ĉi tiun filmon, ĉe \n» http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "la WebM-dosieron (640p; VP8/Vorbis)" @@ -713,12 +794,6 @@ msgstr "la WebM-dosieron (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Aldonado de kolekto" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Aldoni" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -735,12 +810,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Ŝanĝi" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Forigi" @@ -750,11 +825,6 @@ msgstr "Forigi" msgid "Really delete %(title)s?" msgstr "Ĉu vere forigi %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Forigi senrevene" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -764,6 +834,16 @@ msgstr "Ĉu vere forigi %(media_title)s el %(collection_title)s?" msgid "Remove" msgstr "Forigi" +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Kolektoj de %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Kolektoj de %(username)s" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +856,53 @@ msgstr "Saluton, %(username)s.\n%(comment_author)s komentis ĉe via alŝutaĵo ( msgid "%(username)s's media" msgstr "Dosieroj de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Dosieroj de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Просмотр файлов пользователя %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Aldoni komenton" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Vi povas uzi por markado la lingvon «Markdown»." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Aldoni ĉi tiun komenton" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "je" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Aldonita je

\n

la %(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Aldonado de %(title)s al kolekto" +msgid "Add “%(media_title)s” to a collection" +msgstr "Aldoni «%(media_title)s» al kolekto" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Aldoni novan kolekton" @@ -887,27 +964,31 @@ msgstr "Se vi estas tiu sed vi perdis vian kontrolmesaĝon, vi povas OpenStreetMap" -msgstr "Vidi sur OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Ĉiuj rajtoj estas rezervitaj" @@ -969,49 +1046,64 @@ msgstr "malpli nova" msgid "Tagged with" msgstr "Markita per" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Malsukcesis lego de la bildodosiero" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oj!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Vi povas uzi por markado la lingvon «Markdown»." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Jes, mi volas forigi ĉi tion." -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Jes, mi volas forigi ĉi tiun dosieron el la kolekto" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Elektu --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Rimarko" @@ -1019,74 +1111,69 @@ msgstr "Rimarko" msgid "commented on your post" msgstr "komentis je via afiŝo" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Via komento estis afiŝita!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Necesas elekti aŭ aldoni kolekton" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» jam estas en la kolekto «%s»" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» estis aldonita al la kolekto «%s»" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Iuj dosieroj de ĉi tiu ero ŝajne mankas. Mi tamen forigas." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vi forigis la kolekton «%s»" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Vi estas forigonta kolekton de alia uzanto. Agu singardeme." diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo index 98dbebdd..e4286d7d 100644 Binary files a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index e1249591..ae9d9994 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -10,6 +10,7 @@ # , 2011. # , 2011, 2012. # , 2012. +# Laura Arjona Reina , 2013. # Mario Rodriguez , 2011. # , 2011. # , 2012. @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" -"Last-Translator: cwebber \n" +"POT-Creation-Date: 2013-02-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-22 09:39+0000\n" +"Last-Translator: larjona \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" @@ -29,82 +30,96 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:29 +msgid "Invalid User name or email address." +msgstr "Nombre de usuario o correo electrónico inválido." + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "Este campo no acepta direcciones de correo." + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "Este campo requiere una dirección de correo." + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nombre de usuario" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Contraseña" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Dirección de correo electrónico" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 msgid "Username or email" msgstr "Nombre de usuario o email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Los datos ingresados son incorrectos" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Lo sentimos, ya existe un usuario con ese nombre." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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 ingresar, editar tu perfil, y enviar imágenes!" -#: mediagoblin/auth/views.py:188 +#: mediagoblin/auth/views.py:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Se reenvió tu correo electrónico de verificación." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña." + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "No se ha podido encontrar a nadie con ese nombre de usuario." + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "No se pudo encontrar a alguien con ese nombre de usuario o correo electrónico." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "Ahora tu puedes entrar usando tu nueva contraseña." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Título" @@ -113,8 +128,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -129,11 +144,11 @@ msgstr "Etiquetas" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Ficha" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "La ficha no puede estar vacía" @@ -172,26 +187,34 @@ msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te perten msgid "New password" msgstr "Nueva contraseña" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "Preferencias de licencia" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "Ésta será tu licencia predeterminada en los formularios de subida." + +#: mediagoblin/edit/forms.py:82 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:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "El título de la dirección de esta colección. Generalmente no necesitas cambiar esto." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:67 msgid "An entry with that slug already exists for this user." msgstr "Una entrada con esa ficha ya existe para este usuario." @@ -204,33 +227,41 @@ msgstr "Estás editando el contenido de otro usuario. Proceder con precaución." msgid "You added the attachment %s!" msgstr "¡Has añadido el adjunto %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "Sólo puedes editar tu propio perfil." + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "Estás editando un perfil de usuario. Proceder con precaución." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 msgid "Profile changes saved" msgstr "Los cambios de perfil fueron salvados" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "las configuraciones de cuenta fueron salvadas" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:242 msgid "Wrong password" msgstr "Contraseña incorrecta" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:253 +msgid "Account settings saved" +msgstr "las configuraciones de cuenta fueron salvadas" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "Necesitas confirmar el borrado de tu cuenta." + +#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:207 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "¡Ya tienes una colección llamada \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Estás editando la colección de otro usuario/a. Ten cuidado." @@ -246,15 +277,31 @@ msgstr "No hay directorio activo para este tema\n\n\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Sin embargo, se encontró un enlace simbólico de un directorio antiguo; ha sido borrado.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de cookies o similar.
Por favor asegúrate de permitir las cookies para este dominio." + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Lo sentidos, No soportamos ese tipo de archivo :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 msgid "Video transcoding failed" msgstr "Ha fallado la conversión de vídeo" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Locación" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Ver en OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID del Cliente" @@ -317,10 +364,25 @@ msgstr "La URI para redireccionar las aplicaciones, este campo es requer msgid "This field is required for public clients" msgstr "Este campo es requerido para los clientes públicos" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "¡El cliente {0} ha sido registrado!" +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" +msgstr "Conexiones de cliente OAuth" + +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +msgstr "Tus clientes OAuth" + +#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 +#: mediagoblin/templates/mediagoblin/submit/collection.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:87 +msgid "Add" +msgstr "Añadir " + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Archivo inválido para el formato seleccionado." @@ -329,56 +391,70 @@ msgstr "Archivo inválido para el formato seleccionado." msgid "File" msgstr "Archivo" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Debes proporcionar un archivo." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" -msgstr "¡Yujú! ¡Enviado!" +msgstr "¡Yuju! ¡Enviado!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "¡Colección \"%s\" añadida!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logo de MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "Cuenta de %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "cerrar sesión" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Añadir contenido" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:59 msgid "Verify your email!" msgstr "¡Verifica tu email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "cerrar sesión" + +#: mediagoblin/templates/mediagoblin/base.html:65 #: 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 "Conectarse" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "%(user_name)s's account" +msgstr "Cuenta de %(user_name)s" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Añadir contenido" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Crear nueva colección" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Cambiar la configuración de la cuenta" + +#: mediagoblin/templates/mediagoblin/base.html:93 +#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 "Panel de procesamiento de contenido" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Proveído por MediaGoblin, un proyecto GNU." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Este sitio está montado con MediaGoblin, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:29 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Para añadir tus propios contenidos, dejar comentarios y más, puedes iniciar sesión con tu cuenta de MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "¿Aún no tienes una? ¡Es fácil!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "Create an account at this site\n" @@ -443,7 +498,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Crea una cuenta en este sitio\n o\n Instala Mediagoblin en tu propio servidor" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "El contenido más reciente" @@ -549,6 +604,11 @@ msgid "" "%(verification_url)s" msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n\n%(verification_url)s " +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logo de MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -556,34 +616,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editando archivos adjuntos a %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 msgid "Attachments" msgstr "Adjuntos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:182 msgid "Add attachment" msgstr "Agregar adjunto" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:86 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Guardar cambios" +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 +#, python-format +msgid "Really delete user '%(user_name)s' and all related media/comments?" +msgstr "¿Realmente quieres borrar el usuario '%(user_name)s' y todos sus contenidos/comentarios?" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "Sí, borrar mi cuenta" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Eliminar permanentemente" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -596,13 +672,17 @@ 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:62 +msgid "Delete my account" +msgstr "Borrar mi cuenta" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Editando %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Editando el perfil de %(username)s" @@ -618,7 +698,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Descargar" @@ -641,7 +721,7 @@ msgid "" msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el audio \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Archivo original" @@ -653,8 +733,8 @@ msgstr "Archivo WebM (códec Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Imágenes para %(media_title)s" @@ -699,21 +779,21 @@ msgstr "Formato de Archivo" msgid "Object Height" msgstr "Altura del Objeto" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "Lo siento, este vídeo no funcionará\n porque tu navegador no soporta \n vídeo HTML5." + #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Lo sentimos, este video no va funcionar porque\n» Tu navegador web no soporta HTML5\n» video." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Tú puedes conseguir un navegador web moderno que\n» puede reproducir este vídeo en \n» http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "¡Puedes conseguir un navegador moderno \n que pueda reproducir este vídeo en \n http://getfirefox.com!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "Archivo WebM (640p; VP8/Vorbis)" @@ -721,12 +801,6 @@ msgstr "Archivo WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Añadir una colección" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Añadir " - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -743,12 +817,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s por %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Editar" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Borrar" @@ -758,11 +832,6 @@ msgstr "Borrar" msgid "Really delete %(title)s?" msgstr "¿Realmente deseas eliminar %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Eliminar permanentemente" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -772,6 +841,16 @@ msgstr "¿Realmente quieres quitar %(media_title)s de %(collection_title)s?" msgid "Remove" msgstr "Quitar" +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Colecciones de %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Colecciones de %(username)s" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -789,51 +868,45 @@ msgstr "Contenidos de %(username)s" msgid "%(username)s's media" msgstr "Contenido de %(username)s's" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Explorando contenido de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Añadir un comentario" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Puedes usar Markdown para el formato." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Añade un comentario " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "en" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Añadido en

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 msgid "Add media to collection" msgstr "Añadir contenido a la colección" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Añadir %(title)s a la colección" +msgid "Add “%(media_title)s” to a collection" +msgstr "Añadir “%(media_title)s” a una colección" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "Añadir una nueva colección" @@ -895,27 +968,31 @@ msgstr "Si tú eres esa persona, pero has perdido tu correo electrónico de veri msgid "Here's a spot to tell others about yourself." msgstr "Aquí hay un lugar para que le cuentes a los demás sobre ti." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Editar perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Este usuario (todavía) no ha completado su perfil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "Explorar colecciones" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "Ver todo el contenido de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Aquí es donde estará ubicado tu contenido, pero parece que aún no has agregado nada." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -931,22 +1008,15 @@ msgid "In collections (%(collected)s)" msgstr "En las colecciones (%(collected)s)" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" msgstr "Icono feed" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom feed" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Locación" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Ver en OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Todos los derechos reservados" @@ -981,45 +1051,60 @@ msgstr "Marcado con" msgid "Could not read the image file." msgstr "No se pudo leer el archivo de imagen." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "¡Ups!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Ha ocurrido un error" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Operación no permitida" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "¡Lo siento Dave, no puedo permitir que hagas eso!

Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Parece que no hay ninguna página en esta dirección. ¡Lo siento!

Si estás seguro de que la dirección es correcta, quizá han borrado o movido la página que estás buscando." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "Comentario" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Puedes usar Markdown para el formato." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Estoy seguro de que quiero borrar esto" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Estoy seguro/a de que quiero quitar este ítem de la colección" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "Colección" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Selecciona --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Incluir una nota" @@ -1027,74 +1112,69 @@ msgstr "Incluir una nota" msgid "commented on your post" msgstr "comentó tu publicación" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "Ups, tu comentario estaba vacío." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "¡Tu comentario ha sido publicado!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Por favor, revisa tus entradas e inténtalo de nuevo." + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "Tienes que seleccionar o añadir una colección" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "%s\" ya está en la colección \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" añadido a la colección \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Por favor, revisa tus entradas e inténtalo de nuevo." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Al parecer algunos de los ficheros en esta entrada se han perdido. Borrando igualmente." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:279 msgid "You deleted the media." msgstr "Eliminaste el contenido" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:286 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:312 +#: mediagoblin/user_pages/views.py:294 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. Proceder con precaución." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 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:369 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:384 +#: mediagoblin/user_pages/views.py:379 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:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Borraste la colección \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:419 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:434 +#: mediagoblin/user_pages/views.py:429 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Estás a punto de borrar la colección de otro usuario. Procede con cuidado." diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo index ba9aad9b..85d24b3e 100644 Binary files a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po index 44e8b802..678cec13 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "نام کاربری" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "گذرواٰژه" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "آدرس ایمیل" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "متاسفانه،ثبتنام به طور موقت غیر فعال است." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "متاسفانه کاربری با این نام کاربری وجود دارد." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "این کد تاییدیه یا شناسه کاربری صحیح نیست." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "ایمیل تاییدیه باز ارسال شد." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "عنوان" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "برچسب" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -162,65 +176,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "شما در حال ویرایش رسانه کاربر دیگری هستید.با احتیاط عمل کنید" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,6 +266,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,11 +353,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "فایلی نا معتبر برای نوع رسانه داده شده." @@ -319,56 +380,71 @@ msgstr "فایلی نا معتبر برای نوع رسانه داده شده." msgid "File" msgstr "فایل" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "شما باید فایلی ارايه بدهید." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "هورا!ثبت شد!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "لوگو مدیاگوبلین" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "سلام %(username)s,\n\nبرای فعال سازی شناسه کاربری گنو مدیاگوبلین خود ،پیوند زیر را در مرورگر خود باز کنید.\n\n%(verification_url)s" +#: 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 @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -586,13 +662,17 @@ msgstr "ویرایش %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "در حال ویرایش نمایه %(username)s" @@ -608,7 +688,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -631,7 +711,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -643,8 +723,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -689,21 +769,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -711,12 +791,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -748,11 +822,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)s's رسانه های" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -885,27 +961,31 @@ msgstr "اگر شما آن کاربر هستید و ایمیل تایید خود msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "نمایش تمامی رسانه های %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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:157 +#: 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..." @@ -915,28 +995,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -967,49 +1043,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "اوه" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1017,74 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo index b0106832..e9f28893 100644 Binary files a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 39480ea9..20ab17dd 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -1,12 +1,14 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: # , 2011. # , 2012. # , 2011. +# , 2013. # , 2011. +# Laurent Pointecouteau , 2013. # , 2011. # , 2011. # , 2011. @@ -15,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -26,82 +28,96 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "Nom d'utilisateur ou adresse de courriel invalide." + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nom d'utilisateur" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Mot de passe" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresse e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nom d'utilisateur ou email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Entrée incorrecte" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Un utilisateur existe déjà avec ce nom, désolé." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "E-mail de vérification renvoyé." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "Nom d'utilisateur introuvable." + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Impossible de trouver un utilisateur avec ce nom ou cette email." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titre" @@ -110,8 +126,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -126,11 +142,11 @@ msgstr "Tags" msgid "Separate tags by commas." msgstr "Séparez les champs avec des virgules." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Légende" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "La légende ne peut pas être laissée vide." @@ -169,65 +185,81 @@ msgstr "Entrez votre ancien mot de passe pour prouver que vous êtes bien le pro msgid "New password" msgstr "Nouveau mot de passe" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:83 +#: mediagoblin/edit/forms.py:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Le titre affiché dans l'URL de la collection. Vous n'avez généralement pas besoin d'y toucher." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Vous avez ajouté la pièce jointe %s !" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "Vous ne pouvez modifier que votre propre profil." + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Les changements apportés au profile ont étés sauvegardés" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Les changements des préférences du compte ont étés sauvegardés" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Les changements des préférences du compte ont étés sauvegardés" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "Vous devez confirmer la suppression de votre compte." + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vous avez déjà une collection appelée \"%s\" !" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention." @@ -243,6 +275,13 @@ msgstr "Aucun répertoire \"asset\" pour ce thème\n" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -252,6 +291,15 @@ msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :(" msgid "Video transcoding failed" msgstr "L'encodage de la vidéo à échoué" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Position" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Regarder sur OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -314,11 +362,26 @@ msgstr "L'URI de redirection pour l'application, ce champ est requis%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Ajouter des médias" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "Déconnexion" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Conçu avec MediaGoblin, un projet GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Ajouter des médias" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Créer une nouvelle collection" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Changer les paramètres du compte" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Panneau pour le traitement des médias" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Ce site fait tourner MediaGoblin, un logiciel d'hébergement de média extraordinairement génial." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Pour ajouter vos propres médias, commenter, et bien plus encore, vous pouvez vous connecter avec votre compte MediaGoblin" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Vous n'en avez pas ? C'est facile !" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -440,7 +497,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Créez un compte sur ce site\n ou\n Déployez MediaGoblin sur votre propre serveur" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Tout derniers media" @@ -546,6 +603,11 @@ msgid "" "%(verification_url)s" msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin, veuillez vous rendre à l'adresse suivante avec votre navigateur web:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logo MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -553,34 +615,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Éditer les pièces jointes de %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Pièces jointes" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Ajouter une pièce jointe" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annuler" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Enregistrer les modifications" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Supprimer définitivement" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -593,13 +671,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Modification de %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Modification du profil de %(username)s" @@ -615,7 +697,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Télécharger" @@ -638,7 +720,7 @@ msgid "" msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Fichier original" @@ -650,8 +732,8 @@ msgstr "fichier WebM (codec Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Image de %(media_title)s" @@ -696,21 +778,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Désolé, cette vidéo ne s'affichera pas car\nvotre navigateur ne prends pas en charge le HTML5 pour les vidéos" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "fichier WebM (640p; VP8/Vorbis)" @@ -718,12 +800,6 @@ msgstr "fichier WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Ajouter une collection" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Ajouter" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -740,12 +816,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Éditer" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Effacer" @@ -755,11 +831,6 @@ msgstr "Effacer" msgid "Really delete %(title)s?" msgstr "Voulez-vous vraiment supprimer %(title)s ?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Supprimer définitivement" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -769,6 +840,16 @@ msgstr "Voulez vous vraiment retirer %(media_title)s de %(collection_title)s ?" msgid "Remove" msgstr "Retirer" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,56 +862,53 @@ msgstr "Bonjour %(username)s,\n%(comment_author)s a commenté votre post (%(comm msgid "%(username)s's media" msgstr "Medias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Parcourir les médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Ajouter un commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Vous pouvez utilisez les Balises pour la mise en page." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Ajouter ce commentaire" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "à" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Ajouté le

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" +#: 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:35 -#, python-format -msgid "Add %(title)s to collection" -msgstr "Ajouter %(title)s à la collection" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Ajouter une nouvelle collection" @@ -892,27 +970,31 @@ msgstr "Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de vér msgid "Here's a spot to tell others about yourself." msgstr "Voici un endroit pour parler aux autres de vous-même." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Modifier le profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Cet utilisateur n'a pas (encore) rempli son profil." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Voir tous les médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "C'est là où vos médias apparaîssent, mais vous ne semblez pas avoir encore ajouté quoi que ce soit." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -922,28 +1004,24 @@ msgstr "Il ne semble pas y avoir de média là, pour l'instant ..." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "Dans les collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "icone de flux" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "flux Atom" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Position" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Regarder sur OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tous droits réservés" @@ -974,49 +1052,64 @@ msgstr "le plus vieux" msgid "Tagged with" msgstr "Taggé avec" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Impossible de lire l'image." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Zut !" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" -msgstr "" +msgstr "Une erreur est survenue" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" -msgstr "" +msgstr "Opération non autorisée" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Je regrette Dave, cela m'est malheureusement impossible !

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:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." +msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé !

Si vous êtes sûr que l'adresse est correcte, peut-être que la page que vous recherchez a été déplacée ou supprimée." + +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Vous pouvez utilisez les Balises pour la mise en page." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Je suis sûr de vouloir supprimer cela" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Je suis certain de vouloir retirer cet élément de la collection" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Sélectionner --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Inclure une note" @@ -1024,74 +1117,69 @@ msgstr "Inclure une note" msgid "commented on your post" msgstr "a commenté votre post" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Veuillez vérifier vos entrées et réessayer." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Vous devez sélectionner ou ajouter une collection" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" est déjà dans la collection \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" as été ajouté à la collection \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Veuillez vérifier vos entrées et réessayer." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Certains fichiers correspondant à cette entrée semblent manquant. Suppression tout de même." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vous avez supprimé la collection \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Vous vous apprêtez à supprimer la collection d'un autre utilisateur. Procédez avec attention." diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo index d38d8938..87ce1b2a 100644 Binary files a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index 8041742b..e074a345 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "שם משתמש" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "סיסמה" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "כתובת דוא״ל" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "שם משתמש או דוא״ל" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "קלט שגוי" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "צר לי, רישום הינו מנוטרל על שרת זה." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "צר לי, משתמש עם שם זה כבר קיים." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "צר לי, משתמש עם דוא״ל זה כבר קיים." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "מפתח האימות או זהות משתמש הינם שגויים" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "כבר אימתת את כתובת הדוא״ל שלך!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "שלח שוב את דוא״ל האימות שלך." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "דוא״ל נשלח בצירוף הוראות בנוגע לכיצד ניתן לשנות את סיסמתך." -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "לא היה ניתן למצוא מישהו עם שם משתמש או דוא״ל זה." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "כעת ביכולתך להתחבר באמצעות סיסמתך החדשה." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "כותרת" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "תגיות" msgid "Separate tags by commas." msgstr "הפרד תגיות בעזרת פסיקים." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "חשופית" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "החשופית לא יכולה להיות ריקה" @@ -163,65 +177,81 @@ msgstr "הזן את סיסמתך הישנה כדי להוכיח שאתה הבע msgid "New password" msgstr "סיסמה חדשה" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "שלח לי דוא״ל כאשר אחרים מגיבים על המדיה שלי" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "הכותרת לא יכולה להיות ריקה" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "אזור הכותרת של כתובת אוסף זה. לרוב אין הכרח לשנות את חלק זה." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "רשומה עם חשופית זו כבר קיימת עבור משתמש זה." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "אתה עורך מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "הוספת את התצריף %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "אתה עורך דיוקן של משתמש. המשך בזהירות." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "שינויי דיוקן נשמרו" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "הגדרות חשבון נשמרו" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "סיסמה שגויה" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "הגדרות חשבון נשמרו" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "כבר יש לך אוסף שקרוי בשם \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "אוסף עם חשופית זו כבר קיים עבור משתמש זה." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות." @@ -237,6 +267,13 @@ msgstr "אין מדור נכס עבור מוטיב זה\n" msgid "However, old link directory symlink found; removed.\n" msgstr "בכל אופן, קישור מדור symlink נמצא; הוסר.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "צר לי, אינני תומך בטיפוס קובץ זה :(" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "הצגה אצל OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "זהות לקוח" @@ -308,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "שדה זה הינו דרוש עבור לקוחות פומביים" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "הלקוח {0} נרשם!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "ניתן קובץ שגוי עבור טיפוס מדיה." @@ -320,56 +381,71 @@ msgstr "ניתן קובץ שגוי עבור טיפוס מדיה." msgid "File" msgstr "קובץ" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "עליך לספק קובץ." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "הידד! נשלח!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "אוסף \"%s\" התווסף!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "לוגו MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "החשבון של %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "התנתקות" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "הוספת מדיה" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "אמת את הדוא״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "התנתקות" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "מופעל על ידי MediaGoblin, פרויקט GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "החשבון של %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "הוספת מדיה" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "צור אוסף חדש" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "שנה הגדרות חשבון" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "אתר זה מריץ MediaGoblin, חתיכת תוכנת אירוח מדיה יוצאת מן הכלל." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "בכדי להוסיף את המדיה שלך, להשים תגובות, ועוד, ביכולתך להתחבר עם חשבון MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "אין ברשותך חשבון עדיין? זה קל!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "יצירת חשבון אצל אתר זה\n או\n להתקין את MediaGoblin על שרתך" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "המדיה האחרונה ביותר" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "שלום %(username)s,\n\nבכדי להפעיל את חשבונך אצל GNU MediaGoblin, עליך לפתוח את הכתובת הבאה\nבתוך דפדפן הרשת שלך:\n\n%(verification_url)s" +#: 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 @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "עריכת תצריפים עבור %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "תצריפים" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "הוספת תצריף" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -587,13 +663,17 @@ msgstr "ערוך %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "שינוי הגדרות חשבון עבור %(username)s" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "עריכת %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "עריכת דיוקן עבור %(username)s" @@ -609,7 +689,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "הורד" @@ -632,7 +712,7 @@ msgid "" msgstr "ביכולתך להשיג דפדפן רשת מודרני שכן \n\tמסוגל לנגן את אודיו זה אצל \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "קובץ מקורי" @@ -644,8 +724,8 @@ msgstr "קובץ WebM (קודק Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "תמונה עבור %(media_title)s" @@ -690,21 +770,21 @@ msgstr "פורמט קובץ" msgid "Object Height" msgstr "גובה אובייקט" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "צר לי, וידאו זה לא יעבוד מכיוון \n\t שדפדפן הרשת שלך לא תומך \n\t וידאו של HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "ביכולתך להשיג דפדפן רשת מודרני שכן \n\t מסוגל לנגן את וידאו זה אצל \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "קובץ WebM ‫(640p; VP8/Vorbis)" @@ -712,12 +792,6 @@ msgstr "קובץ WebM ‫(640p; VP8/Vorbis)" msgid "Add a collection" msgstr "הוסף אוסף" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "הוסף" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s מאת %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "ערוך" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "מחק" @@ -749,11 +823,6 @@ msgstr "מחק" msgid "Really delete %(title)s?" msgstr "באמת למחוק את %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "מחק לצמיתות" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "באמת להסיר את %(media_title)s מן %(collection_title)s?" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "שלום %(username)s,\n%(comment_author)s הגיב/ה על פרסומך msgid "%(username)s's media" msgstr "המדיה של %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "המדיה של %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ עיון במדיה מאת %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "הוסף תגובה" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "ביכולתך לעשות שימוש בתחביר Markdown לעיצוב." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "הוסף את תגובה זו" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "אצל" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

הוסף בתאריך

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "הוסף מדיה לאוסף" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "הוסף את %(title)s לאוסף" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "הוסף אוסף חדש" @@ -886,27 +962,31 @@ msgstr "אם אתה אכן אדם זה אולם איבדת את דוא״ל הא msgid "Here's a spot to tell others about yourself." msgstr "הנה מקום לומר לאחרים אודותייך." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "צפיה בכל המדיה של %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "לא נראה שיש כאן מדיה כלשהי עדיין..." msgid "(remove)" msgstr "(הסר)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "באוספים (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "מיקום" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "הצגה אצל OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "כל הזכויות שמורות" @@ -968,49 +1044,64 @@ msgstr "ישן יותר" msgid "Tagged with" msgstr "מתויגת עם" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "לא היה ניתן לקרוא את קובץ התמונה." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "אופס!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "אירעה שגיאה" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "פעולה לא מורשית" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "צר לי דוד, אני לא יכול להתיר לך לעשות זאת!

ניסית לבצע פעולה שאינך מורשה לעשות. האם ניסית למחוק את כל החשבונות של המשתמשים שוב?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "לא נראה שקיים עמוד בכתובת זו. צר לי!

אם אתה בטוח שהכתובת הינה מדויקת, ייתכן שהעמוד שאתה מחפש כעת הועבר או נמחק." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "ביכולתך לעשות שימוש בתחביר Markdown לעיצוב." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "אני בטוח שברצוני למחוק זאת" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- בחר --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "הכללת פתק" @@ -1018,74 +1109,69 @@ msgstr "הכללת פתק" msgid "commented on your post" msgstr "הגיב/ה על פרסומך" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "אופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "אנא בדוק את רשומותיך ונסה שוב." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "עליך לבחור או להוסיף אוסף" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" כבר קיים באוסף \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" התווסף אל האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "אנא בדוק את רשומותיך ונסה שוב." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "נראה שכמה קבצים עם רישום זה חסרים. מוחק בכל זאת" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "מחקת את מדיה זו." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "המדיה לא נמחקה מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "מחקת את הפריט מן אוסף זה." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "הפריט לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "בחרת למחוק פריט מן אוסף של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת את האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "האוסף לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "בחרת למחוק אוסף של משתמש אחר. המשך בזהירות." diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo index 32ec1bc2..48b9d8a6 100644 Binary files a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index 34f97df5..6d22148d 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nomine de usator" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Contrasigno" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresse de e-posta" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titulo" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "Etiquettas" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -163,65 +177,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,6 +267,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -320,56 +381,71 @@ msgstr "" msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" 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 @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancellar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -587,13 +663,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "" @@ -609,7 +689,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -632,7 +712,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -644,8 +724,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -690,21 +770,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -712,12 +792,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -749,11 +823,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -886,27 +962,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -968,49 +1044,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1018,74 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo index 23f9f1bf..b264c1ac 100644 Binary files a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index 04a1f7f6..20d3e13c 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ msgstr "" "Language: is_IS\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Notandanafn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Lykilorð" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Netfang" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Notandanafn eða netfang" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Ógild innsending" - -#: mediagoblin/auth/views.py:55 +#: 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." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 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:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 msgid "You've already verified your email address!" msgstr "Þú hefur staðfest netfangið þitt!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "Endursendi staðfestingartölvupóst" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Gat ekki fundið neinn með það notandanafn eða lykilorð." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titill" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "Efnisorð" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Vefslóðarormur" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Vefslóðarormurinn getur ekki verið tómur" @@ -162,65 +176,81 @@ msgstr "Skráðu gamla lykilorðið þitt til að sanna að þú átt þennan a msgid "New password" msgstr "Nýtt lykilorð" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 msgid "The title can't be empty" msgstr "Þessi titill getur verið innihaldslaus" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titilhlutinn í vefslóð þessa albúms. Þú þarft vanalega ekki að breyta þessu." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Þú bættir við viðhenginu %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Breytingar á kenniskrá vistaðar" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Aðgangsstillingar vistaðar" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Vitlaust lykilorð" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Aðgangsstillingar vistaðar" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Þú hefur nú þegar albúm sem kallast \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Þú ert að breyta albúmi annars notanda. Farðu mjög varlega." @@ -236,6 +266,13 @@ msgstr "Engin eignamappa fyrir þetta þema\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Fann samt gamlan táknrænan tengil á möppu; fjarlægður.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "Ég styð því miður ekki þessa gerð af skrám :(" msgid "Video transcoding failed" msgstr "Myndbandsþverkótun mistókst" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Staðsetning" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Skoða á OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Auðkenni biðlara" @@ -307,11 +353,26 @@ 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:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Biðlarinn {0} hefur verið skráður!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." @@ -319,56 +380,71 @@ msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." msgid "File" msgstr "Skrá" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Þú verður að gefa upp skrá." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Jibbí jei! Það tókst að senda inn!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Albúmið \"%s\" var búið til!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin einkennismerkið" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "Notandaaðgangur %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "útskrá" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Senda inn efni" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "útskrá" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Innskráning" -#: mediagoblin/templates/mediagoblin/base.html:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Keyrt af MediaGoblin, sem er GNU verkefni." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "Notandaaðgangur %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Senda inn efni" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Búa til nýtt albúm" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Breyta stillingum notandaaðgangs" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Margmiðlunarvinnsluskiki" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Þetta vefsvæði keyrira á MediaGoblin sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Til að senda inn þitt efni, gera athugasemdir og fleira getur þú skráð þig inn með þínum MediaGoblin aðgangi." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Ertu ekki með aðgang? Það er auðvelt að búa til!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Búa til aðgang á þessari síðu\n eða\n Settu upp þinn eigin margmiðlunarþjón" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nýlegt efni" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "Hæ %(username)s,\n\ntil að virkja GNU MediaGoblin aðganginn þinn, opnaðu þá eftirfarandi vefslóði í\nvafranum þínum:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin einkennismerkið" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Breyti viðhengjum við: %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Viðhengi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Bæta við viðhengi" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Hætta við" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Vista breytingar" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Eytt algjörlega" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -586,13 +662,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Breyti %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Breyti kenniskrá notandans: %(username)s" @@ -608,7 +688,7 @@ msgstr "Efni merkt með: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Sækja af Netinu" @@ -631,7 +711,7 @@ msgid "" msgstr "Þú getur náð í nýlegan vafra sem \n\tgetur spilað hljóðskrár á \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Upphaflega skráin" @@ -643,8 +723,8 @@ msgstr "WebM skrá (Vorbis víxlþjöppun)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Mynd fyrir %(media_title)s" @@ -689,21 +769,21 @@ msgstr "Skráarsnið" msgid "Object Height" msgstr "Hæð hlutar" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Því miður mun þetta myndband ekki virka vegna þess að \n\t vafrinn þinn styður ekki HTML5 \n\t myndbönd." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Þú getur náð í nýlegan vafra sem \n\t getur spilað þetta myndband á \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM skrá (640p; VP8/Vorbis)" @@ -711,12 +791,6 @@ msgstr "WebM skrá (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Búa til albúm" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Bæta við" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s sem %(username)s bjó til" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Breyta" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Eyða" @@ -748,11 +822,6 @@ msgstr "Eyða" msgid "Really delete %(title)s?" msgstr "Virkilega eyða %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Eytt algjörlega" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "Virkilega fjarlægja %(media_title)s úr %(collection_title)s albúminu? msgid "Remove" msgstr "Fjarlægja" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "Hæ %(username)s,\n%(comment_author)s skrifaði athugasemd við færslun msgid "%(username)s's media" msgstr "Efni sem %(username)s á" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Efni sem %(username)s á" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Skoða efnið sem %(username)s setti inn" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Bæta við athugasemd" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Þú getur notað Markdown til að stílgera textann" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Senda inn þessa athugasemd" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "hjá" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Bætt við:

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Bæta efni við albúmið" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Setja %(title)s í albúm" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Búa til nýtt albúm" @@ -885,27 +961,31 @@ msgstr "Ef þú ert þessi aðili en hefur týnt staðfestingarpóstinum getur msgid "Here's a spot to tell others about yourself." msgstr "Hér er svæði til að segja öðrum frá þér." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Breyta kenniskrá" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Þessi notandi hefur ekki fyllt inn í upplýsingar um sig (ennþá)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Skoða efnið sem %(username)s á" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Þetta er staðurinn þar sem efnið þitt birtist en þú virðist ekki hafa sent neitt inn ennþá." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -915,28 +995,24 @@ msgstr "Það virðist ekki vera neitt efni hérna ennþá..." msgid "(remove)" msgstr "(fjarlægja)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "Í albúmum (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "fréttaveituteikn" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom fréttaveita" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Staðsetning" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Skoða á OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Öll réttindi áskilin" @@ -967,49 +1043,64 @@ msgstr "eldri" msgid "Tagged with" msgstr "Merkt með" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Gat ekki lesið myndskrána." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Obbosí!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Villa kom upp" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Aðgerð ekki leyfileg" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Fyrirgefðu Davíð. Ég get ekki leyft þér að gera þetta!

Þú hefur reynt að framkvæma aðger sem þú hefur ekki leyfi til. Varstu að reyna að eyða öllum notendunum aftur?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Því miður! Það virðist ekki vera nein síða á þessari vefslóð.

Ef þú ert viss um að vefslóðin sé rétt hefur vefsíðan sem þú ert að leita að kannski verið flutt eða fjarlægð." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Þú getur notað Markdown til að stílgera textann" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Ég er viss um að ég vilji eyða þessu" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Ég er viss um að ég vilji fjarlægja þetta efni úr albúminu" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Velja --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Bæta við minnispunktum" @@ -1017,74 +1108,69 @@ msgstr "Bæta við minnispunktum" msgid "commented on your post" msgstr "skrifaði athugasemd við færsluna þína" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Obbosí! Athugasemdin þín var innihaldslaus." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Athugasemdin þín var skráð!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Vinsamlegast kíktu á innsendingarnar þínar og reyndu aftur." + +#: mediagoblin/user_pages/views.py:236 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:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" er nú þegar í albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" sett í albúmið \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Vinsamlegast kíktu á innsendingarnar þínar og reyndu aftur." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Sumar af skránum við þessa innsendingu virðast vera horfnar. Eyði þrátt fyrir það." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "Þú ert í þann mund að fara að eyða albúmi annars notanda. Farðu mjög varlega." diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo index dad0aec4..89338e10 100644 Binary files a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index e91926a1..d1f56a42 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -22,82 +22,96 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nome utente" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Password" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Indirizzo email" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nome utente o indirizzo email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Spiacente, esiste già un utente con quel nome." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Rispedisci email di verifica" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Impossibile trovare qualcuno con questo nome utente o password." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titolo" @@ -106,8 +120,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -122,11 +136,11 @@ msgstr "Tags" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -165,65 +179,81 @@ msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario d msgid "New password" msgstr "Nuova password" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Cambiamenti del profilo salvati" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Impostazioni del profilo salvate" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Password errata" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Impostazioni del profilo salvate" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -239,6 +269,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -248,6 +285,15 @@ msgstr "Mi dispiace, non supporto questo tipo di file :(" msgid "Video transcoding failed" msgstr "Transcodifica video fallita" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Posizione" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Visualizza su OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -310,11 +356,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." @@ -322,56 +383,71 @@ msgstr "File non valido per il tipo di file multimediale indicato." msgid "File" msgstr "File" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Devi specificare un file." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Evviva! Caricato!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Simbolo di MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Aggiungi files multimediali" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Realizzato con MediaGoblin, un progetto GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Aggiungi files multimediali" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Cambia le impostazioni dell'account" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Pannello di elaborazione files multimediali" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Questo sito sta utilizzando Mediagoblin, un ottimo programma per caricare e condividere files multimediali." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Per aggiungere i tuoi file multimediali, scrivere commenti e altro puoi accedere con il tuo account MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Non ne hai già uno? E' semplice!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -436,7 +491,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Crea un account in questo sito\n oppure\n Installa MediaGoblin sul tuo server" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Files multimediali più recenti" @@ -542,6 +597,11 @@ msgid "" "%(verification_url)s" msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri il seguente URL nel \ntuo navigatore web.\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Simbolo di MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -549,34 +609,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Stai modificando gli allegati di %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Allegati" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Aggiungi allegato" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annulla" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salva i cambiamenti" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Elimina definitivamente" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -589,13 +665,17 @@ 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:62 +msgid "Delete my account" +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:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Stai modificando il profilo di %(username)s" @@ -611,7 +691,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Scarica" @@ -634,7 +714,7 @@ msgid "" msgstr "Puoi scaricare un browser web moderno,\n\t in grado di leggere questo file audio, qui \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "File originario" @@ -646,8 +726,8 @@ msgstr "File WebM (codec Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -692,21 +772,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Spiacente ma è impossibile visualizzare questo video perché\n\t il tuo browser web non supporta l'HTML5 \n\t video." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Puoi scaricare un browser web moderno,\n\t in grado di visualizzare questo video, qui \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "File WebM (640p; VP8/Vorbis)" @@ -714,12 +794,6 @@ msgstr "File WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Aggiungi" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -736,12 +810,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Modifica" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Elimina" @@ -751,11 +825,6 @@ msgstr "Elimina" msgid "Really delete %(title)s?" msgstr "Vuoi davvero eliminare %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Elimina definitivamente" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -765,6 +834,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -777,56 +856,53 @@ msgstr "Ciao %(username)s,\n%(comment_author)s ha commentato il tuo post (%(comm msgid "%(username)s's media" msgstr "Files multimediali di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Files multimediali di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Stai guardando i files multimediali di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Aggiungi un commento" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Puoi usare il Markdown per la formattazione." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Aggiungi questo commento" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "a" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Aggiunto il

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -888,27 +964,31 @@ msgstr "Se sei quella persona ma hai perso l'email di verifica, puoi OpenStreetMap" -msgstr "Visualizza su OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tutti i diritti riservati" @@ -970,49 +1046,64 @@ msgstr "più vecchio" msgid "Tagged with" msgstr "Taggato con" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Impossibile leggere il file immagine." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oops!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Puoi usare il Markdown per la formattazione." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Sono sicuro di volerlo eliminare" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1020,74 +1111,69 @@ msgstr "" msgid "commented on your post" msgstr "ha commentato il tuo post" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo index 1ebdba16..c91b7664 100644 Binary files a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index abbf5b26..d2b3dc9a 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -1,15 +1,16 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: # , 2011. +# , 2013. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +20,96 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "ユーザネーム" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "パスワード" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "メールアドレス" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "検証キーまたはユーザーIDが間違っています" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "検証メールを再送しました。" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "タイトル" @@ -103,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +134,11 @@ msgstr "タグ" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "スラグ" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "スラグは必要です。" @@ -162,65 +177,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,6 +267,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +283,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -319,56 +381,71 @@ msgstr "" msgid "File" msgstr "ファイル" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "ファイルを提供する必要があります。" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "投稿終了！" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -517,7 +573,7 @@ msgstr "ここで作成！" #: mediagoblin/templates/mediagoblin/auth/login.html:51 msgid "Forgot your password?" -msgstr "" +msgstr "パスワードを忘れましたか？" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 @@ -539,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "%(username)s様へ\n\nGNU MediaGoblinアカウントを検証にするには、このURLを開いてください。\n\n%(verification_url)s" +#: 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 @@ -546,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -586,13 +663,17 @@ msgstr "%(media_title)sを編集中" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "%(username)sさんのプロフィールを編集中" @@ -608,9 +689,9 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" -msgstr "" +msgstr "ダウンロード" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -631,7 +712,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -643,8 +724,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -689,21 +770,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -711,12 +792,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,14 +808,14 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" -msgstr "" +msgstr "編集" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" -msgstr "" +msgstr "削除" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 @@ -748,11 +823,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +832,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +854,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)sさんのコンテンツ" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -885,27 +962,31 @@ msgstr "あなたの確認メールを紛失した場合、OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -967,49 +1044,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1017,74 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo index e7602e15..908b04c0 100644 Binary files a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po index 6a35c0e0..9f6301e5 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "사용자 이름" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "비밀번호" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "email 주소" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "사용자 이름 또는 email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "잘못된 입력 입니다." - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "죄송합니다. 지금은 가입 하실 수 없습니다." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "죄송합니다. 해당 사용자 이름이 이미 존재 합니다." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "죄송합니다. 사용자와 해당 이메일은 이미 등록되어 있습니다." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "인증 키 또는 사용자 ID가 올바르지 않습니다." -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "이미 인증받은 email 주소를 가지고 있습니다!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "인증 메일을 다시 보내 주세요." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "비밀번호를 변경하는 방법에 대한 설명서가 메일로 전송 되었습니다." -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "사용자 이름 또는 email로 된 사용자를 찾을 수 없습니다." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "이제 새로운 비밀번호로 로그인 하실 수 있습니다." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "제목" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "태그" msgid "Separate tags by commas." msgstr "태그는 , 로 구분 됩니다." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "'슬러그'" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "'슬러그'는 공백일 수 없습니다." @@ -162,65 +176,81 @@ msgstr "계정 확인을 위해, 이전 비밀 번호를 입력해 주세요." msgid "New password" msgstr "새로운 비밀번호" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "제 미디어에 대한 컨텍을 원한다면, 메일을 보내주세요." -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "제목은 공백일 수 없습니다." -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "해당 유저에 대한 '슬러그'가 이미 존재합니다." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "다른 사용자의 미디어를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "사용자의 계정 정보를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "계정 정보가 저장 되었습니다." -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "계정 설정이 저장 되었습니다." - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "잘못된 비밀번호" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "계정 설정이 저장 되었습니다." + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "\"%s\" 모음집을 이미 가지고 있습니다!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 유저의 모음집을 수정 중 입니다. 주의하세요." @@ -236,6 +266,13 @@ msgstr "이 테마를 위한 에셋 디렉토리가 없습니다.\n" msgid "However, old link directory symlink found; removed.\n" msgstr "그런데, 오래된 디렉토리 심볼릭 링크를 찾았습니다; 지워졌습니다.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "죄송합니다. 해당 타입의 파일은 지원하지 않아요 :(" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr " OpenStreetMap으로 보기" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "사용자 ID" @@ -307,11 +353,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "이 항목은 공개 사용자들을 위해 꼭 필요 합니다." -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "사용자 {0}님이 등록 되었습니다!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "알수없는 미디어 파일 입니다." @@ -319,56 +380,71 @@ msgstr "알수없는 미디어 파일 입니다." msgid "File" msgstr "파일" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "파일을 등록하셔야 합니다." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "이햐!! 등록했습니다!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "\"%s\" 모음집이 추가되었습니다!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin 로고" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "미디어 추가" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "메일을 확인하세요!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "미디어 추가" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "계정 설정 변경" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "이사이트는 MediaGoblin으로 작동 중입니다. 이는 특이한 미디어 호스팅 소프트웨어중 하나 입니다." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "자신의 미디어를 추가하고, 댓글을 남기세요! 미디어 고블린 계정으로 내역을 확인 하실 수 있습니다!" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "아직 아무것도 없으시다구요? 매우 쉽습니다!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "사용자 계정 만들기\n 또는\n 서버를 위한 MediaGoblin 설정하기" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "가장 최근에 등록된 미디어" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "안녕하세요 %(username)s님,\n\nGNU MediaGoblin 계정을 활성화 하시려면, 아래의 URL 주소를 브라우져로 접속하세요.\n\n%(verification_url)s" +#: 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 @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "%(media_title)s의 첨부 수정 중..." #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "첨부" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "첨부 추가" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -586,13 +662,17 @@ msgstr "%(media_title)s 편집중..." msgid "Changing %(username)s's account settings" msgstr "%(username)s'의 계정 설정 변경중..." +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "%(collection_title)s 편집 중" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "%(username)s의 계정 정보 수정중..." @@ -608,7 +688,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "다운로드" @@ -631,7 +711,7 @@ msgid "" msgstr "사운드 파일을 재생 하시려면\n\t이곳에서 최신의 브라우져를 다운받으세요! \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "원본 파일" @@ -643,8 +723,8 @@ msgstr "WebM 파일 (Vorbis 코덱)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "%(media_title)s 이미지" @@ -689,21 +769,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "죄송합니다. 사용하고 계신 브라우져가 HTML5 video를\n\t 지원하지 않습니다. 비디오를 재생할 수\n\t 없습니다." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "최신의 브라우져를 사용하시면 비디오를 재생\n\t 하실수 있습니다! \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM 파일 (640p; VP8/Vorbis)" @@ -711,12 +791,6 @@ msgstr "WebM 파일 (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "모음집 추가" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "추가" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(username)s의 %(collection_title)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "수정" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "삭제" @@ -748,11 +822,6 @@ msgstr "삭제" msgid "Really delete %(title)s?" msgstr "%(title)s 을 지우시겠습니까?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "영구적으로 삭제" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "%(collection_title)s의 %(media_title)s을 삭제 하시겠습니까?" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "안녕하세요 %(username)s님,\n%(comment_author)s 가 (%(comment_url) msgid "%(username)s's media" msgstr "%(username)s의 미디어" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)s의 미디어" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ %(username)s의 미디어를 보고 있습니다." -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "덧글 달기" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "포멧팅을 위해 Markdown 을 사용할 수 있습니다.." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "덧글 추가" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "에" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

부가 기능

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" +#: 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:35 -#, python-format -msgid "Add %(title)s to collection" -msgstr "%(title)s 의 모음집 추가" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "새 모음집 추가" @@ -885,27 +961,31 @@ msgstr "정상적인 계정이나, 인증 메일을 잃어버리셨다면 OpenStreetMap" -msgstr " OpenStreetMap으로 보기" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "All rights reserved" @@ -967,49 +1043,64 @@ msgstr "이전" msgid "Tagged with" msgstr "태그 정보" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "이미지 파일을 읽을 수 없습니다." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "웁스!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "포멧팅을 위해 Markdown 을 사용할 수 있습니다.." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "이걸 지우고 싶습니다." -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- 선택 --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "노트 추가" @@ -1017,74 +1108,69 @@ msgstr "노트 추가" msgid "commented on your post" msgstr "게시물에 덧글이 달렸습니다." -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "오우, 댓글이 비었습니다." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "댓글이 등록 되었습니다!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "확인을 하시고 다시 시도하세요." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "모음집을 추가하거나 기존 모음집을 선택하세요." -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" 모음집이 이미 존재 합니다. \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" 모음집을 추가했습니다. \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "확인을 하시고 다시 시도하세요." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "미디어를 삭제 했습니다." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "확인 체크를 하지 않았습니다. 미디어는 삭제되지 않았습니다." -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "모음집에 있는 항목을 삭제 했습니다." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 항목은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "다른 사용자의 모음집에 있는 항목을 삭제하였습니다. 주의하세요." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%s\" 모음집을 삭제하셨습니다." -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 모음집은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "다른 사용자의 모음집을 삭제하려고 합니다. 주의하세요." diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo index afa8849c..741162ed 100644 Binary files a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index ba2907fb..ae2dea10 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Gebruikersnaam" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Wachtwoord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-mail adres" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Gebruikersnaam of email-adres" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Onjuiste invoer" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Sorry, er bestaat al een gebruiker met die naam." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Verificatie e-mail opnieuw opgestuurd." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Kon niemand vinden met die gebruikersnaam of dat e-mailadres." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "Etiket" 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:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "De slug kan niet leeg zijn" @@ -163,65 +177,81 @@ msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is" msgid "New password" msgstr "Nieuw wachtwoord" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profielaanpassingen opgeslagen" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Accountinstellingen opgeslagen" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Verkeerd wachtwoord" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Accountinstellingen opgeslagen" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,6 +267,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "Sorry, dat bestandstype wordt niet ondersteunt." msgid "Video transcoding failed" msgstr "" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Locatie" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Bekijken op OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." @@ -320,56 +381,71 @@ msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." msgid "File" msgstr "Bestand" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "U moet een bestand aangeven." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Mooizo! Toegevoegd!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin logo" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Voeg media toe" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Hier draait MediaGoblin, een GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Voeg media toe" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Accountinstellingen aanpassen" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Mediaverwerkingspaneel" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Deze website draait MediaGoblin, een buitengewoon goed stuk software voor mediahosting." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Heb je er nog geen? Het is heel eenvoudig!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creëer een account op deze website</a>\n of\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Gebruik MediaGoblin op je eigen server</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nieuwste media" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "Hallo %(username)s , open de volgende URL in uw webbrowser om uw GNU MediaGoblin account te activeren: %(verification_url)s " +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin logo" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annuleren" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Wijzigingen opslaan" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Permanent verwijderen" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -587,13 +663,17 @@ msgstr "%(media_title)s aanpassen" msgid "Changing %(username)s's account settings" msgstr "%(username)ss accountinstellingen aanpassen" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Het profiel aanpassen van %(username)s" @@ -609,7 +689,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -632,7 +712,7 @@ msgid "" msgstr "U kunt een moderne web-browser die \n\taudio kan afspelen vinden op \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -644,8 +724,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Afbeelding voor %(media_title)s" @@ -690,21 +770,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Sorry, deze video werkt niet omdat je webbrowser geen HTML5 video ondersteunt." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Je kunt een moderne webbrowser die deze video af kan spelen krijgen op http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -712,12 +792,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Voeg toe" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Pas aan" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Verwijderen" @@ -749,11 +823,6 @@ msgstr "Verwijderen" msgid "Really delete %(title)s?" msgstr "Zeker weten dat je %(title)s wil verwijderen?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Permanent verwijderen" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "" msgid "%(username)s's media" msgstr "Media van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Media van %(username)s " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Blader door media van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Geef een reactie" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Voeg dit bericht toe" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "op" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Toegevoegd op

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -886,27 +962,31 @@ msgstr "Als u die persoon bent, maar de verificatie e-mail verloren hebt, kunt u msgid "Here's a spot to tell others about yourself." msgstr "Hier is een plekje om anderen over jezelf te vertellen." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Profiel aanpassen." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Deze gebruiker heeft zijn of haar profiel (nog) niet ingevuld." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Bekijk alle media van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Dit is waar je nieuwe media zal verschijnen, maar het lijkt erop dat je nog niets heb toegevoegd." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "Het lijkt erop dat er nog geen media is." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "feed icoon" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom feed" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Locatie" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Bekijken op OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle rechten voorbehouden" @@ -968,49 +1044,64 @@ msgstr "ouder" msgid "Tagged with" msgstr "Getagged met" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Kon het afbeeldingsbestand niet lezen." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oeps!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Ik weet zeker dat ik dit wil verwijderen." -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1018,74 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo index 206c906c..e4096ef0 100644 Binary files a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index 2cfe7f61..43ecb1ae 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 16:04+0000\n" -"Last-Translator: velmont \n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" +"Last-Translator: cwebber \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" @@ -19,82 +19,96 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brukarnamn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Passord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Epost" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brukarnamn eller epost" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Ugyldig verdi" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "Registrering er slege av. Orsak." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Ein konto med dette brukarnamnet finst allereide." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 msgid "You've already verified your email address!" msgstr "Du har allereie verifisiert epostadressa." -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "Send ein ny stadfestingsepost." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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." -#: mediagoblin/auth/views.py:285 -msgid "Couldn't find someone with that username or email." -msgstr "Fann ingen med det brukarnamnet eller passordet." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Tittel" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "Merkelappar" msgid "Separate tags by commas." msgstr "Separer merkelappar med komma." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Nettnamn" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Nettnamnet kan ikkje vera tomt" @@ -162,65 +176,81 @@ msgstr "Skriv inn det gamle passordet ditt for å stadfesta at du eig denne kont msgid "New password" msgstr "Nytt passord" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 msgid "The title can't be empty" msgstr "Tittelen kjan ikkje vera tom" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 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/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Eit innlegg med denne adressetittelen finst allereie." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "Trå varsamt, du endrar nokon andre sine verk." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "La til vedlegg %s." -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Trå varsamt, du endrar nokon andre sin profil." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Lagra endring av profilen" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Lagra kontoinstellingar" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Feil passord" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Lagra kontoinstellingar" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allereie ei samling med namn «%s»." -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du endrar ein annan brukar si samling. Trå varsamt." @@ -236,6 +266,13 @@ msgstr "No asset directory for this theme\n" msgid "However, old link directory symlink found; removed.\n" msgstr "However, old link directory symlink found; removed.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "Orsak, stør ikkje den filtypen :(" msgid "Video transcoding failed" msgstr "Skjedde noko gale med video transkodinga" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Stad" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Sjå på OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Klient-ID (client ID)" @@ -307,11 +353,26 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet krevst%(user_name)s's account" -msgstr "%(user_name)s sin konto" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "Logg ut" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Legg til verk" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifiser epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "Logg ut" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Drive av MediaGoblin, eit GNU-prosjekt." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "%(user_name)s sin konto" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Legg til verk" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Lag ny samling" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Endra kontoinstellingar" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Verkprosesseringspanel" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Denne sida køyrer MediaGoblin, eit superbra program for å visa fram dine kreative verk." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Vil du leggja til eigne verk og innpel, so må du logga inn." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Har du ikkje ein enno? Det er enkelt!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Opprett ein konto på denne sida eller set opp MediaGoblin på eigen tenar" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nyaste verk" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "Hei %(username)s,\n\nopna fylgjande netadresse i netlesaren din for å aktivera kontoen din:\n\n%(verification_url)s" +#: 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 @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Endrar vedlegg for %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Vedlegg" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Legg ved vedlegg" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Bryt av" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Lagra" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Slett permanent" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -586,13 +662,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Endrar %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Endrar profilen til %(username)s" @@ -608,7 +688,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Last ned" @@ -631,7 +711,7 @@ msgid "" msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå http://opera.com/download." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Opphavleg fil" @@ -643,8 +723,8 @@ msgstr "WebM-fil (Vorbis-kodek)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Bilete for %(media_title)s" @@ -689,21 +769,21 @@ msgstr "Filformat" msgid "Object Height" msgstr "Objekthøgd" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Orsak, denne videoen fungerer ikkje fordi netlesaren din ikkje stør HTML5-video." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Du kan skaffa ein moderne netlesar som kan spela av denne videoen hjå http://opera.com/download." +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM fil (640p; VP8/Vorbis)" @@ -711,12 +791,6 @@ msgstr "WebM fil (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Legg til ei samling" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Legg til" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s av %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Endra" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Slett" @@ -748,11 +822,6 @@ msgstr "Slett" msgid "Really delete %(title)s?" msgstr "Vil du verkeleg sletta %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Slett permanent" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "Fjerna %(media_title)s frå %(collection_title)s?" msgid "Remove" msgstr "Fjern" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "Hei %(username)s,\n%(comment_author)s kommenterte innlegget ditt (%(comm msgid "%(username)s's media" msgstr "Verka til %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)s sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Ser på %(username)s sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Legg att innspel" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Du kan bruka Markdown til formatterring." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Legg til dette innspelet" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "hjå" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Lagt til

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Legg til verk til samling" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Putt %(title)s inn i samling" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Legg til ei ny samling" @@ -885,27 +961,31 @@ msgstr "Viss dette er deg, kan du logga inn for å msgid "Here's a spot to tell others about yourself." msgstr "Her kan du fortelja om deg sjølv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Endra profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Brukaren har ikkje fylt ut profilen sin (enno)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Sjå alle %(username)s sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Her kjem verka dine." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -915,28 +995,24 @@ msgstr "Ser ikkje ut til at det finst nokon verk her nett no." msgid "(remove)" msgstr "(fjern)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "I samlingar (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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-kjelde" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Stad" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Sjå på OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle rettar reservert" @@ -967,49 +1043,64 @@ msgstr "eldre" msgid "Tagged with" msgstr "Merka med" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Klarte ikkje lesa biletefila." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oops." -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Noko gjekk gale" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Ulovleg operasjon" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Orsak Dave, eg kan ikkje la deg gjera det!<HAL2000>

\n

Du prøvde å gjera noko du ikkje har løyve til. Prøvar du å sletta alle brukarkonti no igjen?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Ser ikkje ut til å finnast noko her. Orsak.

\n

Dersom du er sikker på at adressa finst, so er ho truleg flytta eller sletta." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Du kan bruka Markdown til formatterring." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Eg er sikker eg vil sletta dette" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Eg er sikker på at eg vil fjerna dette frå samlinga" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Vel --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Legg ved eit notat" @@ -1017,74 +1108,69 @@ msgstr "Legg ved eit notat" msgid "commented on your post" msgstr "kom med innspel på innlegget ditt" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Sjekk filene dine og prøv omatt." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Du må velja eller laga ei samling" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» er allereie i samling «%s»" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» lagt til samling «%s»" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Sjekk filene dine og prøv omatt." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Nokre av filene ser ut til å mangla. Slettar likevel." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Du sletta verket." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje verket." -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje samlinga." -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index 64a4d00f..99f6bbfd 100644 Binary files a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index b516065d..d833bbfe 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Użytkownik" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Hasło" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adres e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Użytkownik lub adres e-mail" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Nieprawidłowe dane" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Niestety użytkownik o takiej nazwie już istnieje." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Wyślij ponownie e-mail weryfikujący." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Nie znaleziono nikogo o takiej nazwie użytkownika lub adresie e-mail." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "Teraz możesz się zalogować używając nowe hasło." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Tytuł" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "Znaczniki" msgid "Separate tags by commas." msgstr "Rozdzielaj znaczniki przecinkami." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Slug" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Slug nie może być pusty" @@ -162,65 +176,81 @@ msgstr "Wprowadź swoje stare hasło aby udowodnić, że to twoje konto." msgid "New password" msgstr "Nowe hasło" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 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/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Edytujesz profil innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Zapisano zmiany profilu" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Zapisano ustawienia konta" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Nieprawidłowe hasło" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Zapisano ustawienia konta" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Kolekcja \"%s\" już istnieje!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Edytujesz kolekcję innego użytkownika. Zachowaj ostrożność." @@ -236,6 +266,13 @@ msgstr "Brak katalogu danych dla tego motywu\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Znaleziono stary odnośnik symboliczny do katalogu; usunięto.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "NIestety, nie obsługujemy tego typu plików :-(" msgid "Video transcoding failed" msgstr "Konwersja wideo nie powiodła się" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Położenie" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Zobacz na OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Client ID" @@ -307,11 +353,26 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n jest wyma msgid "This field is required for public clients" msgstr "To pole jest wymagane dla klientów publicznych" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klient {0} został zarejestrowany!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Niewłaściwy plik dla tego rodzaju mediów." @@ -319,56 +380,71 @@ msgstr "Niewłaściwy plik dla tego rodzaju mediów." msgid "File" msgstr "Plik" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Musisz podać plik." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Hura! Wysłano!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Kolekcja \"%s\" została dodana!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logo MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Dodaj media" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Obsługiwane przez MediaGoblin, projekt GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Dodaj media" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Zmień ustawienia konta" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Panel przetwarzania mediów" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Ten serwis działa w oparciu o MediaGoblin, świetne oprogramowanie do publikowania mediów." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Aby dodawać swoje pliki, komentować i wykonywać inne czynności, możesz się zalogować na swoje konto MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Jeszcze go nie masz? To proste!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Utwórz konto w tym serwisie\n lub\n załóż własny serwis MediaGoblin" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Najnowsze media" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "Cześć %(username)s,\n\naby aktywować twoje konto GNU MediaGoblin, otwórz następującą stronę w swojej przeglądarce:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logo MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Edycja załączników do %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Załączniki" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Dodaj załącznik" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anuluj" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Zapisz zmiany" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Usuń na stałe" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -586,13 +662,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Edycja %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Edycja profilu %(username)s" @@ -608,7 +688,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Pobierz" @@ -631,7 +711,7 @@ msgid "" msgstr "Proszę pobrać przeglądarkę, która obsługuje \n\tdźwięk w HTML5, pod adresem \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Oryginalny plik" @@ -643,8 +723,8 @@ msgstr "plik WebM (kodek Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Grafika dla %(media_title)s" @@ -689,21 +769,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Niestety nie można wyświetlić tego filmu, ponieważ\n\t twoja przeglądarka nie obsługuje filmów \n\t HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Możesz pobrać współczesną przeglądarkę, która obsługuje \n\t takie filmy, pod adresem \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "plik WebM (640p; VP8/Vorbis)" @@ -711,12 +791,6 @@ msgstr "plik WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Dodaj kolekcję" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Dodaj" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s użytkownika %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Edytuj" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Usuń" @@ -748,11 +822,6 @@ msgstr "Usuń" msgid "Really delete %(title)s?" msgstr "Na pewno usunąć %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Usuń na stałe" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "Na pewno usunąć %(media_title)s z %(collection_title)s?" msgid "Remove" msgstr "Usuń" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "Witaj %(username)s,\n%(comment_author)s skomentował twój wpis (%(comme msgid "%(username)s's media" msgstr "Media użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "media użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Przeglądanie mediów użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Dodaj komentarz" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Możesz formatować przy pomocy składni Markdown." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Dodaj komentarz" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "na" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Dodane

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" +#: 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:35 -#, python-format -msgid "Add %(title)s to collection" -msgstr "Dodaj %(title)s do kolekcji" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Dodaj nową kolekcję" @@ -885,27 +961,31 @@ msgstr "Jeśli jesteś tą osobą, ale zgubiłeś swój e-mail weryfikujący, to msgid "Here's a spot to tell others about yourself." msgstr "W tym miejscu można się przedstawić innym." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Edytuj profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Ten użytkownik nie wypełnił (jeszcze) opisu swojego profilu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Zobacz wszystkie media użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Tu będą widoczne twoje media, ale na razie niczego tu jeszcze nie ma." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -915,28 +995,24 @@ msgstr "Tu nie ma jeszcze żadnych mediów..." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "W kolekcjach (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "ikona kanału" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Kanał Atom" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Położenie" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Zobacz na OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Wszystkie prawa zastrzeżone" @@ -967,49 +1043,64 @@ msgstr "starsze" msgid "Tagged with" msgstr "Znaczniki:" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Nie udało się odczytać pliku grafiki." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Możesz formatować przy pomocy składni Markdown." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Na pewno chcę to usunąć" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Na pewno chcę usunąć ten element z kolekcji" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- wybierz --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Dodaj notatkę" @@ -1017,74 +1108,69 @@ msgstr "Dodaj notatkę" msgid "commented on your post" msgstr "komentarze do twojego wpisu" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Ups, twój komentarz nie zawierał treści." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Twój komentarz został opublikowany!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Sprawdź swoje wpisy i spróbuj ponownie." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Musisz wybrać lub dodać kolekcję" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" już obecne w kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" dodano do kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Sprawdź swoje wpisy i spróbuj ponownie." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Część plików z tego wpisu wygląda na nieistniejące. Trwa usuwanie." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Media zostały usunięte." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Usunięto kolekcję \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 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 index 2cad018a..f3263fd7 100644 Binary files a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index 66a28516..d8877046 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -1,16 +1,18 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: +# Rafael Ferreira , 2013. # , 2011. # ufa , 2011. +# Vinicius SM , 2013. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -20,82 +22,96 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "Nome de usuário ou email inválido." + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "Este campo não aceita endereços de email." + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "Este campo requer um endereço de email." + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nome de Usuário" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Senha" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Endereço de email" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" -msgstr "" +msgstr "Nome de usuário ou email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Desculpe, um usuário com este nome já existe." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." -msgstr "Desculpe, um usuário com esse email já esta cadastrado" +msgstr "Desculpe, um usuário com esse email já está cadastrado" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 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:198 msgid "You must be logged in so we know who to send the email to!" -msgstr " " +msgstr "Você precisa entrar primeiro para sabermos para quem mandar o email!" -#: mediagoblin/auth/views.py:214 +#: mediagoblin/auth/views.py:206 msgid "You've already verified your email address!" -msgstr "Você já verifico seu email!" +msgstr "Você já verificou seu email!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." -msgstr "O email de verificação foi reenviado." +msgstr "O email de verificação foi enviado novamente." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 msgid "" -"An email has been sent with instructions on how to change your password." +"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:273 +#: mediagoblin/auth/views.py:261 +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:264 +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:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." -msgstr "" +msgstr "Agora você pode entrar usando sua nova senha." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Título" @@ -104,13 +120,13 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" " Markdown for formatting." -msgstr "" +msgstr "Você pode usar\n\nMarkdown para formatação." #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 msgid "Tags" @@ -118,13 +134,13 @@ msgstr "Etiquetas" #: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38 msgid "Separate tags by commas." -msgstr "" +msgstr "Separe as etiquetas com vírgulas." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Arquivo" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "O arquivo não pode estar vazio" @@ -132,12 +148,12 @@ msgstr "O arquivo não pode estar vazio" msgid "" "The title part of this media's address. You usually don't need to change " "this." -msgstr "" +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/templates/mediagoblin/utils/license.html:20 msgid "License" -msgstr "" +msgstr "Licença" #: mediagoblin/edit/forms.py:50 msgid "Bio" @@ -149,7 +165,7 @@ msgstr "Website" #: mediagoblin/edit/forms.py:58 msgid "This address contains errors" -msgstr "" +msgstr "Este endereço contém erros" #: mediagoblin/edit/forms.py:63 msgid "Old password" @@ -157,77 +173,93 @@ msgstr "Senha antiga" #: mediagoblin/edit/forms.py:64 msgid "Enter your old password to prove you own this account." -msgstr "" +msgstr "Digite sua senha antiga para provar que esta conta é sua." #: mediagoblin/edit/forms.py:67 msgid "New password" -msgstr "" +msgstr "Nova senha" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "Licença preferida" + +#: mediagoblin/edit/forms.py:80 +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:82 msgid "Email me when others comment on my media" -msgstr "" +msgstr "Me enviar um email quando outras pessoas comentarem em minhas mídias" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" -msgstr "" +msgstr "O título não pode ficar vazio" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 mediagoblin/submit/forms.py:50 +#: mediagoblin/user_pages/forms.py:48 msgid "Description of this collection" -msgstr "" +msgstr "Descrição desta coleção" -#: mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." -msgstr "" +msgstr "A parte do título do endereço dessa coleção. Geralmente você não precisa mudar isso." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Você adicionou o anexo %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "Você só pode editar o seu próprio perfil." + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" -msgstr "" +msgstr "As mudanças no perfil foram salvas" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Senha errada" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "As mudanças na conta foram salvas" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "Você precisa confirmar a exclusão da sua conta." + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" -msgstr "" +msgstr "Você já tem uma coleção chamada \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "Já existe uma coleção com este arquivo para este usuário." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." -msgstr "" +msgstr "Você está editando a coleção de um outro usuário. Prossiga com cuidado." #: mediagoblin/gmg_commands/theme.py:58 msgid "Cannot link theme... no theme set\n" -msgstr "" +msgstr "Não é possível fazer link de tema... nenhum tema definido\n" #: mediagoblin/gmg_commands/theme.py:71 msgid "No asset directory for this theme\n" @@ -237,42 +269,58 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "Cookie CSFR não está presente. Isso é provavelmente o resultado de um bloqueador de cookies ou algo do tipo.
Tenha certeza de autorizar este domínio a configurar cookies." + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" -msgstr "" +msgstr "Desculpe, não tenho suporte a este tipo de arquivo :(" #: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" -msgstr "" +msgstr "Conversão do vídeo falhou" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Localização" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Ver no OpenStreetMap" #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" -msgstr "" +msgstr "ID do Cliente" #: mediagoblin/plugins/oauth/forms.py:28 msgid "Next URL" -msgstr "" +msgstr "Próxima URL" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Allow" -msgstr "" +msgstr "Permitir" #: mediagoblin/plugins/oauth/forms.py:31 msgid "Deny" -msgstr "" +msgstr "Negar" #: mediagoblin/plugins/oauth/forms.py:35 msgid "Name" -msgstr "" +msgstr "Nome" #: mediagoblin/plugins/oauth/forms.py:36 msgid "The name of the OAuth client" -msgstr "" +msgstr "O nome do cliente OAuth" #: mediagoblin/plugins/oauth/forms.py:37 msgid "Description" -msgstr "" +msgstr "Descrição" #: mediagoblin/plugins/oauth/forms.py:39 msgid "" @@ -282,7 +330,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:41 msgid "Type" -msgstr "" +msgstr "Tipo" #: mediagoblin/plugins/oauth/forms.py:46 msgid "" @@ -296,7 +344,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:53 msgid "Redirect URI" -msgstr "" +msgstr "Redirecionar URI" #: mediagoblin/plugins/oauth/forms.py:55 msgid "" @@ -306,13 +354,28 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:67 msgid "This field is required for public clients" -msgstr "" +msgstr "Este campo é necessário para clientes públicos" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" +msgstr "O cliente {0} foi registrado!" + +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +msgstr "Seus clientes OAuth" + +#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 +#: mediagoblin/templates/mediagoblin/submit/collection.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 +msgid "Add" +msgstr "Adicionar" + +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Arquivo inválido para esse tipo de mídia" @@ -320,81 +383,56 @@ msgstr "Arquivo inválido para esse tipo de mídia" msgid "File" msgstr "Arquivo" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Você deve fornecer um arquivo." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Eba! Enviado!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" -msgstr "" +msgstr "Coleção \"%s\" adicionada!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logo MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Adicionar mídia" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifique seu email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "sair" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format -msgid "" -"Released under the AGPL. Source code available." -msgstr "" +msgid "%(user_name)s's account" +msgstr "Conta de %(user_name)s" -#: mediagoblin/templates/mediagoblin/error.html:24 -msgid "Image of goblin stressing out" -msgstr "" +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Adicionar mídia" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "" - -#: mediagoblin/templates/mediagoblin/root.html:31 +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" -msgstr "" +msgstr "Criar nova coleção" -#: mediagoblin/templates/mediagoblin/root.html:34 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" -msgstr "" +msgstr "Mudar configurações da conta" -#: mediagoblin/templates/mediagoblin/root.html:38 -#: mediagoblin/templates/mediagoblin/root.html:44 +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 #: mediagoblin/templates/mediagoblin/admin/panel.html:21 #: mediagoblin/templates/mediagoblin/admin/panel.html:26 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21 @@ -402,39 +440,58 @@ msgstr "" msgid "Media processing panel" msgstr "Painel de processamento de mídia" -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 +#, python-format +msgid "" +"Released under the AGPL. Source code available." +msgstr "Lançado sob a AGPL. Código fonte disponível." + +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "Olá, bemvindo ao site de MediaGoblin." +msgstr "Olá, bem-vindo a este site MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running MediaGoblin, an " "extraordinarily great piece of media hosting software." -msgstr "" +msgstr "Este site roda o MediaGoblin, um programa excelente para hospedar, gerenciar e compartilhar mídia." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." -msgstr "" +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/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" -msgstr " " +msgstr " Ainda não tem uma conta? É facil!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" " or\n" " Set up MediaGoblin on your own server" -msgstr "" +msgstr "Criar uma conta neste site\nou\nConfigurar MediaGoblin em seu próprio servidor" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mídia mais recente" @@ -461,25 +518,25 @@ msgstr "Esses envios não foram processados:" #: mediagoblin/templates/mediagoblin/admin/panel.html:90 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 msgid "No failed entries!" -msgstr "" +msgstr "Nenhuma entrada falhou!" #: mediagoblin/templates/mediagoblin/admin/panel.html:92 msgid "Last 10 successful uploads" -msgstr "" +msgstr "Últimos 10 envios bem sucedidos" #: mediagoblin/templates/mediagoblin/admin/panel.html:112 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 msgid "No processed entries, yet!" -msgstr "" +msgstr "Ainda não há entradas processadas!" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 msgid "Set your new password" -msgstr "" +msgstr "Defina a sua nova senha" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 msgid "Set password" -msgstr "" +msgstr "Definir senha" #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31 @@ -540,41 +597,62 @@ msgid "" "%(verification_url)s" msgstr "Olá %(username)s,\n\nPara ativar sua conta GNU MediaGoblin, visite este endereço no seu navegador:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logo 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 "" +msgstr "Editando os anexos de %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" -msgstr "" +msgstr "Anexos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" -msgstr "" +msgstr "Adicionar anexo" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancelar" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salvar mudanças" +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 +#, python-format +msgid "Really delete user '%(user_name)s' and all related media/comments?" +msgstr "Realmente deletar o usuário '%(user_name)s' e todas as mídias e comentários associados?" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "Sim, realmente deletar minha conta" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Deletar permanentemente" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -585,15 +663,19 @@ msgstr "Editando %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" -msgstr "" +msgstr "Alterando as configurações da conta de %(username)s" + +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "Deletar minha conta" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" -msgstr "" +msgstr "Editando %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Editando perfil de %(username)s" @@ -604,14 +686,14 @@ msgstr "Editando perfil de %(username)s" #: mediagoblin/templates/mediagoblin/listings/tag.html:35 #, python-format msgid "Media tagged with: %(tag_name)s" -msgstr "" +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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" -msgstr "" +msgstr "Baixar" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -622,124 +704,118 @@ msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "" +msgstr "Desculpe, este áudio não irá reproduzir porque \n »seu navegador não oferece suporte a áudio \n »HTML5." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47 msgid "" "You can get a modern web browser that \n" "\tcan play the audio at \n" "\t http://getfirefox.com!" -msgstr "" +msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em \n » http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" -msgstr "" +msgstr "Arquivo original" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 msgid "WebM file (Vorbis codec)" -msgstr "" +msgstr "Arquivo WebM (codec Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" +msgstr "Imagem para %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Toggle Rotate" -msgstr "" +msgstr "Alternar Rotação" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" -msgstr "" +msgstr "Perspectiva" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 msgid "Front" -msgstr "" +msgstr "Frente" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Top" -msgstr "" +msgstr "Cima" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 msgid "Side" -msgstr "" +msgstr "Lado" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 msgid "WebGL" -msgstr "" +msgstr "WebGL" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 msgid "Download model" -msgstr "" +msgstr "Baixar o modelo" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 msgid "File Format" -msgstr "" +msgstr "Formato de Arquivo" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 msgid "Object Height" -msgstr "" +msgstr "Altura do Objeto" + +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "Desculpe, este vídeo não irá reproduzir porque\n seu navegador não suporta vídeo\n HTML5." #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "Você pode obter um navegador moderno\n capaz de reproduzir este vídeo em \n http://getfirefox.com!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" -msgstr "" +msgstr "Arquivo WebM (640p, VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" +msgstr "Adicionar uma coleção" #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" -msgstr "" +msgstr "Adicionar sua 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 (Coleção de %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by %(username)s" -msgstr "" +msgstr "%(collection_title)s de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Editar" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Apagar" @@ -749,84 +825,86 @@ msgstr "Apagar" msgid "Really delete %(title)s?" msgstr "Realmente apagar %(title)s ?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -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 "" +msgstr "Realmente remover %(media_title)s de %(collection_title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" -msgstr "" +msgstr "Apagar" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Coleções de %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Coleções de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" "Hi %(username)s,\n" "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n" -msgstr "" +msgstr "Olá %(username)s,\n %(comment_author)s comentou na sua publicação (%(comment_url)s) em %(instance_name)s\n" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 #, python-format msgid "%(username)s's media" +msgstr "Mídia de %(username)s's" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Mídia de %(username)s " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" -msgstr "" +msgstr "❖ Vendo mídia de %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 +msgid "Add a comment" +msgstr "Adicionar um comentário" #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 -msgid "Add a comment" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 msgid "Add this comment" -msgstr "" +msgstr "Adicionar este comentário" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" -msgstr "" +msgstr "em" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" -msgstr "" +msgstr "

Adicionado em

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "" +msgid "Add “%(media_title)s” to a collection" +msgstr "Adicionar \"%(media_title)s\" a uma coleção" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" -msgstr "" +msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" -msgstr "" +msgstr "Adicionar uma nova coleção" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" @@ -835,7 +913,7 @@ msgstr "Você pode verificar como a mídia esta sendo processada para sua galeri #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" -msgstr "" +msgstr "Seus últimos 10 envios bem sucedidos" #: mediagoblin/templates/mediagoblin/user_pages/user.html:31 #: mediagoblin/templates/mediagoblin/user_pages/user.html:89 @@ -854,7 +932,7 @@ msgstr "Verificação de email necessária" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." -msgstr "Quase pronto! Sua conta ainda precisa ser ativada" +msgstr "Quase pronto! Sua conta ainda precisa ser ativada." #: mediagoblin/templates/mediagoblin/user_pages/user.html:58 msgid "" @@ -886,27 +964,31 @@ msgstr "Se você é essa pessoa, mas você perdeu seu e-mail de verificação, v msgid "Here's a spot to tell others about yourself." msgstr "Aqui é o lugar onde você fala de si para os outros." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Editar perfil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Esse usuário não preencheu seu perfil (ainda)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "Ver coleções" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "Ver todas as mídias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Aqui é onde sua mídia vai aparecer, mas parece que você não adicionou nada ainda." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -914,41 +996,37 @@ msgstr "Aparentemente não há nenhuma mídia aqui ainda..." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" +msgstr "(apagar)" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "ícone feed" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom feed" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" -msgstr "" +msgstr "Todos os direitos reservados" #: mediagoblin/templates/mediagoblin/utils/pagination.html:39 msgid "← Newer" -msgstr "" +msgstr "← Novos" #: mediagoblin/templates/mediagoblin/utils/pagination.html:45 msgid "Older →" -msgstr "" +msgstr "Antigos →" #: mediagoblin/templates/mediagoblin/utils/pagination.html:48 msgid "Go to page:" @@ -957,135 +1035,145 @@ msgstr "Ir a página:" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 msgid "newer" -msgstr "" +msgstr "mais nova" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 msgid "older" -msgstr "" +msgstr "mais antiga" #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" -msgstr "" +msgstr "Etiquetas" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." -msgstr "" +msgstr "Não foi possível ler o arquivo de imagem." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oops" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" -msgstr "" +msgstr "Um erro ocorreu" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" -msgstr "" +msgstr "Operação não permitida" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Me desculpe Dave, não posso deixar você fazer isso!

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:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "" +msgstr "Parece que não há uma página com este endereço. Desculpe!

Se você tem certeza que este endereço está correto, talvez a página que esteja procurando tenha sido movida ou deletada." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "Comentário" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Você pode usar Markdown para formatação." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" -msgstr "Eu tenho certeza de que quero pagar isso" - -#: mediagoblin/user_pages/forms.py:32 -msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "Eu tenho certeza de que quero apagar isso" #: mediagoblin/user_pages/forms.py:35 +msgid "I am sure I want to remove this item from the collection" +msgstr "Tenho certeza que quero remover este item da coleção" + +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "Coleção" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" -msgstr "" +msgstr "Incluir uma nota" #: mediagoblin/user_pages/lib.py:56 msgid "commented on your post" -msgstr "" +msgstr "comentou na sua publicação" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." -msgstr "Opa, seu comentáio estava vazio." +msgstr "Ops, seu comentário estava vazio." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Seu comentário foi postado!" -#: mediagoblin/user_pages/views.py:230 -msgid "You have to select or add a collection" -msgstr "" - -#: mediagoblin/user_pages/views.py:238 -#, python-format -msgid "\"%s\" already in collection \"%s\"" -msgstr "" - -#: mediagoblin/user_pages/views.py:253 -#, python-format -msgid "\"%s\" added to collection \"%s\"" -msgstr "" - -#: mediagoblin/user_pages/views.py:261 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" +#: mediagoblin/user_pages/views.py:236 +msgid "You have to select or add a collection" +msgstr "Você deve selecionar ou adicionar uma coleção" -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:248 +#, python-format +msgid "\"%s\" already in collection \"%s\"" +msgstr "\"%s\" já está na coleção \"%s\"" + +#: mediagoblin/user_pages/views.py:265 +#, python-format +msgid "\"%s\" added to collection \"%s\"" +msgstr "\"%s\" adicionado à coleção \"%s\"" + +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Você deletou a mídia." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "A mídia não foi apagada porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." -msgstr "" +msgstr "Você deletou o item da coleção." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." -msgstr "" +msgstr "O item não foi apagado porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." -msgstr "" +msgstr "Você está prestes a remover um item da coleção de um outro usuário. Prossiga com cuidado." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "Você deletou a coleção \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "A coleção não foi apagada porque você não marcou que tinha certeza." -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." -msgstr "" +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 index dc64a04b..ff91d595 100644 Binary files a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index 4929de7a..5778e080 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -1,16 +1,16 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: # , 2011. -# George Pop , 2011-2012. +# George Pop , 2011-2013. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "Nume de utilizator sau adresă de e-mail nevalidă." + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "Această rubrică nu este pentru adrese de e-mail." + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "Această rubrică trebuie completată cu o adresă de e-mail." + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nume de utilizator" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Parolă" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresa de e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Numele de utilizator sau adresa de e-mail" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Input incorect" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 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:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "E-mail-ul de verificare a fost retrimis." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +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:261 +msgid "Couldn't find someone with that username." +msgstr "Nu există nimeni cu acest nume de utilizator." + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Nu s-a găsit nicio persoană cu acel nume de utilizator sau adresă de e-mail." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titlu" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "Tag-uri" msgid "Separate tags by commas." msgstr "Desparte tag-urile prin virgulă." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Identificator" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Identificatorul nu poate să lipsească" @@ -163,65 +177,81 @@ msgstr "Introdu vechea parolă pentru a demonstra că ești titularul acestui co msgid "New password" msgstr "Noua parolă" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "Licența preferată" + +#: mediagoblin/edit/forms.py:80 +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:82 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:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 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/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Există deja un entry cu același identificator pentru acest utilizator." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Ai anexat %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "Nu poți modifica decât propriul tău profil." + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Editezi profilul unui utilizator. Se recomandă prudență." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Modificările profilului au fost salvate" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Setările pentru acest cont au fost salvate" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Parolă incorectă" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Setările pentru acest cont au fost salvate" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "Trebuie să confirmi ștergerea contului tău." + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ai deja o colecție numită \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Lucrezi pe colecția unui alt utilizator. Se recomandă prudență." @@ -237,6 +267,13 @@ msgstr "Nu există un folder de elemente pentru această temă\n" msgid "However, old link directory symlink found; removed.\n" msgstr "A fost însă găsit un symlink către vechiul folder; s-a șters.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "Lipsește cookie-ul CSRF. Probabil că blocați cookie-urile.
Asigurați-vă că există permisiunea setării cookie-urilor pentru acest domeniu." + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "Scuze, nu recunosc acest tip de fișier :(" msgid "Video transcoding failed" msgstr "Transcodarea video a eșuat" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Locul" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Vezi pe OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID client" @@ -308,11 +354,26 @@ 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:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Clientul {0} a fost înregistrat!" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 +msgid "OAuth client connections" +msgstr "Conexiuni client OAuth" + +#: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 +msgid "Your OAuth clients" +msgstr "Clienții tăi OAuth" + +#: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 +#: mediagoblin/templates/mediagoblin/submit/collection.html:30 +#: mediagoblin/templates/mediagoblin/submit/start.html:34 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 +msgid "Add" +msgstr "Adaugă" + +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Formatul fișierului nu corespunde cu tipul de media selectat." @@ -320,56 +381,71 @@ msgstr "Formatul fișierului nu corespunde cu tipul de media selectat." msgid "File" msgstr "Fișier" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Trebuie să selectezi un fișier." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Ura! Trimis!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Colecția \"%s\" a fost creată!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "logo MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "Contul lui %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "Ieșire" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Trimite fișier" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "Ieșire" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Construit cu MediaGoblin, un proiect GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "Contul lui %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Trimite fișier" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Creează colecție nouă" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Modifică setările contului" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Panou de procesare media" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Acest site folosește MediaGoblin, un software excepțional pentru găzduirea fișierelor media." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Pentru a adăuga fișierele tale și pentru a comenta te poți autentifica cu contul tău MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Încă nu ai unul? E simplu!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Creează un cont pe acest site\n sau\n Instalează MediaGoblin pe serverul tău" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Cele mai recente fișiere" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "Bună, %(username)s,\n\npentru activarea contului tău la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "logo MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Editare anexe la %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Anexe" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Atașează" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anulare" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Salvează modificările" +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:28 +#, python-format +msgid "Really delete user '%(user_name)s' and all related media/comments?" +msgstr "Sigur dorești ștergerea utilizatorului '%(user_name)s' și a fișierelor/comentariilor acestuia?" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:35 +msgid "Yes, really delete my account" +msgstr "Da, doresc ștergerea contului meu" + +#: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 +#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Șterge definitiv" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -587,13 +663,17 @@ 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:62 +msgid "Delete my account" +msgstr "Șterge contul meu" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Editare %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Editare profil %(username)s" @@ -609,7 +689,7 @@ msgstr "Fișier etichetat cu tag-urile: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Download" @@ -632,7 +712,7 @@ msgid "" msgstr "Poți lua un browser modern \n\tcapabil să redea această înregistrare de la \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Fișierul original" @@ -644,8 +724,8 @@ msgstr "Fișier WebM (codec Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Imagine pentru %(media_title)s" @@ -690,21 +770,21 @@ msgstr "Formatul fișierului" msgid "Object Height" msgstr "Înălțimea obiectului" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +msgid "" +"Sorry, this video will not work because\n" +" your web browser does not support HTML5 \n" +" video." +msgstr "Ne pare rău, dar această înregistrare video nu va funcționa deoarece browser-ul dvs. nu este compatibil cu HTML5 video." + #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Ne pare rău, această înregistrare video nu poate fi redată deoarece \n» browserul tău nu este compatibil cu funcția video din HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Poți lua un browser modern\n» capabil să redea această înregistrare de la \n» http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "Puteți obține un browser Web modern care poate reda această înregistrare de la http://getfirefox.com!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "Fișier WebM (640p; VP8/Vorbis)" @@ -712,12 +792,6 @@ msgstr "Fișier WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Creează o colecție" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Adaugă" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Editare" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Șterge" @@ -749,11 +823,6 @@ msgstr "Șterge" msgid "Really delete %(title)s?" msgstr "Sigur dorești să ștergi %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Șterge definitiv" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "Sigur dorești să ștergi %(media_title)s din %(collection_title)s?" msgid "Remove" msgstr "Șterge" +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Colecțiile utilizatorului %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Colecțiile utilizatorului %(username)s" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "Bună, %(username)s,\n%(comment_author)s a făcut un comentariu la posta msgid "%(username)s's media" msgstr "Fișierele lui %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Fișierele media ale lui %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "

❖ Fișierele media ale lui %(username)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Adaugă un comentariu" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Poți folosi Markdown pentru formatare." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Trimite acest comentariu" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "la" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Adăugat la

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Adaugă un fișier la colecție" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Adaugă %(title)s la colecție" +msgid "Add “%(media_title)s” to a collection" +msgstr "Adaugă „%(media_title)s” la o colecție" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Creează o nouă colecție" @@ -886,27 +962,31 @@ msgstr "Dacă tu ești persoana respectivă și nu mai ai e-mail-ul de verificar msgid "Here's a spot to tell others about yourself." msgstr "Aici poți spune altora ceva despre tine." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Editare profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Acest utilizator nu și-a completat (încă) profilul." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "Vizitează colecțiile" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "Vezi toate fișierele media ale lui %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Aici vor apărea fișierele tale media, dar se pare că încă nu ai trimis nimic." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "Nu pare să existe niciun fișier media deocamdată..." msgid "(remove)" msgstr "(șterge)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "În colecțiile (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "icon feed" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "feed Atom" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Locul" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Vezi pe OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Toate drepturile rezervate" @@ -968,49 +1044,64 @@ msgstr "mai vechi" msgid "Tagged with" msgstr "Etichete" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Fișierul cu imaginea nu a putut fi citit." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Hopa!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "S-a produs o eroare" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Operația nu este permisă" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Îmi pare rău, Dave, nu te pot lăsa să faci asta!

Ai încercat să faci o operație nepermisă. Ai încercat iar să ștergi toate conturile utilizatorilor?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Nu există nicio pagină la această adresă.

Dacă sunteți sigur că adresa este corectă, poate că pagina pe care o căutați a fost mutată sau ștearsă." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "Comentariu" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Poți folosi Markdown pentru formatare." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Sunt sigur că doresc să șterg" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Sunt sigur(ă) că vreau să șterg acest articol din colecție" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "Colecție" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Selectează --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Adaugă o notiță" @@ -1018,74 +1109,69 @@ msgstr "Adaugă o notiță" msgid "commented on your post" msgstr "a făcut un comentariu la postarea ta" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Verifică datele și încearcă din nou." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Trebuie să alegi sau să creezi o colecție" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" este deja în colecția \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" a fost adăugat la colecția \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Verifică datele și încearcă din nou." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Unele fișiere din acest entry par să lipsească. Ștergem, totuși." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Ai șters acest fișier" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Ai șters colecția \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 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 index 5cb985ec..31e551b6 100644 Binary files a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index f7ae7d29..64ade0a0 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -1,15 +1,16 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: +# , 2013. # , 2011-2012. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +20,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Логин" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Пароль" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Адрес электронной почты" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Имя пользователя или адрес электронной почты" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Введённое не похоже на имя учётной записи или адрес электронной почты." - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "Извините, на этом сайте регистрация запрещена." -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Извините, пользователь с этим именем уже зарегистрирован." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "Сожалеем, но на этот адрес электронной почты уже зарегистрирована другая учётная запись." -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "Неверный ключ проверки или идентификатор пользователя" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "Вы уже потвердили свой адрес электронной почты!" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "Переслать сообщение с подтверждением аккаунта." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "Вам отправлено электронное письмо с инструкциями по смене пароля." -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Не найдено никого с таким именем пользователя или адресом электронной почты." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "Теперь вы можете войти, используя ваш новый пароль." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Название" @@ -103,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +134,11 @@ msgstr "Метки" msgid "Separate tags by commas." msgstr "(через запятую)" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Отличительная часть адреса" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Отличительная часть адреса необходима" @@ -162,65 +177,81 @@ msgstr "Введите свой старый пароль в качестве д msgid "New password" msgstr "Новый пароль" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "Предпочитаемая лицензия" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "Она будет лицензией по умолчанию для ваших загрузок" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "Уведомлять меня по e-mail о комментариях к моим файлам" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "Название не может быть пустым" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Отличительная часть адреса этой коллекции, основанная на названии. Обычно не нужно её изменять." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Вы добавили сопутствующий файл %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "Вы можете редактировать только свой собственный профиль." + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Вы редактируете профиль пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Изменения профиля сохранены" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Настройки учётной записи записаны" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Неправильный пароль" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Настройки учётной записи записаны" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "У вас уже есть коллекция с названием «%s»!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "У этого пользователя уже есть коллекция с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Вы редактируете коллекцию другого пользователя. Будьте осторожны." @@ -236,6 +267,13 @@ msgstr "У этой темы отсутствует каталог с элеме msgid "However, old link directory symlink found; removed.\n" msgstr "Однако найдена (и удалена) старая символическая ссылка на каталог.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +283,15 @@ msgstr "Увы, я не поддерживаю этот тип файлов :(" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "Посмотреть на OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Неправильный формат файла." @@ -319,56 +381,71 @@ msgstr "Неправильный формат файла." msgid "File" msgstr "Файл" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Вы должны загрузить файл." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Ура! Файл загружен!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Коллекция «%s» добавлена!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Символ MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "Учётная запись %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "завершение сеанса" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Добавить файлы" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Подтвердите ваш адрес электронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "завершение сеанса" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Работает на MediaGoblin, проекте GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "Учётная запись %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Добавить файлы" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Создать новую коллекцию" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Изменить настройки учётной записи" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Этот сайт работает на MediaGoblin, необыкновенно замечательном ПО для хостинга мультимедийных файлов." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "Для добавления собственных файлов, комментирования и т. п. вы можете представиться с помощью вашей MediaGoblin’овой учётной записи." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "У вас её ещё нет? Не проблема!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Создайте учётную запись на этом сайте\n или\n установите MediaGoblin на собственный сервер" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Самые новые файлы" @@ -539,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "Привет, %(username)s!\n\nЧтобы активировать свой аккаунт в GNU MediaGoblin, откройте в своём веб‐браузере следующую ссылку:\n\n%(verification_url)s" +#: 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 @@ -546,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Добавление сопутствующего файла для %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Сопутствующие файлы" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Добавить сопутствующий файл" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -586,13 +663,17 @@ msgstr "Редактирование %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Настройка учётной записи %(username)s" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Редактирование %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Редактирование профиля %(username)s" @@ -608,7 +689,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Скачать" @@ -631,7 +712,7 @@ msgid "" msgstr "Вы можете скачать современный браузер, \n\tспособный проиграть это аудио, с \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Исходный файл" @@ -643,8 +724,8 @@ msgstr "WebM‐файл (кодек — Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Изображение «%(media_title)s»" @@ -689,21 +770,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Сожалеем, этот ролик не проиграется, ⏎\n» потому что ваш браузер не поддерживает ⏎\n» видео в соответствии со стандартом HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Вы можете скачать современный браузер,\n» способный воспроизводить это видео, с \n» http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM-файл (640p; VP8/Vorbis)" @@ -711,12 +792,6 @@ msgstr "WebM-файл (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Добавление коллекции" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Добавить" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s пользователя %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Изменить" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Удалить" @@ -748,11 +823,6 @@ msgstr "Удалить" msgid "Really delete %(title)s?" msgstr "Удалить %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Удалить безвозвратно" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +832,16 @@ msgstr "В самом деле исключить %(media_title)s из %(collect msgid "Remove" msgstr "Исключить" +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 +#, python-format +msgid "%(username)s's collections" +msgstr "Коллекции %(username)s" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "%(username)s's collections" +msgstr "Коллекции %(username)s" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +854,53 @@ msgstr "Привет, %(username)s.\nПользователь %(comment_author)s msgid "%(username)s's media" msgstr "Файлы %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Файлы пользователя %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Просмотр файлов пользователя %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Добавить комментарий" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Для разметки можете использовать язык Markdown." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Добавить этот комментарий" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "в" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Добавлено

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Добавить файл к коллекции" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Добавить %(title)s в коллекцию" +msgid "Add “%(media_title)s” to a collection" +msgstr "Добавление «%(media_title)s» в коллекцию" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Добавление новой коллекции" @@ -885,27 +962,31 @@ msgstr "Если это были вы, и если вы потеряли соо msgid "Here's a spot to tell others about yourself." msgstr "Здесь вы можете рассказать о себе." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:124 +msgid "Browse collections" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format msgid "View all of %(username)s's media" msgstr "Смотреть все файлы %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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:157 +#: 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..." @@ -915,28 +996,24 @@ msgstr "Пока что тут файлов нет…" msgid "(remove)" msgstr "(исключить)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "В %(collected)s коллекциях" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "На карте" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Посмотреть на OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Все права сохранены" @@ -967,49 +1044,64 @@ msgstr "более старые" msgid "Tagged with" msgstr "Метки" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Не удалось прочитать файл с изображением." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Ой!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Произошла ошибка" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Операция не позволяется" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Для разметки можете использовать язык Markdown." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Я уверен, что хочу удалить это" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Выберите --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Примечание" @@ -1017,74 +1109,69 @@ msgstr "Примечание" msgid "commented on your post" msgstr "оставил комментарий к вашему файлу" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуст." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Необходимо выбрать или добавить коллекцию" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» — уже в коллекции «%s»" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» добавлено в коллекцию «%s»" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Некоторые файлы от этой записи не обнаружены. Всё равно удаляем." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Вы удалили файл." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой." -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "Вы исключили файл из коллекции." -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "Файл не исключён из коллекции, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Вы на пороге исключения файла из коллекции другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Вы удалили коллекцию «%s»" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Коллекция не удалена, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index d84b09c4..4844597f 100644 Binary files a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index b866501e..7f6efd1d 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -23,82 +23,96 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brugernavn eller email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Forkert input" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Desværre, det brugernavn er allerede brugt" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Email til godkendelse sendt igen." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Vi kunne ikke dit brugernavn eller email." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" @@ -107,8 +121,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -123,11 +137,11 @@ msgstr "Tags" msgid "Separate tags by commas." msgstr "Separer tags med kommaer." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Unikátna časť adresy" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Unikátna časť adresy nesmie byť prázdna" @@ -166,65 +180,81 @@ msgstr "Skriv dit gamle kodeord for at bevise det er din konto." msgid "New password" msgstr "Ny kodeord" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "Email mig når andre kommenterer på mine medier" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Príloha %s pridaná!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Kontoindstillinger gemt" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Kontoindstillinger gemt" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "Kolekcia s týmto štítkom sa už u teba vyskytuje." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du er ved at ændre en anden bruger's samling. Pas på." @@ -240,6 +270,13 @@ msgstr "Žiadny priečinok položiek pre túto tému\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Hoci, starý symbolický odkaz na priečinok nájdený; odstránený.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -249,6 +286,15 @@ msgstr "Desværre, jeg understøtter ikke den filtype :(" msgid "Video transcoding failed" msgstr "Konvertovanie videa zlyhalo" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Poloha" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Zobraziť na OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Klientské ID" @@ -311,11 +357,26 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nj požadované%(user_name)s's account" -msgstr "Účet používateľa %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "odhlásiť sa" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Pridať výtvor" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "odhlásiť sa" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Poháňa nás MediaGoblin, súčasť projektu GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "Účet používateľa %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Pridať výtvor" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Vytvoriť novú zbierku" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Zmeniť nastavenia účtu" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Sekcia spracovania výtvorov" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Táto stránka používa MediaGoblin, výnimočne skvelý kus softvéru na hostovanie médií." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "For at tilføje dine egne medier, skrive kommentarer, og mere, du kan logge ind med din MediaGoblin konto." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Har du ikke en endnu? Det er let!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -437,7 +492,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Vytvoriť účet na tejto stránke\n alebo\n Založiť MediaGoblin na vlastnom serveri" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Najčerstvejšie výtvory" @@ -543,6 +598,11 @@ msgid "" "%(verification_url)s" msgstr "Ahoj %(username)s,\n\npre aktiváciu tvojho GNU MediaGoblin účtu, otvor nasledujúci odkaz vo\nsvojom prehliadači:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin logo" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -550,34 +610,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Úprava príloh pre %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Prílohy" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Pridať prílohu" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Afbryd" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Gem ændringer" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Odstráň permanentne" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -590,13 +666,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Úprava %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Redigerer %(username)s profil" @@ -612,7 +692,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Stiahnuť" @@ -635,7 +715,7 @@ msgid "" msgstr "Môžeš získať moderný prehliadač, ktorý\n\ttento zvuk hravo prehrá \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Originálny súbor" @@ -647,8 +727,8 @@ msgstr "WebM súbor (Vorbis kodek)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Obrázok pre %(media_title)s" @@ -693,21 +773,21 @@ msgstr "Súborový formát" msgid "Object Height" msgstr "Výška objektu" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Prepáč, toto video nepôjde prehrať \n» tvoj webový prehliadač nepodporuje HTML5 \n» video." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Môžeš získať moderný prehliadač, ktorý \n» vie prehrať toto video na \n» http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM súbor (640p; VP8/Vorbis)" @@ -715,12 +795,6 @@ msgstr "WebM súbor (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Pridať kolekciu" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Pridať" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -737,12 +811,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s od %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Upraviť" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Odstrániť" @@ -752,11 +826,6 @@ msgstr "Odstrániť" msgid "Really delete %(title)s?" msgstr "Skutočne odstrániť %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Odstráň permanentne" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -766,6 +835,16 @@ msgstr "Určite odstrániť %(media_title)s z %(collection_title)s?" msgid "Remove" msgstr "Odstrániť" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -778,56 +857,53 @@ msgstr "Ahoj %(username)s,\npoužívateľ %(comment_author)s skomentoval tvoj pr msgid "%(username)s's media" msgstr "Výtvory, ktoré vlastní %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Výtvory, ktoré vlastní %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Prezeranie výtvorov podľa %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Pridaj komentár" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Môžeš využiť Markdown pre formátovanie." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Pridať tento komentár" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "o" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Pridané

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Pridať výtvory do zbierky" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Pridať %(title)s do kolekcie" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Pridať novú kolekciu" @@ -889,27 +965,31 @@ msgstr "Pokiaľ si to ty, ale už nemáš overovaciu e-mailovú správu, tak sa msgid "Here's a spot to tell others about yourself." msgstr "Her kan du fortælle andre om dig selv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Ret profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Dotyčný používateľ ešte nevyplnil svoj profil (zatiaľ)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Zhliadnuť všetky výtvory, ktoré vlastní %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Všetky tvoje výtvory sa objavia práve tu, ale zatiaľ nemáš nič pridané." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -919,28 +999,24 @@ msgstr "Najskôr sa tu ešte nenachádzajú žiadne výtvory..." msgid "(remove)" msgstr "(odstrániť)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "V kolekciách (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "ikona čítačky" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Čítačka Atom" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Poloha" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Zobraziť na OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Všetky práva vyhradené" @@ -971,49 +1047,64 @@ msgstr "staršie" msgid "Tagged with" msgstr "Označené ako" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Nebolo možné prečítať obrazový súbor." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Výskyt chyby" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Nepovolená operácia" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Prepáč Hocikto, toto nesmieš!

Práve si chcel vykonať funkciu, na ktorú nemáš oprávnenie. Opäť si chcel skúsiť odstrániť všetky používateľské účty?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Zdá sa, že na tejto adrese sa nič nenachádza. Prepáč!

Pokiaľ si si istý, že adresa je správna, možno sa hľadaná stránka presunula inam, prípadne zmazala." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Môžeš využiť Markdown pre formátovanie." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Jednoznačne to chcem odstrániť" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Rozhodne chcem odstrániť danú položku z kolekcie" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Vybrať --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Pridať poznámku" @@ -1021,74 +1112,69 @@ msgstr "Pridať poznámku" msgid "commented on your post" msgstr "skomentoval tvoj príspevok" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Ajaj, tvoj komentár bol prázdny." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol zaslaný!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Prosím skontroluj svoje položky a skús znova." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Musíš vybrať alebo pridať kolekciu" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" sa už nachádza v kolekcie \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s pridané do kolekcie \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Prosím skontroluj svoje položky a skús znova." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Niektoré súbory s danou položkou zrejme chýbajú.. Odstraňujem napriek tomu." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Chystáš sa odstrániť výtvory niekoho iného. Dbaj na to." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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 opatrne." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Kolekcia \"%s\" úspešne odstránená." -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 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 opatrne." diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo index 1599b039..772f78f0 100644 Binary files a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index aa482e0c..4b202d51 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Uporabniško ime" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Geslo" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-poštni naslov" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "Oprostite, uporabnik s tem imenom že obstaja." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 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:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "Ponovno pošiljanje potrditvene e-pošte." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Naslov" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "Oznake" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Oznaka" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Oznaka ne sme biti prazna" @@ -162,65 +176,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Vnos s to oznako za tega uporabnika že obstaja." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo." -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Urejate uporabniški profil. Nadaljujte pazljivo." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,6 +266,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,11 +353,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napačna datoteka." @@ -319,56 +380,71 @@ msgstr "Za vrsto vsebine je bila podana napačna datoteka." msgid "File" msgstr "Datoteka" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Podati morate datoteko." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Juhej! Poslano." -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logotip MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Dodaj vsebino" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Dodaj vsebino" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Podokno obdelovanja vsebine" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" msgstr "Pozdravljeni, %(username)s\n\nZa aktivacijo svojega računa GNU MediaGoblin odprite\nnaslednji URL v svojem spletnem brskalniku:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logotip MediaGoblin" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Prekliči" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Shrani spremembe" +#: 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:47 +#: 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 @@ -586,13 +662,17 @@ msgstr "Urejanje %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Urejanje profila – %(username)s" @@ -608,7 +688,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -631,7 +711,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -643,8 +723,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -689,21 +769,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -711,12 +791,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -748,11 +822,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Vsebina uporabnika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -885,27 +961,31 @@ msgstr "Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -967,49 +1043,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Opa!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1017,74 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index 64880aed..928f9a13 100644 Binary files a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 2911f34e..edd811d7 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Emër përdoruesi" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Fjalëkalim" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresë email" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Emër përdoruesi ose email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "Futje e pasaktë" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 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:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Ridërgoni email-in tuaj të verifikimit." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 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:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "Nuk u gjet dot dikush me atë emër përdoruesi ose email." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 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/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titull" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "Etiketa" msgid "Separate tags by commas." msgstr "Ndajini etiketat me presje." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Identifikues" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Identifikuesi s'mund të jetë i zbrazët" @@ -163,65 +177,81 @@ msgstr "Jepni fjalëkalimin tuaj të vjetër që të provohet se këtë llogari msgid "New password" msgstr "Fjalëkalimi i ri" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 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:94 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/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 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/views.py:65 +#: mediagoblin/edit/views.py:66 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:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "Shtuat bashkangjitjen %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Ndryshimet e profilit u ruajtën" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "Rregullimet e llogarisë u ruajtën" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Fjalëkalim i gabuar" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "Rregullimet e llogarisë u ruajtën" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Keni tashmë një koleksion të quajtur \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 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:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Po përpunoni koleksionin e një tjetër përdoruesi. Hapni sytë." @@ -237,6 +267,13 @@ msgstr "Nuk ka drejtori asetesh për këtë temë\n" msgid "However, old link directory symlink found; removed.\n" msgstr "Sidoqoftë, u gjet simlidhje e vjetër drejtorie lidhjesh; u hoq.\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :(" msgid "Video transcoding failed" msgstr "Ndërkodimi i videos dështoi" +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24 +msgid "Location" +msgstr "Vend" + +#: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:52 +#, python-format +msgid "View on OpenStreetMap" +msgstr "Shiheni te OpenStreetMap" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID klienti" @@ -308,11 +354,26 @@ msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është e msgid "This field is required for public clients" msgstr "Kjo fushë është e domosdoshme për klientë publikë" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klienti {0} u regjistrua!" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." @@ -320,56 +381,71 @@ msgstr "Kartelë e gabuar e dhënë për llojin e medias." msgid "File" msgstr "Kartelë" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Duhet të jepni një kartelë." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Yhaaaaaa! U parashtrua!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "U shtua koleksioni \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logoja e MediaGoblin-it" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "Llogaria e %(user_name)s" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "dilni" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Shtoni media" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "dilni" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "Bazuar në MediaGoblin, një projekt GNU." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "Llogaria e %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Shtoni media" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Krijoni koleksion të ri" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Ndryshoni rregullime llogarie" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Paneli i Përpunimit të Medias" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Ky site përdor MediaGoblin, një program jashtëzakonisht i shkëlqyer për strehim mediash." -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "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/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Nuk keni ende një të tillë? Është e lehtë!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Krijoni një llogarin te ky site\n ose\n Instaloni dhe rregulloni MediaGoblin-in te shërbyesi juaj" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mediat më të reja" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "Njatjeta %(username)s,\n\nqë të aktivizoni llogarinë tuaj te GNU MediaGoblin hapeni URL-në vijuese te\nshfletuesi juaj web:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "Logoja e MediaGoblin-it" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "Po përpunohen bashkangjitjet për %(media_title)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "Bashkangjitje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Shtoni bashkangjitje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anuloje" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Ruaji ndryshimet" +#: 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:47 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +msgid "Delete permanently" +msgstr "Fshije përgjithmonë" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -587,13 +663,17 @@ 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:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "Po përpunohet %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Po përpunohet profili i %(username)s" @@ -609,7 +689,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Shkarkojeni" @@ -632,7 +712,7 @@ msgid "" msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni te \n\t http://getfirefox.com!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Kartela origjinale" @@ -644,8 +724,8 @@ msgstr "Kartelë WebM (kodek Vorbis)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "Figurë për %(media_title)s" @@ -690,21 +770,21 @@ msgstr "Format Kartele" msgid "Object Height" msgstr "Lartësi Objekti" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "Na ndjeni, kjo video s'do të funksionojë, ngaqë \n\t shfletuesi juaj web s'mbulon video HTML5." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "Një shfletues web modern që \n\t mund ta luajë këtë video mund ta merrni te \n\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "Kartelë WebM (640p; VP8/Vorbis)" @@ -712,12 +792,6 @@ msgstr "Kartelë WebM (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "Shtoni një koleksion" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "Shtoni" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s nga %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "Përpunoni" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "Fshije" @@ -749,11 +823,6 @@ msgstr "Fshije" msgid "Really delete %(title)s?" msgstr "Të fshihet vërtet %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "Fshije përgjithmonë" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "Të hiqet vërtet %(media_title)s nga %(collection_title)s?" msgid "Remove" msgstr "Hiqe" +#: 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "Tungjatjeta %(username)s,\n%(comment_author)s ka komentuar te postimi ju msgid "%(username)s's media" msgstr "Media nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "Media nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ Po shfletoni media nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Shtoni një koment" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "Për formatime mund të përdorni Markdown." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "Shtoje këtë koment" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "te" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

Shtuar më

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Shtoni koleksion media" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "Shtoni %(title)s te koleksioni juaj" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Shtoni një koleksion të ri" @@ -886,27 +962,31 @@ msgstr "Nëse jeni ju ai person, por keni humbur email-in tuaj të verifikimit, msgid "Here's a spot to tell others about yourself." msgstr "Ja një vend t'i tregoni botës mbi veten." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Përpunoni profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Ky përdorues nuk e ka plotësuar (ende) profilin e vet." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Shihni krejt mediat nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Media juaj do të shfaqet këtu, por nuk duket të keni shtuar gjë ende." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "Nuk duket ende të ketë ndonjë media këtu..." msgid "(remove)" msgstr "(hiqe)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "Te koleksionet (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "ikonë prurjesh" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Prurje Atom" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Vend" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "Shiheni te OpenStreetMap" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tërë të drejtat të rezervuara" @@ -968,49 +1044,64 @@ msgstr "më të vjetra" msgid "Tagged with" msgstr "Etiketuar me" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Nuk lexoi dot kartelën e figurës." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Oooh!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "Ndodhi një gabim" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "Veprim i palejuar" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Më ndjeni or trim, nuk ju lë dot ta bëni këtë!

Provuat të kryeni një funksion që nuk lejohet. Keni provuar prapë të fshini krejt llogaritë e përdoruesve?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Nuk duket se ka ndonjë faqe në këtë adresë. Na ndjeni!

Nëse jeni i sigurt se kjo adresë është e saktë, ndoshta faqja që po kërkoni është lëvizur ose fshirë." -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "Për formatime mund të përdorni Markdown." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Jam i sigurt që dua të fshihet kjo" -#: mediagoblin/user_pages/forms.py:32 +#: mediagoblin/user_pages/forms.py:35 msgid "I am sure I want to remove this item from the collection" msgstr "Jam i sigurt se dua që të hiqet ky objekt prek koleksioni" -#: mediagoblin/user_pages/forms.py:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "-- Përzgjidhni --" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "Përfshini një shënim" @@ -1018,74 +1109,69 @@ msgstr "Përfshini një shënim" msgid "commented on your post" msgstr "komentoi te postimi juaj" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Hmmm, komenti juaj qe i zbrazët." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni." + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Duhet të përzgjidhni ose shtoni një koleksion" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" gjendet tashmë te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" u shtua te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni." - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "Duket se mungojnë disa nga kartelat në këtë zë. Po fshihet, sido qoftë." - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "E fshitë median." -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 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:312 +#: mediagoblin/user_pages/views.py:301 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:375 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:379 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:384 +#: mediagoblin/user_pages/views.py:389 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:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%s\"" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 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:434 +#: mediagoblin/user_pages/views.py:439 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 index dd67d341..19e7da9e 100644 Binary files a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 32e7d3d9..97af606b 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,82 +18,96 @@ 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:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" @@ -102,8 +116,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -118,11 +132,11 @@ msgstr "" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -161,65 +175,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -235,6 +265,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -244,6 +281,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -306,11 +352,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -318,56 +379,71 @@ msgstr "" msgid "File" msgstr "" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -432,7 +487,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -538,6 +593,11 @@ msgid "" "%(verification_url)s" 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 @@ -545,34 +605,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -585,13 +661,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "" @@ -607,7 +687,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -630,7 +710,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -642,8 +722,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -688,21 +768,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -710,12 +790,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -732,12 +806,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -747,11 +821,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -761,6 +830,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -773,56 +852,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -884,27 +960,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -914,28 +994,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -966,49 +1042,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1016,74 +1107,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index e4586d50..6ec18aa4 100644 Binary files a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index d288feac..ab382efb 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,82 +20,96 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Användarnamn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Lösenord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-postadress" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: 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:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "En användare med det användarnamnet finns redan." -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 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:174 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:180 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:198 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:206 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:219 msgid "Resent your verification email." msgstr "Skickade ett nytt verifierings-email." -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "Titel" @@ -104,8 +118,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -120,11 +134,11 @@ msgstr "Taggar" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "Sökvägsnamn" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "Sökvägsnamnet kan inte vara tomt" @@ -163,65 +177,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "Ett inlägg med det sökvägsnamnet existerar redan." -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 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:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 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:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Fel lösenord" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,6 +267,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -246,6 +283,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,11 +354,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." @@ -320,56 +381,71 @@ msgstr "Ogiltig fil för mediatypen." msgid "File" msgstr "Fil" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Du måste ange en fil" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Tjohoo! Upladdat!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin-logotyp" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "Lägg till media" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Lägg till media" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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 "Mediabehandlingspanel" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "Har du inte ett redan?" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -434,7 +489,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Senast medier" @@ -540,6 +595,11 @@ msgid "" "%(verification_url)s" msgstr "Hej %(username)s,\n\nöppna den följande webbadressen i din webbläsare för att aktivera ditt konto på GNU MediaGoblin:\n\n%(verification_url)s" +#: mediagoblin/templates/mediagoblin/bits/logo.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/bits/logo.html:23 +msgid "MediaGoblin logo" +msgstr "MediaGoblin-logotyp" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -547,34 +607,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Avbryt" #: mediagoblin/templates/mediagoblin/edit/attachments.html:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" msgstr "Spara ändringar" +#: 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:47 +#: 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 @@ -587,13 +663,17 @@ msgstr "Redigerar %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "Redigerar %(username)ss profil" @@ -609,7 +689,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/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -632,7 +712,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -644,8 +724,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -690,21 +770,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -712,12 +792,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +808,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -749,11 +823,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "Vill du verkligen radera %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -763,6 +832,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -775,56 +854,53 @@ msgstr "" msgid "%(username)s's media" msgstr "%(username)ss media" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)ss media" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -886,27 +962,31 @@ msgstr "Om det är du som är den personen och har förlorat ditt e-postmeddelan msgid "Here's a spot to tell others about yourself." msgstr "Här kan du berätta för andra om dig själv." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:100 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:117 msgid "Edit profile" msgstr "Redigera profil" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:106 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:105 msgid "This user hasn't filled in their profile (yet)." msgstr "Den här användaren har inte fyllt i sin profilsida ännu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 +#: 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 "Se all media från %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 +#: 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 "Här kommer din media att dyka upp, du verkar inte ha lagt till någonting ännu." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:157 +#: 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..." @@ -916,28 +996,24 @@ msgstr "Det verkar inte finnas någon media här ännu." msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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 "feed-ikon" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom-feed" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -968,49 +1044,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "Ojoj!" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Jag är säker på att jag vill radera detta" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1018,74 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index 5009e371..0de9a879 100644 Binary files a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po index 44a7bf44..e82ffbdc 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -19,82 +19,96 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "వాడుకరి పేరు" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "సంకేతపదం" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "ఈమెయిలు చిరునామా" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "శీర్షిక" @@ -103,8 +117,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -119,11 +133,11 @@ msgstr "" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -162,65 +176,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,6 +266,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -245,6 +282,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,11 +353,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -319,56 +380,71 @@ msgstr "" msgid "File" msgstr "" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -433,7 +488,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -539,6 +594,11 @@ msgid "" "%(verification_url)s" 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 @@ -546,34 +606,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -586,13 +662,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "" @@ -608,7 +688,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -631,7 +711,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -643,8 +723,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -689,21 +769,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -711,12 +791,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -733,12 +807,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -748,11 +822,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -762,6 +831,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -774,56 +853,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -885,27 +961,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -915,28 +995,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -967,49 +1043,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1017,74 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index 7b1c154c..d3b50931 100644 Binary files a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index 5a47ef7c..c265c818 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -18,82 +18,96 @@ msgstr "" "Language: zh_TW.Big5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "" @@ -102,8 +116,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -118,11 +132,11 @@ msgstr "" msgid "Separate tags by commas." msgstr "" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "" @@ -161,65 +175,81 @@ msgstr "" msgid "New password" msgstr "" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -235,6 +265,13 @@ msgstr "" msgid "However, old link directory symlink found; removed.\n" msgstr "" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -244,6 +281,15 @@ msgstr "" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -306,11 +352,26 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "" @@ -318,56 +379,71 @@ msgstr "" msgid "File" msgstr "" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -432,7 +487,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -538,6 +593,11 @@ msgid "" "%(verification_url)s" 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 @@ -545,34 +605,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -585,13 +661,17 @@ msgstr "" msgid "Changing %(username)s's account settings" msgstr "" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "" @@ -607,7 +687,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "" @@ -630,7 +710,7 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -642,8 +722,8 @@ msgstr "" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 "" @@ -688,21 +768,21 @@ msgstr "" msgid "Object Height" msgstr "" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" +" can play this video at \n" +" http://getfirefox.com!" msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "" @@ -710,12 +790,6 @@ msgstr "" msgid "Add a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -732,12 +806,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "" @@ -747,11 +821,6 @@ msgstr "" msgid "Really delete %(title)s?" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -761,6 +830,16 @@ msgstr "" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -773,56 +852,53 @@ msgstr "" msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" +msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -884,27 +960,31 @@ msgstr "" msgid "Here's a spot to tell others about yourself." msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:101 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:118 +#: 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:106 +#: 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:132 +#: 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:145 +#: 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:157 +#: 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..." @@ -914,28 +994,24 @@ msgstr "" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" +#: mediagoblin/templates/mediagoblin/utils/collections.html:21 +msgid "Collected in" +msgstr "" + +#: mediagoblin/templates/mediagoblin/utils/collections.html:44 +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/geolocation_map.html:25 -msgid "Location" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on OpenStreetMap" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -966,49 +1042,64 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "" @@ -1016,74 +1107,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 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 index 13346b7c..42460628 100644 Binary files a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo differ diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index 4a722732..90078737 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -1,5 +1,5 @@ # Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION +# Copyright (C) 2013 ORGANIZATION # This file is distributed under the same license as the PROJECT project. # # Translators: @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -21,82 +21,96 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41 +#: mediagoblin/auth/forms.py:28 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:29 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "使用者名稱" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "密碼" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email 位址" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "使用者名稱或 email" -#: mediagoblin/auth/forms.py:58 -msgid "Incorrect input" -msgstr "輸入錯誤" - -#: mediagoblin/auth/views.py:55 +#: mediagoblin/auth/views.py:54 msgid "Sorry, registration is disabled on this instance." msgstr "抱歉，本站已經暫停註冊。" -#: mediagoblin/auth/views.py:75 +#: mediagoblin/auth/views.py:68 msgid "Sorry, a user with that name already exists." msgstr "抱歉，這個使用者名稱已經存在。" -#: mediagoblin/auth/views.py:79 +#: mediagoblin/auth/views.py:72 msgid "Sorry, a user with that email address already exists." msgstr "抱歉，此 email 位置已經被註冊了。" -#: mediagoblin/auth/views.py:182 +#: mediagoblin/auth/views.py:174 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:180 msgid "The verification key or user id is incorrect" msgstr "認證碼或是使用者 ID 錯誤" -#: mediagoblin/auth/views.py:206 +#: mediagoblin/auth/views.py:198 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:206 msgid "You've already verified your email address!" msgstr "您的電子郵件已經確認了！" -#: mediagoblin/auth/views.py:227 +#: mediagoblin/auth/views.py:219 msgid "Resent your verification email." msgstr "重送認證信。" -#: mediagoblin/auth/views.py:263 +#: mediagoblin/auth/views.py:250 +msgid "" +"If that email address (case sensitive!) is registered an email has been sent" +" with instructions on how to change your password." +msgstr "" + +#: mediagoblin/auth/views.py:261 +msgid "Couldn't find someone with that username." +msgstr "" + +#: mediagoblin/auth/views.py:264 msgid "" "An email has been sent with instructions on how to change your password." msgstr "修改密碼的指示已經由電子郵件寄送到您的信箱。" -#: mediagoblin/auth/views.py:273 +#: mediagoblin/auth/views.py:271 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:285 -msgid "Couldn't find someone with that username or email." -msgstr "找不到相關的使用者名稱或是電子郵件。" - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "您現在可以用新的密碼登入了！" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:93 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 -#: mediagoblin/user_pages/forms.py:40 +#: mediagoblin/user_pages/forms.py:45 msgid "Title" msgstr "標題" @@ -105,8 +119,8 @@ 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:44 +#: mediagoblin/edit/forms.py:97 mediagoblin/submit/forms.py:32 +#: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:49 msgid "" "You can use\n" " \n" @@ -121,11 +135,11 @@ msgstr "標籤" msgid "Separate tags by commas." msgstr "用逗號分隔標籤。" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:101 msgid "Slug" msgstr "簡稱" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:102 msgid "The slug can't be empty" msgstr "簡稱不能為空白" @@ -164,65 +178,81 @@ msgstr "輸入您的舊密碼來證明您擁有這個帳號。" msgid "New password" msgstr "新密碼" -#: mediagoblin/edit/forms.py:71 +#: mediagoblin/edit/forms.py:74 +msgid "License preference" +msgstr "" + +#: mediagoblin/edit/forms.py:80 +msgid "This will be your default license on upload forms." +msgstr "" + +#: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" msgstr "當有人對我的媒體評論時寄信給我" -#: mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:94 msgid "The title can't be empty" msgstr "標題不能是空的" -#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 -#: mediagoblin/user_pages/forms.py:43 +#: mediagoblin/edit/forms.py:96 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:103 msgid "" "The title part of this collection's address. You usually don't need to " "change this." msgstr "此蒐藏網址的標題部份，通常不需要修改。" -#: mediagoblin/edit/views.py:65 +#: mediagoblin/edit/views.py:66 msgid "An entry with that slug already exists for this user." msgstr "這個簡稱已經被其他人用了" -#: mediagoblin/edit/views.py:86 +#: mediagoblin/edit/views.py:85 msgid "You are editing another user's media. Proceed with caution." msgstr "您正在修改別人的媒體，請小心操作。" -#: mediagoblin/edit/views.py:156 +#: mediagoblin/edit/views.py:155 #, python-format msgid "You added the attachment %s!" msgstr "您加上了附件「%s」！" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:182 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "您正在修改別人的個人檔案，請小心操作。" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "個人檔案修改已儲存" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "帳號設定已儲存" - -#: mediagoblin/edit/views.py:251 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:210 +#: mediagoblin/edit/views.py:252 +msgid "Account settings saved" +msgstr "帳號設定已儲存" + +#: mediagoblin/edit/views.py:286 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: mediagoblin/edit/views.py:322 mediagoblin/submit/views.py:142 +#: mediagoblin/user_pages/views.py:214 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已經有一個稱做「%s」的蒐藏了！" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "這個使用者已經有使用該簡稱的蒐藏了。" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "您正在修改別人的蒐藏，請小心操作。" @@ -238,6 +268,13 @@ msgstr "此佈景沒有素材目錄\n" msgid "However, old link directory symlink found; removed.\n" msgstr "但是舊的目錄連結已經找到並移除。\n" +#: mediagoblin/meddleware/csrf.py:134 +msgid "" +"CSRF cookie not present. This is most likely the result of a cookie blocker " +"or somesuch.
Make sure to permit the settings of cookies for this " +"domain." +msgstr "" + #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" @@ -247,6 +284,15 @@ msgstr "抱歉，我不支援這樣的檔案格式 :(" msgid "Video transcoding failed" 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 OpenStreetMap" +msgstr "在 OpenStreetMap 上觀看" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "客戶 ID" @@ -309,11 +355,26 @@ msgstr "此應用程式的重定向 URI，本欄位在公開類型的 OAuth clie msgid "This field is required for public clients" msgstr "本欄位在公開類型的 OAuth client 為必填" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "OAuth client {0} 註冊完成！" -#: mediagoblin/processing/__init__.py:138 +#: 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/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:172 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別！" @@ -321,56 +382,71 @@ msgstr "指定錯誤的媒體類別！" msgid "File" msgstr "檔案" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "您必須提供一個檔案" -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "啊哈！PO 上去啦！" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "蒐藏「%s」新增完成！" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin 標誌" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "%(user_name)s's account" -msgstr "%(user_name)s 的帳號" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "登出" - -#: mediagoblin/templates/mediagoblin/base.html:62 -#: mediagoblin/templates/mediagoblin/root.html:28 -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 -msgid "Add media" -msgstr "新增媒體" - -#: mediagoblin/templates/mediagoblin/base.html:68 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "確認您的電子郵件" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 +msgid "log out" +msgstr "登出" + +#: mediagoblin/templates/mediagoblin/base.html:67 #: 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:87 -msgid "" -"Powered by MediaGoblin, a GNU project." -msgstr "基於 MediaGoblin — 一項 GNU 專案。" +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "%(user_name)s's account" +msgstr "%(user_name)s 的帳號" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "新增媒體" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "新增新的蒐藏" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "更改帳號設定" + +#: mediagoblin/templates/mediagoblin/base.html:96 +#: mediagoblin/templates/mediagoblin/base.html:102 +#: 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:121 +#, python-format +msgid "" +"Powered by MediaGoblin, a GNU project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the AGPL msgid "Image of goblin stressing out" msgstr "滿臉問號的哥布林" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "動作" - #: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "新增新的蒐藏" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "更改帳號設定" - -#: mediagoblin/templates/mediagoblin/root.html:38 -#: mediagoblin/templates/mediagoblin/root.html:44 -#: 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/root.html:51 msgid "Explore" msgstr "探索" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "嘿！歡迎來到 MediaGoblin 站台！ " -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "本站使用 MediaGoblin — 與眾不同的媒體分享網站。" -#: mediagoblin/templates/mediagoblin/root.html:56 +#: mediagoblin/templates/mediagoblin/root.html:36 msgid "" "To add your own media, place comments, and more, you can log in with your " "MediaGoblin account." msgstr "您可以登入您的 MediaGoblin 帳號以進行上傳媒體、張貼評論等等。" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "沒有帳號嗎？開帳號很簡單！" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "Create an account at this site\n" @@ -435,7 +490,7 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "在這個網站上建立帳號\n 或是\n 在自己的伺服器上建立 MediaGoblin" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "最新的媒體" @@ -541,6 +596,11 @@ msgid "" "%(verification_url)s" msgstr "%(username)s 您好：\n\n要啟動 GNU MediaGoblin 帳號，請在您的瀏覽器中打開下面的網址:\n\n%(verification_url)s" +#: 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 @@ -548,34 +608,50 @@ msgid "Editing attachments for %(media_title)s" msgstr "編輯 %(media_title)s 的附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:159 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:175 msgid "Attachments" msgstr "附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "新增附件" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:81 +#: 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:62 #: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:51 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:55 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40 msgid "Save changes" 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:47 +#: 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 @@ -588,13 +664,17 @@ msgstr "編輯 %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "正在改變 %(username)s 的帳號設定" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 +msgid "Delete my account" +msgstr "" + #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" msgstr "編輯 %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:34 #, python-format msgid "Editing %(username)s's profile" msgstr "編輯 %(username)s 的個人檔案" @@ -610,7 +690,7 @@ msgstr "此媒體被 tag 成：%(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "下載" @@ -633,7 +713,7 @@ msgid "" msgstr "您可以在 http://getfirefox.com 取得可以播放此聲音的瀏覽器！" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "原始檔案" @@ -645,8 +725,8 @@ msgstr "WebM 檔案 (Vorbis 編碼)" #: 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:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#: 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 " %(media_title)s 的照片" @@ -691,21 +771,21 @@ msgstr "檔案格式" msgid "Object Height" msgstr "物件高度" +#: mediagoblin/templates/mediagoblin/media_displays/video.html:37 +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:40 msgid "" -"Sorry, this video will not work because \n" -"\t your web browser does not support HTML5 \n" -"\t video." -msgstr "抱歉，此影片無法使用，因為您的瀏覽器不支援 HTML5 的影片." - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at \n" -"\t http://getfirefox.com!" -msgstr "您可以在 http://getfirefox.com 取得可以播放此影片的瀏覽器！" +" can play this video at \n" +" http://getfirefox.com!" +msgstr "" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM 檔案 (640p; VP8/Vorbis)" @@ -713,12 +793,6 @@ msgstr "WebM 檔案 (640p; VP8/Vorbis)" msgid "Add a collection" msgstr "新增蒐藏" -#: mediagoblin/templates/mediagoblin/submit/collection.html:30 -#: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -msgid "Add" -msgstr "增加" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -735,12 +809,12 @@ msgid "%(collection_title)s by %(username)s" msgstr "%(collection_title)s by %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:87 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:79 msgid "Edit" msgstr "編輯" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:91 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:83 msgid "Delete" msgstr "刪除" @@ -750,11 +824,6 @@ msgstr "刪除" msgid "Really delete %(title)s?" msgstr "真的要刪除 %(title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Delete permanently" -msgstr "永久刪除" - #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" @@ -764,6 +833,16 @@ msgstr "確定要從 %(collection_title)s 移除 %(media_title)s 嗎？" 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 "%(username)s's collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +855,53 @@ msgstr "%(username)s 您好：\n%(comment_author)s 在 %(instance_name)s 對您 msgid "%(username)s's media" msgstr "%(username)s的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"%(username)s's media with tag %(tag)s" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "%(username)s's media" msgstr "%(username)s 的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by %(username)s" msgstr "❖ 瀏覽 %(username)s 的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "新增評論" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use Markdown for" -" formatting." -msgstr "您可以用 Markdown 來排版。" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" msgstr "增加評論" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:132 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:123 msgid "at" msgstr "在" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:152 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:144 #, python-format msgid "" "

Added on

\n" "

%(date)s

" msgstr "

加入日期

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "將媒體加入蒐藏" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format -msgid "Add %(title)s to collection" -msgstr "新增 %(title)s 到蒐藏" +msgid "Add “%(media_title)s” to a collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "新增新的蒐藏" @@ -887,27 +963,31 @@ msgstr "如果您就是本人但是掉了認證信，您可以 OpenStreetMap" -msgstr "在 OpenStreetMap 上觀看" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "版權所有" @@ -969,49 +1045,64 @@ msgstr "更舊的" msgid "Tagged with" msgstr "標籤" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "無法讀取圖片檔案。" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:35 msgid "Oops!" msgstr "糟糕！" -#: mediagoblin/tools/response.py:31 +#: mediagoblin/tools/response.py:36 msgid "An error occured" msgstr "發生錯誤" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" msgstr "操作不允許" -#: mediagoblin/tools/response.py:47 +#: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!

You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Dave 對不起，我不能讓你這樣做！

您正在試著操作不允許您使用的功能。您打算刪除所有使用者的帳號嗎？" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!

If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "不好意思，看起來這個網址上沒有網頁。

如果您確定這個網址是正確的，您在尋找的頁面可能已經移動或是被刪除了。" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use Markdown for" +" formatting." +msgstr "您可以用 Markdown 來排版。" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "我確定我要刪除這個媒體" -#: mediagoblin/user_pages/forms.py:32 +#: 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:35 +#: mediagoblin/user_pages/forms.py:39 +msgid "Collection" +msgstr "" + +#: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" msgstr "— 請選擇 —" -#: mediagoblin/user_pages/forms.py:37 +#: mediagoblin/user_pages/forms.py:42 msgid "Include a note" msgstr "加註" @@ -1019,74 +1110,69 @@ msgstr "加註" msgid "commented on your post" msgstr "在您的內容張貼評論" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "啊，您的留言是空的。" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "您的留言已經張貼完成！" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:197 +msgid "Please check your entries and try again." +msgstr "請檢查項目並重試。" + +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "您需要選擇或是新增一個蒐藏" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "「%s」已經在「%s」蒐藏" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "「%s」加入「%s」蒐藏" -#: mediagoblin/user_pages/views.py:261 -msgid "Please check your entries and try again." -msgstr "請檢查項目並重試。" - -#: mediagoblin/user_pages/views.py:292 -msgid "" -"Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "在此項目中有些檔案好像不見了，已先行刪除。" - -#: mediagoblin/user_pages/views.py:297 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "您已經刪除此媒體。" -#: mediagoblin/user_pages/views.py:304 +#: mediagoblin/user_pages/views.py:293 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該媒體沒有被移除。" -#: mediagoblin/user_pages/views.py:312 +#: mediagoblin/user_pages/views.py:301 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:375 msgid "You deleted the item from the collection." msgstr "您已經從該蒐藏中刪除該項目。" -#: mediagoblin/user_pages/views.py:374 +#: mediagoblin/user_pages/views.py:379 msgid "The item was not removed because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該項目沒有被移除。" -#: mediagoblin/user_pages/views.py:384 +#: mediagoblin/user_pages/views.py:389 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您正在從別人的蒐藏中刪除項目，請小心操作。" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%s」蒐藏。" -#: mediagoblin/user_pages/views.py:424 +#: mediagoblin/user_pages/views.py:429 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該蒐藏沒有被移除。" -#: mediagoblin/user_pages/views.py:434 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您正在刪除別人的蒐藏，請小心操作。" diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 41fffa45..5c99ddff 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -16,9 +16,8 @@ import os import logging +import logging.config -from configobj import ConfigObj -from ConfigParser import RawConfigParser from celery.signals import setup_logging from mediagoblin import app, mg_globals @@ -36,49 +35,16 @@ def setup_logging_from_paste_ini(loglevel, **kw): else: logging_conf_file = 'paste.ini' + # allow users to set up explicitly which paste file to check via the + # PASTE_CONFIG environment variable + logging_conf_file = os.environ.get( + 'PASTE_CONFIG', logging_conf_file) + if not os.path.exists(logging_conf_file): raise IOError('{0} does not exist. Logging can not be set up.'.format( logging_conf_file)) - logging_conf = ConfigObj(logging_conf_file) - - config = logging_conf - - # Read raw config to avoid interpolation of formatting parameters - raw_config = RawConfigParser() - raw_config.readfp(open(logging_conf_file)) - - # Set up formatting - # Get the format string and circumvent configobj interpolation of the value - fmt = raw_config.get('formatter_generic', 'format') - - # Create the formatter - formatter = logging.Formatter(fmt) - - # Check for config values - if not config.get('loggers') or not config['loggers'].get('keys'): - print('No loggers found') - return - - # Iterate all teh loggers.keys values - for name in config['loggers']['keys'].split(','): - if not config.get('logger_{0}'.format(name)): - continue - - log_params = config['logger_{0}'.format(name)] - - qualname = log_params['qualname'] if 'qualname' in log_params else name - - if qualname == 'root': - qualname = None - - logger = logging.getLogger(qualname) - - level = getattr(logging, log_params['level']) - logger.setLevel(level) - - for handler in logger.handlers: - handler.setFormatter(formatter) + logging.config.fileConfig(logging_conf_file) setup_logging.connect(setup_logging_from_paste_ini) diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py index e5683168..ee8f5020 100644 --- a/mediagoblin/listings/routing.py +++ b/mediagoblin/listings/routing.py @@ -19,5 +19,11 @@ from mediagoblin.tools.routing import add_route add_route('mediagoblin.listings.tags_listing', "/tag//", "mediagoblin.listings.views:tag_listing") + +# Atom feeds: add_route('mediagoblin.listings.tag_atom_feed', "/tag//atom/", - "mediagoblin.listings.views:tag_atom_feed") + "mediagoblin.listings.views:atom_feed") + +# The all new entries feed +add_route('mediagoblin.listings.atom_feed', '/atom/', + "mediagoblin.listings.views:atom_feed") diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index d37161fc..35af7148 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -64,26 +64,30 @@ def tag_listing(request, page): ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15 -def tag_atom_feed(request): +def atom_feed(request): """ generates the atom feed with the tag images """ - tag_slug = request.matchdict[u'tag'] + tag_slug = request.matchdict.get(u'tag') + feed_title = "MediaGoblin Feed" + if tag_slug: + cursor = media_entries_for_tag_slug(request.db, tag_slug) + link = request.urlgen('mediagoblin.listings.tags_listing', + qualified=True, tag=tag_slug ) + feed_title += "for tag '%s'" % tag_slug + else: # all recent item feed + cursor = MediaEntry.query.filter_by(state=u'processed') + link = request.urlgen('index', qualified=True) + feed_title += "for all recent items" - cursor = media_entries_for_tag_slug(request.db, tag_slug) cursor = cursor.order_by(MediaEntry.created.desc()) cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) - """ - ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI) - """ feed = AtomFeed( - "MediaGoblin: Feed for tag '%s'" % tag_slug, + feed_title, feed_url=request.url, - id='tag:'+request.host+',2011:gallery.tag-%s' % tag_slug, - links=[{'href': request.urlgen( - 'mediagoblin.listings.tags_listing', - qualified=True, tag=tag_slug ), + id=link, + links=[{'href': link, 'rel': 'alternate', 'type': 'text/html'}]) for entry in cursor: diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py index 06763510..0abb38d3 100644 --- a/mediagoblin/media_types/__init__.py +++ b/mediagoblin/media_types/__init__.py @@ -49,7 +49,8 @@ def sniff_media(media): for media_type, manager in get_media_managers(): _log.info('Sniffing {0}'.format(media_type)) - if manager['sniff_handler'](media_file, media=media): + if 'sniff_handler' in manager and \ + manager['sniff_handler'](media_file, media=media): _log.info('{0} accepts the file'.format(media_type)) return media_type, manager else: diff --git a/mediagoblin/media_types/ascii/models.py b/mediagoblin/media_types/ascii/models.py index 3416993c..c7505292 100644 --- a/mediagoblin/media_types/ascii/models.py +++ b/mediagoblin/media_types/ascii/models.py @@ -32,7 +32,8 @@ class AsciiData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) DATA_MODEL = AsciiData diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py index 254717eb..382cd015 100644 --- a/mediagoblin/media_types/ascii/processing.py +++ b/mediagoblin/media_types/ascii/processing.py @@ -19,7 +19,6 @@ import Image import logging from mediagoblin import mg_globals as mgg -from mediagoblin.decorators import get_workbench from mediagoblin.processing import create_pub_filepath from mediagoblin.media_types.ascii import asciitoimage @@ -39,13 +38,14 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_ascii(entry, workbench=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. """ + 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( diff --git a/mediagoblin/media_types/audio/models.py b/mediagoblin/media_types/audio/models.py index 368ab1eb..d01367d5 100644 --- a/mediagoblin/media_types/audio/models.py +++ b/mediagoblin/media_types/audio/models.py @@ -32,7 +32,8 @@ class AudioData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) DATA_MODEL = AudioData diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py index e12cefe6..5dffcaf9 100644 --- a/mediagoblin/media_types/audio/processing.py +++ b/mediagoblin/media_types/audio/processing.py @@ -19,7 +19,6 @@ from tempfile import NamedTemporaryFile import os from mediagoblin import mg_globals as mgg -from mediagoblin.decorators import get_workbench from mediagoblin.processing import (create_pub_filepath, BadMediaFail, FilenameBuilder, ProgressCallback) @@ -43,13 +42,14 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_audio(entry, workbench=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. """ + 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 diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py index 63d80aa8..b2ea3960 100644 --- a/mediagoblin/media_types/image/models.py +++ b/mediagoblin/media_types/image/models.py @@ -33,7 +33,8 @@ class ImageData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) width = Column(Integer) height = Column(Integer) diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index e6a34ca0..ca88d3f4 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -19,7 +19,6 @@ import os import logging from mediagoblin import mg_globals as mgg -from mediagoblin.decorators import get_workbench from mediagoblin.processing import BadMediaFail, \ create_pub_filepath, FilenameBuilder from mediagoblin.tools.exif import exif_fix_image_orientation, \ @@ -28,6 +27,12 @@ from mediagoblin.tools.exif import exif_fix_image_orientation, \ _log = logging.getLogger(__name__) +PIL_FILTERS = { + 'NEAREST': Image.NEAREST, + 'BILINEAR': Image.BILINEAR, + 'BICUBIC': Image.BICUBIC, + 'ANTIALIAS': Image.ANTIALIAS} + def resize_image(entry, filename, new_path, exif_tags, workdir, new_size, size_limits=(0, 0)): @@ -47,7 +52,19 @@ def resize_image(entry, filename, new_path, exif_tags, workdir, new_size, except IOError: raise BadMediaFail() resized = exif_fix_image_orientation(resized, exif_tags) # Fix orientation - resized.thumbnail(new_size, Image.ANTIALIAS) + + filter_config = \ + mgg.global_config['media_type:mediagoblin.media_types.image']\ + ['resize_filter'] + + try: + resize_filter = PIL_FILTERS[filter_config.upper()] + except KeyError: + raise Exception('Filter "{0}" not found, choose one of {1}'.format( + unicode(filter_config), + u', '.join(PIL_FILTERS.keys()))) + + resized.thumbnail(new_size, resize_filter) # Copy the new file to the conversion subdir, then remotely. tmp_resized_filename = os.path.join(workdir, new_path[-1]) @@ -77,21 +94,21 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_image(entry, workbench=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. """ + 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_filepath = entry.queued_media_file - queued_filename = workbench.localized_file( - mgg.queue_store, queued_filepath, - 'source') + + queued_filename = proc_state.get_queued_filename() name_builder = FilenameBuilder(queued_filename) # EXIF extraction @@ -124,18 +141,14 @@ def process_image(entry, workbench=None): medium_filepath = None # Copy our queued local workbench to its final destination - original_filepath = create_pub_filepath( - entry, name_builder.fill('{basename}{ext}')) - mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) + proc_state.copy_original(name_builder.fill('{basename}{ext}')) # Remove queued media file from storage and database - mgg.queue_store.delete_file(queued_filepath) - entry.queued_media_file = [] + proc_state.delete_queue_file() # Insert media file information into database media_files_dict = entry.setdefault('media_files', {}) media_files_dict[u'thumb'] = thumb_filepath - media_files_dict[u'original'] = original_filepath if medium_filepath: media_files_dict[u'medium'] = medium_filepath diff --git a/mediagoblin/media_types/stl/models.py b/mediagoblin/media_types/stl/models.py index 17091f0e..ff50e9c0 100644 --- a/mediagoblin/media_types/stl/models.py +++ b/mediagoblin/media_types/stl/models.py @@ -32,7 +32,8 @@ class StlData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) center_x = Column(Float) center_y = Column(Float) diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 3089f295..77744ac5 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -21,7 +21,6 @@ import subprocess import pkg_resources from mediagoblin import mg_globals as mgg -from mediagoblin.decorators import get_workbench from mediagoblin.processing import create_pub_filepath, \ FilenameBuilder @@ -76,13 +75,15 @@ def blender_render(config): env=env) -@get_workbench -def process_stl(entry, workbench=None): +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. """ + 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') diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py index 645ef4d3..a771352c 100644 --- a/mediagoblin/media_types/video/models.py +++ b/mediagoblin/media_types/video/models.py @@ -32,7 +32,8 @@ class VideoData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, cascade="all, delete-orphan")) + backref=backref(BACKREF_NAME, uselist=False, + cascade="all, delete-orphan")) width = Column(SmallInteger) height = Column(SmallInteger) diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 53fe1a73..41929f3d 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -18,7 +18,6 @@ from tempfile import NamedTemporaryFile import logging from mediagoblin import mg_globals as mgg -from mediagoblin.decorators import get_workbench from mediagoblin.processing import \ create_pub_filepath, FilenameBuilder, BaseProcessingFail, ProgressCallback from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ @@ -54,8 +53,8 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_video(entry, workbench=None): + +def process_video(proc_state): """ Process a video entry, transcode the queued media files (originals) and create a thumbnail for the entry. @@ -63,12 +62,12 @@ def process_video(entry, workbench=None): 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 = workbench.localized_file( - mgg.queue_store, queued_filepath, - 'source') + queued_filename = proc_state.get_queued_filename() name_builder = FilenameBuilder(queued_filename) medium_filepath = create_pub_filepath( @@ -138,8 +137,7 @@ def process_video(entry, workbench=None): if video_config['keep_original']: # Push original file to public storage _log.debug('Saving original...') - original_filepath = create_pub_filepath(entry, queued_filepath[-1]) - mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) - entry.media_files['original'] = original_filepath + proc_state.copy_original(queued_filepath[-1]) - mgg.queue_store.delete_file(queued_filepath) + # Remove queued media file from storage and database + proc_state.delete_queue_file() diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index 8aa7121f..d8290d41 100644 --- a/mediagoblin/media_types/video/transcoders.py +++ b/mediagoblin/media_types/video/transcoders.py @@ -477,8 +477,8 @@ from playbin') _log.debug('thumbnail message: {0}'.format(message)) if message.type == gst.MESSAGE_ERROR: - _log.error('thumbnail error: {0}'.format(message)) - gobject.idle_add(self.on_thumbnail_error) + _log.error('thumbnail error: {0}'.format(message.parse_error())) + gobject.idle_add(self.on_thumbnail_error, message) if message.type == gst.MESSAGE_STATE_CHANGED: prev_state, cur_state, pending_state = \ @@ -570,10 +570,37 @@ pending: {2}'.format( return False - def on_thumbnail_error(self): - _log.error('Thumbnailing failed.') + def on_thumbnail_error(self, message): + scaling_failed = False + + if 'Error calculating the output scaled size - integer overflow' \ + in message.parse_error()[1]: + # GStreamer videoscale sometimes fails to calculate the dimensions + # given only one of the destination dimensions and the source + # dimensions. This is a workaround in case videoscale returns an + # error that indicates this has happened. + scaling_failed = True + _log.error('Thumbnailing failed because of videoscale integer' + ' overflow. Will retry with fallback.') + else: + _log.error('Thumbnailing failed: {0}'.format(message.parse_error())) + + # Kill the current mainloop self.disconnect() + if scaling_failed: + # Manually scale the destination dimensions + _log.info('Retrying with manually set sizes...') + + info = VideoTranscoder().discover(self.source_path) + + h = info['videoheight'] + w = info['videowidth'] + ratio = 180 / int(w) + h = int(h * ratio) + + self.__init__(self.source_path, self.dest_path, 180, h) + def disconnect(self): self.state = self.STATE_HALTING @@ -1009,4 +1036,4 @@ if __name__ == '__main__': print('I\'m a callback!') transcoder.transcode(*args, progress_callback=cb) elif options.action == 'discover': - print transcoder.discover(*args).__dict__ + print transcoder.discover(*args) diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index 8c7c64c2..e4b94bdc 100644 --- a/mediagoblin/mg_globals.py +++ b/mediagoblin/mg_globals.py @@ -42,8 +42,13 @@ workbench_manager = None # A thread-local scope thread_scope = threading.local() -# gettext (this will be populated on demand with gettext.Translations) -thread_scope.translations = None +# gettext (this needs to default to English so it doesn't break +# in case we're running a script without the app like +# ./bin/gmg theme assetlink) +thread_scope.translations = gettext.translation( + 'mediagoblin', + pkg_resources.resource_filename( + 'mediagoblin', 'i18n'), ['en'], fallback=True) # app and global config objects app_config = None diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py index e5878258..92411f4b 100644 --- a/mediagoblin/plugins/api/tools.py +++ b/mediagoblin/plugins/api/tools.py @@ -69,7 +69,8 @@ def json_response(serializable, _disable_cors=False, *args, **kw): 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS', 'Access-Control-Allow-Headers': 'Content-Type, X-Requested-With'} - (response.headers.set(key, value) for key, value in cors_headers) + for key, value in cors_headers.iteritems(): + response.headers.set(key, value) return response diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py new file mode 100644 index 00000000..5d14590e --- /dev/null +++ b/mediagoblin/plugins/geolocation/__init__.py @@ -0,0 +1,35 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from mediagoblin.tools import pluginapi +import os + +PLUGIN_DIR = os.path.dirname(__file__) + +def setup_plugin(): + config = pluginapi.get_config('mediagoblin.plugins.geolocation') + + # Register the template path. + pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) + + pluginapi.register_template_hooks( + {"image_sideinfo": "mediagoblin/plugins/geolocation/map.html", + "image_head": "mediagoblin/plugins/geolocation/map_js_head.html"}) + + +hooks = { + 'setup': setup_plugin + } diff --git a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html similarity index 95% rename from mediagoblin/templates/mediagoblin/utils/geolocation_map.html rename to mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html index b48678bb..70f837ff 100644 --- a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html +++ b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html @@ -17,8 +17,7 @@ #} {% block geolocation_map %} - {% if app_config['geolocation_map_visible'] - and media.media_data.gps_latitude is defined + {% if media.media_data.gps_latitude is defined and media.media_data.gps_latitude and media.media_data.gps_longitude is defined and media.media_data.gps_longitude %} diff --git a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map_js_head.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map_js_head.html new file mode 100644 index 00000000..aca0f730 --- /dev/null +++ b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map_js_head.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +#} + + + + + diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index e2bc1a13..f9445e28 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -74,6 +74,40 @@ class FilenameBuilder(object): ext=self.ext) +class ProcessingState(object): + def __init__(self, entry): + self.entry = entry + self.workbench = None + self.queued_filename = None + + def set_workbench(self, wb): + self.workbench = wb + + def get_queued_filename(self): + """ + Get the a filename for the original, on local storage + """ + 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"): + target_filepath = create_pub_filepath(self.entry, target_name) + mgg.public_store.copy_local_to_storage(self.get_queued_filename(), + target_filepath) + self.entry.media_files[keyname] = target_filepath + + def delete_queue_file(self): + queued_filepath = self.entry.queued_media_file + mgg.queue_store.delete_file(queued_filepath) + self.entry.queued_media_file = [] + + def mark_entry_failed(entry_id, exc): """ Mark a media entry as having failed in its conversion. diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index e9bbe084..aec50aab 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -22,7 +22,7 @@ from celery import registry, task from mediagoblin import mg_globals as mgg from mediagoblin.db.models import MediaEntry -from mediagoblin.processing import mark_entry_failed, BaseProcessingFail +from . import mark_entry_failed, BaseProcessingFail, ProcessingState from mediagoblin.tools.processing import json_processing_callback _log = logging.getLogger(__name__) @@ -85,8 +85,11 @@ class ProcessMedia(task.Task): _log.debug('Processing {0}'.format(entry)) - # run the processing code - entry.media_manager['processor'](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) # 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/css/base.css b/mediagoblin/static/css/base.css index 04b4ee28..8df9f2e1 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -132,9 +132,15 @@ header { } .header_dropdown li { + margin: 4px 0; list-style: none; } +.header_dropdown p { + margin-top: 12px; + margin-bottom: 10px; +} + .dropdown_title { font-size: 20px; } diff --git a/mediagoblin/static/images/icon_collect.png b/mediagoblin/static/images/icon_collect.png deleted file mode 100644 index 2911af24..00000000 Binary files a/mediagoblin/static/images/icon_collect.png and /dev/null differ diff --git a/mediagoblin/static/js/extlib/html5shiv.js b/mediagoblin/static/js/extlib/html5shiv.js deleted file mode 120000 index ca7358c7..00000000 --- a/mediagoblin/static/js/extlib/html5shiv.js +++ /dev/null @@ -1 +0,0 @@ -../../../../extlib/html5shiv/html5shiv.js \ No newline at end of file diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 98b32f4a..66b95661 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -27,27 +27,32 @@ href="{{ request.staticdirect('/css/base.css') }}"/> - + - - + {# For clarification, the difference between the extra_head.html template + # and the head template hook is that the former should be used by + # themes and the latter should be used by plugins. + # The reason is that only one thing can override extra_head.html... + # but multiple plugins can hook into the template hook. + #} {% include "mediagoblin/extra_head.html" %} + {% template_hook("head") %} {% block mediagoblin_head %} {% endblock mediagoblin_head %} + {% include 'mediagoblin/bits/body-start.html' %} {% block mediagoblin_body %} {% block mediagoblin_header %}

{%- include "mediagoblin/bits/logo.html" -%} {% block mediagoblin_header_title %}{% endblock %}
- {% if request.user %} + {%- if request.user %} {% if request.user and request.user.status == 'active' %}
▼
▲
@@ -59,11 +64,12 @@ {% trans %}Verify your email!{% endtrans %} or {% trans %}log out{% endtrans %} {% endif %} - {% else %} + {%- else %} - {% trans %}Log in{% endtrans %} - {% endif %} + {%- trans %}Log in{% endtrans -%} + + {%- endif %}
{% if request.user and request.user.status == 'active' %} @@ -76,53 +82,53 @@ {{ user_name }}'s account {%- endtrans %} - ({% trans %}log out{% endtrans %}) -

- {% endif %}
{% endblock %} -
-
+
+ {% include 'mediagoblin/bits/above-content.html' %} +
{% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} -
- {% block mediagoblin_footer %} +
+ {%- block mediagoblin_footer %}
{% trans -%} - Powered by MediaGoblin, a GNU project. + Powered by MediaGoblin, a GNU project. {%- endtrans %} {% trans source_link=app_config['source_link'] -%} Released under the AGPL. Source code available. {%- endtrans %}
- {% endblock mediagoblin_footer %} - {% endblock mediagoblin_body %} -
+ {%- endblock mediagoblin_footer %} +
+ {%- endblock mediagoblin_body %} + {% include 'mediagoblin/bits/body-end.html' %} diff --git a/mediagoblin/templates/mediagoblin/bits/above-content.html b/mediagoblin/templates/mediagoblin/bits/above-content.html new file mode 100644 index 00000000..bb7b9762 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/bits/above-content.html @@ -0,0 +1,17 @@ +{# +# 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 . +-#} diff --git a/mediagoblin/templates/mediagoblin/bits/body-end.html b/mediagoblin/templates/mediagoblin/bits/body-end.html new file mode 100644 index 00000000..bb7b9762 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/bits/body-end.html @@ -0,0 +1,17 @@ +{# +# 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 . +-#} diff --git a/mediagoblin/templates/mediagoblin/bits/body-start.html b/mediagoblin/templates/mediagoblin/bits/body-start.html new file mode 100644 index 00000000..bb7b9762 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/bits/body-start.html @@ -0,0 +1,17 @@ +{# +# 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 . +-#} diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html index 55d446de..3fbea3be 100644 --- a/mediagoblin/templates/mediagoblin/edit/attachments.html +++ b/mediagoblin/templates/mediagoblin/edit/attachments.html @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . #} -{% extends "mediagoblin/base.html" %} +{%- extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} @@ -28,13 +28,14 @@ {% block mediagoblin_content %}

- {% trans media_title=media.title -%} + {%- trans media_title=media.title -%} Editing attachments for {{ media_title }} - {%- endtrans %}

+ {%- endtrans -%} +
@@ -42,19 +43,19 @@ {% if media.attachment_files|count %}

{% trans %}Attachments{% endtrans %}

    - {% for attachment in media.attachment_files %} + {%- for attachment in media.attachment_files %}
  • {{- attachment.name -}}
    • - {% endfor %} + {%- endfor %}
{% endif %}

{% trans %}Add attachment{% endtrans %}

- {{ wtforms_util.render_divs(form) }} + {{- wtforms_util.render_divs(form) }}
{%- trans %}Cancel{% endtrans -%} diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 4b980301..3f508af4 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -45,11 +45,11 @@ {{ wtforms_util.render_field_div(form.new_password) }}

{{ form.wants_comment_notification }} - {{ form.wants_comment_notification.label }}

+ {{ wtforms_util.render_label(form.wants_comment_notification) }}

{{ form.license_preference }} - {{ form.license_preference.label }}

+ {{ wtforms_util.render_label(form.license_preference) }}

diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index 30c2a90d..158dd67f 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -18,5 +18,12 @@ {% extends 'mediagoblin/user_pages/media.html' %} +{% block mediagoblin_head %} + {{ super() }} + {% template_hook("image_head") %} +{% endblock mediagoblin_head %} + {% block mediagoblin_sidebar %} + {{ super() }} + {% template_hook("image_sideinfo") %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index 7d5ede8d..9eeb7c85 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -27,7 +27,9 @@ {%- endblock %} {% block mediagoblin_media %} -
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html index 447201cd..449cc3ce 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html @@ -42,7 +42,7 @@

{{ form.confirm }} - + {{ wtforms_util.render_label(form.confirm) }}

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index e234914f..f23bb156 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -34,16 +34,28 @@ {% block mediagoblin_content -%}

- {%- trans username=user.username, - user_url=request.urlgen( - 'mediagoblin.user_pages.user_home', - user=user.username) -%} - {{ username }}'s media - {%- endtrans %} + {% if tag %} + {%- trans username=user.username, + user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=user.username), + tag_url=request.urlgen( + 'mediagoblin.listings.tags_listing', + tag=tag) -%} + {{ username }}'s media with tag {{ tag }} + {%- endtrans %} + {% else %} + {%- trans username=user.username, + user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=user.username) -%} + {{ username }}'s media + {%- endtrans %} + {% endif %}

{{ object_gallery(request, media_entries, pagination) }} - + {% set feed_url = request.urlgen('mediagoblin.user_pages.atom_feed', user=user.username) %} {% include "mediagoblin/utils/feed_link.html" %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 7e184257..f151c577 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -15,7 +15,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . #} -{% extends "mediagoblin/base.html" %} +{%- extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% from "mediagoblin/utils/pagination.html" import render_pagination %} @@ -30,15 +30,7 @@ - {% if app_config['geolocation_map_visible'] %} - - - - - {% endif %} + {% template_hook("media_head") %} {% endblock mediagoblin_head %} {% block mediagoblin_content %} @@ -125,14 +117,14 @@
+ user=comment_author.username) }}"> {{- comment_author.username -}} {% trans %}at{% endtrans %} + comment=comment.id, + user=media.get_uploader.username, + media=media.slug_or_id) }}#comment"> {{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}} :
@@ -157,57 +149,45 @@ {% include "mediagoblin/utils/tags.html" %} {% endif %} - {% if media.collections %} - {% include "mediagoblin/utils/collections.html" %} - {% endif %} + {% include "mediagoblin/utils/collections.html" %} {% include "mediagoblin/utils/license.html" %} - {% include "mediagoblin/utils/geolocation_map.html" %} - {% include "mediagoblin/utils/exif.html" %} - {% if media.attachment_files|count %} + {%- if media.attachment_files|count %}

{% trans %}Attachments{% endtrans %}

    - {% for attachment in media.attachment_files %} + {%- for attachment in media.attachment_files %}
  • {{- attachment.name -}}
    • - {% endfor %} + {%- endfor %}
- {% endif %} - {% if app_config['allow_attachments'] + {%- endif %} + {%- if app_config['allow_attachments'] and request.user and (media.uploader == request.user.id or request.user.is_admin) %} - {% if not media.attachment_files|count %} + {%- if not media.attachment_files|count %}

{% trans %}Attachments{% endtrans %}

- {% endif %} + {%- endif %}

{% trans %}Add attachment{% endtrans %} + media_id=media.id) }}"> + {%- trans %}Add attachment{% endtrans -%} +

- {% endif %} + {%- endif %} - {% if request.user %} -

- - - -

- {% endif %} + {% template_hook("media_sideinfo") %} {% block mediagoblin_sidebar %} {% endblock %} +
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 4f35dfa3..b4c9671c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -24,17 +24,22 @@ src="{{ request.staticdirect('/js/collection_form_show.js') }}"> {% endblock %} -{% block mediagoblin_content %} +{% block title -%} + {% trans media_title=media.title -%} + Add “{{ media_title }}” to a collection + {%- endtrans %} — {{ super() }} +{%- endblock %} +{% block mediagoblin_content %}

- {%- trans title=media.title -%} - Add {{ title }} to collection - {%- endtrans %} + {%- trans media_title=media.title -%} + Add “{{ media_title }}” to a collection + {%- endtrans -%}

@@ -42,39 +47,20 @@

- -

- -

+ + {{- wtforms_util.render_label_p(form.collection) }}
{{ form.collection }} {% trans %}+{% endtrans %}
+

{% trans %}Add a new collection{% endtrans %}

-

{% trans %}Add a new collection{% endtrans %}

- -

- -

-
- {{ form.collection_title }} -
-

- -

-
- {{ form.collection_description }} -
- -
-

- -

-
- {{ form.note }} + {{- wtforms_util.render_field_div(form.collection_title) }} + {{- wtforms_util.render_field_div(form.collection_description) }}
+ {{- wtforms_util.render_field_div(form.note) }}
{# TODO: This isn't a button really... might do unexpected things :) #} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html index d2a5655e..1d7dcc17 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html @@ -40,7 +40,7 @@

{{ form.confirm }} - + {{ wtforms_util.render_label(form.confirm) }}

diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index 6cb5a342..69738e26 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -17,20 +17,28 @@ #} {% block collections_content -%} -

{% trans collected=media.collected %}In collections ({{ collected }}){% endtrans %}

-

- {% for collection in media.collections %} - {% if loop.last %} - {# the 'and' should only appear if there is more than one collections #} - {% if media.collections|length > 1 %} + {% if media.collections %} +

{% trans %}Collected in{% endtrans %}

+

+ {%- for collection in media.collections %} + {%- if not loop.first %} · - {% endif %} - {{ collection['title'] }} - {% elif loop.revindex == 2 %} - {{ collection['title'] }} - {% else %} - {{ collection['title'] }} · - {% endif %} - {% endfor %} -

+ {%- endif %} + + {{- collection.title }} ( + {{- collection.get_creator.username -}} + ) + {%- endfor %} +

+ {%- endif %} + {%- if request.user %} +

+ + {% trans %}Add to a collection{% endtrans %} + +

+ {%- endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index 0127035c..bb4bd1a5 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -26,16 +26,20 @@ · {% endif %} {{ tag['name'] }} + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }} {% elif loop.revindex == 2 %} {{ tag['name'] }} + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }} {% else %} {{ tag['name'] }} · + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }} + · {% endif %} {% endfor %}

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index 58ecb8e0..35b4aa04 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -16,11 +16,25 @@ # along with this program. If not, see . #} +{# Render the label for a field #} +{% macro render_label(field) %} + {%- if field.label.text -%} + + {%- endif -%} +{%- endmacro %} + +{# Render the label in a

for a field #} +{% macro render_label_p(field) %} + {%- if field.label.text %} +

+ {{- render_label(field) -}} +

+ {%- endif %} +{%- endmacro %} + {# Generically render a field #} {% macro render_field_div(field) %} - {% if field.label.text -%} -

- {%- endif %} + {{- render_label_p(field) }}
{{ field }} {%- if field.errors -%} @@ -28,7 +42,7 @@

{{ _(error) }}

{% endfor %} {%- endif %} - {% if field.description -%} + {%- if field.description %}

{{ _(field.description)|safe }}

{%- endif %}
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index f4409121..a59a319c 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -40,7 +40,6 @@ def test_bcrypt_check_password(): 'notthepassword', '$2a$12$PXU03zfrVCujBhVeICTwtOaHTUs5FFwsscvSSTJkqx/2RQ0Lhy/nO') - # Same thing, but with extra fake salt. assert not auth_lib.bcrypt_check_password( 'notthepassword', @@ -58,7 +57,6 @@ def test_bcrypt_gen_password_hash(): assert not auth_lib.bcrypt_check_password( 'notthepassword', hashed_pw) - # Same thing, extra salt. hashed_pw = auth_lib.bcrypt_gen_password_hash(pw, '3><7R45417') assert auth_lib.bcrypt_check_password( @@ -77,8 +75,7 @@ def test_register_views(test_app): test_app.get('/auth/register/') # Make sure it rendered with the appropriate template - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/auth/register.html') + assert 'mediagoblin/auth/register.html' in template.TEMPLATE_TEST_CONTEXT # Try to register without providing anything, should error # -------------------------------------------------------- @@ -137,8 +134,7 @@ def test_register_views(test_app): assert_equal( urlparse.urlsplit(response.location)[2], '/u/happygirl/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/user_pages/user.html') + assert 'mediagoblin/user_pages/user.html' in template.TEMPLATE_TEST_CONTEXT ## Make sure user is in place new_user = mg_globals.database.User.find_one( @@ -231,8 +227,7 @@ def test_register_views(test_app): assert_equal( urlparse.urlsplit(response.location)[2], '/auth/login/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/auth/login.html') + assert 'mediagoblin/auth/login.html' in template.TEMPLATE_TEST_CONTEXT ## Make sure link to change password is sent by email assert len(mail.EMAIL_TEST_INBOX) == 1 @@ -278,7 +273,7 @@ def test_register_views(test_app): ## Verify step 1 of password-change works -- can see form to change password template.clear_test_template_context() response = test_app.get("%s?%s" % (path, get_params)) - assert template.TEMPLATE_TEST_CONTEXT.has_key('mediagoblin/auth/change_fp.html') + assert 'mediagoblin/auth/change_fp.html' in template.TEMPLATE_TEST_CONTEXT ## Verify step 2.1 of password-change works -- report success to user template.clear_test_template_context() @@ -288,8 +283,7 @@ def test_register_views(test_app): 'password': 'iamveryveryhappy', 'token': parsed_get_params['token']}) response.follow() - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/auth/login.html') + assert 'mediagoblin/auth/login.html' in template.TEMPLATE_TEST_CONTEXT ## Verify step 2.2 of password-change works -- login w/ new password success template.clear_test_template_context() @@ -303,8 +297,7 @@ def test_register_views(test_app): assert_equal( urlparse.urlsplit(response.location)[2], '/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/root.html') + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT def test_authentication_views(): @@ -318,8 +311,7 @@ def test_authentication_views(): # Get login # --------- test_app.get('/auth/login/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/auth/login.html') + assert 'mediagoblin/auth/login.html' in template.TEMPLATE_TEST_CONTEXT # Failed login - blank form # ------------------------- @@ -383,8 +375,7 @@ def test_authentication_views(): assert_equal( urlparse.urlsplit(response.location)[2], '/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/root.html') + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT # Make sure user is in the session context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] @@ -401,13 +392,12 @@ def test_authentication_views(): assert_equal( urlparse.urlsplit(response.location)[2], '/') - assert template.TEMPLATE_TEST_CONTEXT.has_key( - 'mediagoblin/root.html') + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT # Make sure the user is not in the session context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] session = context['request'].session - assert session.has_key('user_id') == False + assert 'user_id' not in session # User is redirected to custom URL if POST['next'] is set # ------------------------------------------------------- @@ -420,4 +410,3 @@ def test_authentication_views(): assert_equal( urlparse.urlsplit(response.location)[2], '/u/chris/') - diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py index 7d8c65c1..b13adae6 100644 --- a/mediagoblin/tests/test_config.py +++ b/mediagoblin/tests/test_config.py @@ -36,7 +36,7 @@ def test_read_mediagoblin_config(): assert this_conf['carrotapp']['carrotcake'] == False assert this_conf['carrotapp']['num_carrots'] == 1 - assert not this_conf['carrotapp'].has_key('encouragement_phrase') + assert 'encouragement_phrase' not in this_conf['carrotapp'] assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == True # A good file diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index ae5d7e50..776affc6 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -16,9 +16,80 @@ from nose.tools import assert_equal -from mediagoblin.tests.tools import get_app +from mediagoblin.db.base import Session +from mediagoblin.db.models import User, MediaEntry, MediaComment +from mediagoblin.tests.tools import get_app, \ + fixture_add_user, fixture_media_entry + def test_404_for_non_existent(): test_app = get_app(dump_old_app=False) res = test_app.get('/does-not-exist/', expect_errors=True) assert_equal(res.status_int, 404) + + +def test_user_deletes_other_comments(): + user_a = fixture_add_user(u"chris_a") + user_b = fixture_add_user(u"chris_b") + + media_a = fixture_media_entry(uploader=user_a.id, save=False) + media_b = fixture_media_entry(uploader=user_b.id, save=False) + Session.add(media_a) + Session.add(media_b) + Session.flush() + + # Create all 4 possible comments: + for u_id in (user_a.id, user_b.id): + for m_id in (media_a.id, media_b.id): + cmt = MediaComment() + cmt.media_entry = m_id + cmt.author = u_id + cmt.content = u"Some Comment" + Session.add(cmt) + + Session.flush() + + usr_cnt1 = User.query.count() + med_cnt1 = MediaEntry.query.count() + cmt_cnt1 = MediaComment.query.count() + + User.query.get(user_a.id).delete(commit=False) + + usr_cnt2 = User.query.count() + med_cnt2 = MediaEntry.query.count() + cmt_cnt2 = MediaComment.query.count() + + # One user deleted + assert_equal(usr_cnt2, usr_cnt1 - 1) + # One media gone + assert_equal(med_cnt2, med_cnt1 - 1) + # Three of four comments gone. + assert_equal(cmt_cnt2, cmt_cnt1 - 3) + + User.query.get(user_b.id).delete() + + usr_cnt2 = User.query.count() + med_cnt2 = MediaEntry.query.count() + cmt_cnt2 = MediaComment.query.count() + + # All users gone + assert_equal(usr_cnt2, usr_cnt1 - 2) + # All media gone + assert_equal(med_cnt2, med_cnt1 - 2) + # All comments gone + assert_equal(cmt_cnt2, cmt_cnt1 - 4) + + +def test_media_deletes_broken_attachment(): + user_a = fixture_add_user(u"chris_a") + + media = fixture_media_entry(uploader=user_a.id, save=False) + media.attachment_files.append(dict( + name=u"some name", + filepath=[u"does", u"not", u"exist"], + )) + Session.add(media) + Session.flush() + + MediaEntry.query.get(media.id).delete() + User.query.get(user_a.id).delete() diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py new file mode 100644 index 00000000..7719bd97 --- /dev/null +++ b/mediagoblin/tests/test_modelmethods.py @@ -0,0 +1,147 @@ +# 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 . + +# Maybe not every model needs a test, but some models have special +# methods, and so it makes sense to test them here. + +from nose.tools import assert_equal + +from mediagoblin.db.base import Session +from mediagoblin.db.models import MediaEntry + +from mediagoblin.tests.tools import get_app, \ + fixture_add_user + +import mock + + +class FakeUUID(object): + hex = 'testtest-test-test-test-testtesttest' + +UUID_MOCK = mock.Mock(return_value=FakeUUID()) + + +class TestMediaEntrySlugs(object): + def setUp(self): + self.test_app = get_app(dump_old_app=True) + self.chris_user = fixture_add_user(u'chris') + self.emily_user = fixture_add_user(u'emily') + self.existing_entry = self._insert_media_entry_fixture( + title=u"Beware, I exist!", + slug=u"beware-i-exist") + + def _insert_media_entry_fixture(self, title=None, slug=None, this_id=None, + uploader=None, save=True): + entry = MediaEntry() + entry.title = title or u"Some title" + entry.slug = slug + entry.id = this_id + entry.uploader = uploader or self.chris_user.id + entry.media_type = u'image' + + if save: + entry.save() + + return entry + + def test_unique_slug_from_title(self): + entry = self._insert_media_entry_fixture(u"Totally unique slug!", save=False) + entry.generate_slug() + assert entry.slug == u'totally-unique-slug' + + def test_old_good_unique_slug(self): + entry = self._insert_media_entry_fixture( + u"A title here", u"a-different-slug-there", save=False) + entry.generate_slug() + assert entry.slug == u"a-different-slug-there" + + def test_old_weird_slug(self): + entry = self._insert_media_entry_fixture( + slug=u"wowee!!!!!", save=False) + entry.generate_slug() + assert entry.slug == u"wowee" + + def test_existing_slug_use_id(self): + entry = self._insert_media_entry_fixture( + u"Beware, I exist!!", this_id=9000, save=False) + entry.generate_slug() + assert entry.slug == u"beware-i-exist-9000" + + @mock.patch('uuid.uuid4', UUID_MOCK) + def test_existing_slug_cant_use_id(self): + # This one grabs the nine thousand slug + self._insert_media_entry_fixture( + slug=u"beware-i-exist-9000") + + entry = self._insert_media_entry_fixture( + u"Beware, I exist!!", this_id=9000, save=False) + entry.generate_slug() + assert entry.slug == u"beware-i-exist-test" + + @mock.patch('uuid.uuid4', UUID_MOCK) + def test_existing_slug_cant_use_id_extra_junk(self): + # This one grabs the nine thousand slug + self._insert_media_entry_fixture( + slug=u"beware-i-exist-9000") + + # This one grabs makes sure the annoyance doesn't stop + self._insert_media_entry_fixture( + slug=u"beware-i-exist-test") + + entry = self._insert_media_entry_fixture( + u"Beware, I exist!!", this_id=9000, save=False) + entry.generate_slug() + assert entry.slug == u"beware-i-exist-testtest" + + def test_garbage_slug(self): + """ + Titles that sound totally like Q*Bert shouldn't have slugs at + all. We'll just reference them by id. + + , + / \ (@!#?@!) + |\,/| ,-, / + | |#| ( ")~ + / \|/ \ L L + |\,/|\,/| + | |#, |#| + / \|/ \|/ \ + |\,/|\,/|\,/| + | |#| |#| |#| + / \|/ \|/ \|/ \ + |\,/|\,/|\,/|\,/| + | |#| |#| |#| |#| + \|/ \|/ \|/ \|/ + """ + qbert_entry = self._insert_media_entry_fixture( + u"@!#?@!", save=False) + qbert_entry.generate_slug() + assert qbert_entry.slug is None + + +def test_media_data_init(): + Session.rollback() + Session.remove() + media = MediaEntry() + media.media_type = u"mediagoblin.media_types.image" + assert media.media_data is None + media.media_data_init() + assert media.media_data is not None + obj_in_session = 0 + for obj in Session(): + obj_in_session += 1 + print repr(obj) + assert_equal(obj_in_session, 0) diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index 00f1ed3d..fc3d8c83 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -27,6 +27,7 @@ from pkg_resources import resource_filename from mediagoblin.tests.tools import get_app, \ fixture_add_user from mediagoblin import mg_globals +from mediagoblin.db.models import MediaEntry from mediagoblin.tools import template from mediagoblin.media_types.image import MEDIA_MANAGER as img_MEDIA_MANAGER @@ -40,6 +41,7 @@ EVIL_FILE = resource('evil') EVIL_JPG = resource('evil.jpg') EVIL_PNG = resource('evil.png') BIG_BLUE = resource('bigblue.png') +from .test_exif import GPS_JPG GOOD_TAG_STRING = u'yin,yang' BAD_TAG_STRING = unicode('rage,' + 'f' * 26 + 'u' * 26) @@ -122,7 +124,7 @@ class TestSubmission: self.check_normal_upload(u'Normal upload 2', GOOD_PNG) def check_media(self, request, find_data, count=None): - media = request.db.MediaEntry.find(find_data) + media = MediaEntry.find(find_data) if count is not None: assert_equal(media.count(), count) if count == 0: @@ -265,6 +267,11 @@ class TestSubmission: # ------------------------------------------- self.check_false_image(u'Malicious Upload 3', EVIL_PNG) + def test_media_data(self): + self.check_normal_upload(u"With GPS data", GPS_JPG) + media = self.check_media(None, {"title": u"With GPS data"}, 1) + assert_equal(media.media_data.gps_latitude, 59.336666666666666) + def test_processing(self): data = {'title': u'Big Blue'} response, request = self.do_post(data, *REQUEST_CONTEXT, do_follow=True, diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 18d4ec0c..cc4a7add 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -25,7 +25,7 @@ from paste.deploy import loadapp from webtest import TestApp from mediagoblin import mg_globals -from mediagoblin.db.models import User, Collection +from mediagoblin.db.models import User, MediaEntry, Collection from mediagoblin.tools import testing from mediagoblin.init.config import read_mediagoblin_config from mediagoblin.db.open import setup_connection_and_db_from_config @@ -228,6 +228,22 @@ def fixture_add_user(username=u'chris', password=u'toast', return test_user +def fixture_media_entry(title=u"Some title", slug=None, + uploader=None, save=True, gen_slug=True): + entry = MediaEntry() + entry.title = title + entry.slug = slug + entry.uploader = uploader or fixture_add_user().id + entry.media_type = u'image' + + if gen_slug: + entry.generate_slug() + if save: + entry.save() + + return entry + + def fixture_add_collection(name=u"My first Collection", user=None): if user is None: user = fixture_add_user() diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 4a1afb0f..15dffa79 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -14,7 +14,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from mediagoblin.tools.extlib.EXIF import process_file, Ratio +try: + from EXIF import process_file, Ratio +except ImportError: + from mediagoblin.tools.extlib.EXIF import process_file, Ratio + from mediagoblin.processing import BadMediaFail from mediagoblin.tools.translate import pass_to_ugettext as _ @@ -46,7 +50,7 @@ def exif_fix_image_orientation(im, exif_tags): Translate any EXIF orientation to raw orientation Cons: - - REDUCES IMAGE QUALITY by recompressig it + - REDUCES IMAGE QUALITY by recompressing it Pros: - Prevents neck pain @@ -58,7 +62,7 @@ def exif_fix_image_orientation(im, exif_tags): 6: 270, 8: 90} orientation = exif_tags['Image Orientation'].values[0] - if orientation in rotation_map.keys(): + if orientation in rotation_map: im = im.rotate( rotation_map[orientation]) @@ -69,16 +73,12 @@ def extract_exif(filename): """ Returns EXIF tags found in file at ``filename`` """ - exif_tags = {} - try: - image = open(filename) - exif_tags = process_file(image, details=False) + with file(filename) as image: + return process_file(image, details=False) except IOError: raise BadMediaFail(_('Could not read the image file.')) - return exif_tags - def clean_exif(exif): ''' @@ -92,12 +92,8 @@ def clean_exif(exif): 'JPEGThumbnail', 'Thumbnail JPEGInterchangeFormat'] - clean_exif = {} - - for key, value in exif.items(): - if not key in disabled_tags: - clean_exif[key] = _ifd_tag_to_dict(value) - return clean_exif + return dict((key, _ifd_tag_to_dict(value)) for (key, value) + in exif.iteritems() if key not in disabled_tags) def _ifd_tag_to_dict(tag): @@ -118,13 +114,8 @@ def _ifd_tag_to_dict(tag): data['printable'] = tag.printable.decode('utf8', 'replace') if type(tag.values) == list: - data['values'] = [] - for val in tag.values: - if isinstance(val, Ratio): - data['values'].append( - _ratio_to_list(val)) - else: - data['values'].append(val) + data['values'] = [_ratio_to_list(val) if isinstance(val, Ratio) else val + for val in tag.values] else: if isinstance(tag.values, str): # Force UTF-8, so that it fits into the DB @@ -140,12 +131,7 @@ def _ratio_to_list(ratio): def get_useful(tags): - useful = {} - for key, tag in tags.items(): - if key in USEFUL_TAGS: - useful[key] = tag - - return useful + return dict((key, tag) for (key, tag) in tags.iteritems() if key in USEFUL_TAGS) def get_gps_data(tags): @@ -162,7 +148,7 @@ def get_gps_data(tags): 'latitude': tags['GPS GPSLatitude'], 'longitude': tags['GPS GPSLongitude']} - for key, dat in dms_data.items(): + for key, dat in dms_data.iteritems(): gps_data[key] = ( lambda v: float(v[0].num) / float(v[0].den) \ diff --git a/mediagoblin/tools/files.py b/mediagoblin/tools/files.py index fd38f05e..848c86f2 100644 --- a/mediagoblin/tools/files.py +++ b/mediagoblin/tools/files.py @@ -37,7 +37,7 @@ def delete_media_files(media): mg_globals.public_store.delete_file( attachment['filepath']) except OSError: - no_such_files.append("/".join(attachment)) + no_such_files.append("/".join(attachment['filepath'])) if no_such_files: raise OSError(", ".join(no_such_files)) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 38ab631b..784bede9 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -83,6 +83,9 @@ class PluginManager(object): # list of registered template paths "template_paths": set(), + # list of template hooks + "template_hooks": {}, + # list of registered routes "routes": [], } @@ -131,6 +134,18 @@ class PluginManager(object): def get_routes(self): return tuple(self.routes) + def register_template_hooks(self, template_hooks): + for hook, templates in template_hooks.items(): + if isinstance(templates, (list, tuple)): + self.template_hooks.setdefault(hook, []).extend(list(templates)) + else: + # In this case, it's actually a single callable---not a + # list of callables. + self.template_hooks.setdefault(hook, []).append(templates) + + def get_template_hooks(self, hook_name): + return self.template_hooks.get(hook_name, []) + def register_routes(routes): """Registers one or more routes @@ -208,3 +223,52 @@ def get_config(key): return plugin_section.get(key, {}) +def register_template_hooks(template_hooks): + """ + Register a dict of template hooks. + + Takes template_hooks as an argument, which is a dictionary of + template hook names/keys to the templates they should provide. + (The value can either be a single template path or an iterable + of paths.) + + Example: + + .. code-block:: python + + {"media_sidebar": "/plugin/sidemess/mess_up_the_side.html", + "media_descriptionbox": ["/plugin/sidemess/even_more_mess.html", + "/plugin/sidemess/so_much_mess.html"]} + """ + PluginManager().register_template_hooks(template_hooks) + + +def get_hook_templates(hook_name): + """ + Get a list of hook templates for this hook_name. + + Note: for the most part, you access this via a template tag, not + this method directly, like so: + + .. code-block:: html+jinja + + {% template_hook "media_sidebar" %} + + ... which will include all templates for you, partly using this + method. + + However, this method is exposed to templates, and if you wish, you + can iterate over templates in a template hook manually like so: + + .. code-block:: html+jinja + + {% for template_path in get_hook_templates("media_sidebar") %} +
+ {% include template_path %} +
+ {% endfor %} + + Returns: + A list of strings representing template paths. + """ + return PluginManager().get_template_hooks(hook_name) diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py index f7311fac..bc67b96f 100644 --- a/mediagoblin/tools/request.py +++ b/mediagoblin/tools/request.py @@ -25,7 +25,7 @@ def setup_user_in_request(request): Examine a request and tack on a request.user parameter if that's appropriate. """ - if not request.session.has_key('user_id'): + if 'user_id' not in request.session: request.user = None return @@ -36,4 +36,3 @@ def setup_user_in_request(request): # this session. _log.warn("Killing session for user id %r", request.session['user_id']) request.session.invalidate() - diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index d9c6e654..74d811eb 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -15,14 +15,20 @@ # along with this program. If not, see . from math import ceil + import jinja2 +from jinja2.ext import Extension +from jinja2.nodes import Include, Const + from babel.localedata import exists from werkzeug.urls import url_quote_plus from mediagoblin import mg_globals from mediagoblin import messages +from mediagoblin import _version from mediagoblin.tools import common from mediagoblin.tools.translate import get_gettext_translation +from mediagoblin.tools.pluginapi import get_hook_templates from mediagoblin.meddleware.csrf import render_csrf_form_token @@ -40,7 +46,7 @@ def get_jinja_env(template_loader, locale): # If we have a jinja environment set up with this locale, just # return that one. - if SETUP_JINJA_ENVS.has_key(locale): + if locale in SETUP_JINJA_ENVS: return SETUP_JINJA_ENVS[locale] # jinja2.StrictUndefined will give exceptions on references @@ -48,7 +54,9 @@ def get_jinja_env(template_loader, locale): template_env = jinja2.Environment( loader=template_loader, autoescape=True, undefined=jinja2.StrictUndefined, - extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape']) + extensions=[ + 'jinja2.ext.i18n', 'jinja2.ext.autoescape', + TemplateHookExtension]) template_env.install_gettext_callables( mg_globals.thread_scope.translations.ugettext, @@ -61,9 +69,13 @@ def get_jinja_env(template_loader, locale): template_env.globals['fetch_messages'] = messages.fetch_messages template_env.globals['app_config'] = mg_globals.app_config template_env.globals['global_config'] = mg_globals.global_config + template_env.globals['version'] = _version.__version__ template_env.filters['urlencode'] = url_quote_plus + # allow for hooking up plugin templates + template_env.globals['get_hook_templates'] = get_hook_templates + if exists(locale): SETUP_JINJA_ENVS[locale] = template_env @@ -98,3 +110,30 @@ def render_template(request, template_path, context): def clear_test_template_context(): global TEMPLATE_TEST_CONTEXT TEMPLATE_TEST_CONTEXT = {} + + +class TemplateHookExtension(Extension): + """ + Easily loop through a bunch of templates from a template hook. + + Use: + {% template_hook("comment_extras") %} + + ... will include all templates hooked into the comment_extras section. + """ + + tags = set(["template_hook"]) + + def parse(self, parser): + includes = [] + expr = parser.parse_expression() + lineno = expr.lineno + hook_name = expr.args[0].value + + for template_name in get_hook_templates(hook_name): + includes.append( + parser.parse_import_context( + Include(Const(template_name), True, False, lineno=lineno), + True)) + + return includes diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index 96144538..1d37c4de 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -73,7 +73,7 @@ def get_locale_from_request(request): """ request_args = (request.args, request.form)[request.method=='POST'] - if request_args.has_key('lang'): + if 'lang' in request_args: # User explicitely demanded a language, normalize lower_uppercase target_lang = locale_to_lower_upper(request_args['lang']) diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py index 8604ad5f..d9179f9e 100644 --- a/mediagoblin/tools/url.py +++ b/mediagoblin/tools/url.py @@ -25,7 +25,7 @@ except ImportError: USING_TRANSLITCODEC = False -_punct_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+') +_punct_re = re.compile(r'[\t !"#:$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+') def slugify(text, delim=u'-'): diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py index c7398d84..e9746a6c 100644 --- a/mediagoblin/user_pages/forms.py +++ b/mediagoblin/user_pages/forms.py @@ -35,7 +35,9 @@ class ConfirmCollectionItemRemoveForm(wtforms.Form): _('I am sure I want to remove this item from the collection')) class MediaCollectForm(wtforms.Form): - collection = QuerySelectField(allow_blank=True, blank_text=_('-- Select --'), get_label='title',) + collection = QuerySelectField( + _('Collection'), + allow_blank=True, blank_text=_('-- Select --'), get_label='title',) note = wtforms.TextAreaField( _('Include a note'), [wtforms.validators.Optional()],) diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 2b228355..9cb665b5 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -40,12 +40,17 @@ add_route('mediagoblin.user_pages.media_home.view_comment', '/u//m//c//', 'mediagoblin.user_pages.views:media_home') +# User's tags gallery +add_route('mediagoblin.user_pages.user_tag_gallery', + '/u//tag//', + 'mediagoblin.user_pages.views:user_gallery') + add_route('mediagoblin.user_pages.atom_feed', '/u//atom/', 'mediagoblin.user_pages.views:atom_feed') add_route('mediagoblin.user_pages.media_collect', - '/u//m//collect/', + '/u//m//collect/', 'mediagoblin.user_pages.views:media_collect') add_route('mediagoblin.user_pages.collection_list', @@ -82,5 +87,5 @@ add_route('mediagoblin.edit.edit_media', 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', - '/u//m//attachments/', + '/u//m//attachments/', 'mediagoblin.edit.views:edit_attachments') diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index dea47fbf..69d7defb 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -18,8 +18,8 @@ import logging import datetime from mediagoblin import messages, mg_globals -from mediagoblin.db.models import (MediaEntry, Collection, CollectionItem, - User) +from mediagoblin.db.models import (MediaEntry, MediaTag, Collection, + CollectionItem, User) from mediagoblin.tools.response import render_to_response, render_404, redirect from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.pagination import Pagination @@ -81,10 +81,17 @@ def user_home(request, page): @uses_pagination def user_gallery(request, page, url_user=None): """'Gallery' of a User()""" + tag = request.matchdict.get('tag', None) cursor = MediaEntry.query.filter_by( uploader=url_user.id, state=u'processed').order_by(MediaEntry.created.desc()) + # Filter potentially by tag too: + if tag: + cursor = cursor.filter( + MediaEntry.tags_helper.any( + MediaTag.slug == request.matchdict['tag'])) + # Paginate gallery pagination = Pagination(page, cursor) media_entries = pagination() @@ -97,7 +104,7 @@ def user_gallery(request, page, url_user=None): return render_to_response( request, 'mediagoblin/user_pages/gallery.html', - {'user': url_user, + {'user': url_user, 'tag': tag, 'media_entries': media_entries, 'pagination': pagination}) @@ -173,7 +180,7 @@ def media_post_comment(request, media): return redirect(request, location=media.url_for_self(request.urlgen)) -@get_user_media_entry +@get_media_entry_by_id @require_active_login def media_collect(request, media): """Add media to collection submission""" @@ -204,11 +211,11 @@ def media_collect(request, media): title=request.form['collection_title']).first() if existing_collection: messages.add_message(request, messages.ERROR, - _('You already have a collection called "%s"!' - % collection.title)) + _('You already have a collection called "%s"!') + % existing_collection.title) return redirect(request, "mediagoblin.user_pages.media_home", - user=request.user.username, - media=media.id) + user=media.get_uploader.username, + media=media.slug_or_id) collection = Collection() collection.title = request.form['collection_title'] @@ -237,8 +244,8 @@ def media_collect(request, media): media_entry=media.id, collection=collection.id).first(): messages.add_message(request, messages.ERROR, - _('"%s" already in collection "%s"' - % (media.title, collection.title))) + _('"%s" already in collection "%s"') + % (media.title, collection.title)) else: # Add item to collection collection_item = request.db.CollectionItem() collection_item.collection = collection.id @@ -254,12 +261,12 @@ def media_collect(request, media): media.save() messages.add_message(request, messages.SUCCESS, - _('"%s" added to collection "%s"' - % (media.title, collection.title))) + _('"%s" added to collection "%s"') + % (media.title, collection.title)) return redirect(request, "mediagoblin.user_pages.media_home", user=media.get_uploader.username, - media=media.id) + media=media.slug_or_id) #TODO: Why does @user_may_delete_media not implicate @require_active_login? @@ -309,6 +316,9 @@ def user_collection(request, page, url_user=None): get_creator=url_user, slug=request.matchdict['collection']).first() + if not collection: + return render_404(request) + cursor = collection.get_collection_items() pagination = Pagination(page, cursor) @@ -515,6 +525,8 @@ def collection_atom_feed(request): collection = Collection.query.filter_by( creator=user.id, slug=request.matchdict['collection']).first() + if not collection: + return render_404(request) cursor = CollectionItem.query.filter_by( collection=collection.id) \ @@ -539,14 +551,16 @@ def collection_atom_feed(request): 'href': push_url}) feed = AtomFeed( - "MediaGoblin: Feed for %s's collection %s" % (request.matchdict['user'], collection.title), - feed_url=request.url, - id='tag:{host},{year}:collection.user-{user}.title-{title}'.format( - host=request.host, - year=datetime.datetime.today().strftime('%Y'), - user=request.matchdict['user'], - title=collection.title), - links=atomlinks) + "MediaGoblin: Feed for %s's collection %s" % + (request.matchdict['user'], collection.title), + feed_url=request.url, + id=u'tag:{host},{year}:gnu-mediagoblin.{user}.collection.{slug}'\ + .format( + host=request.host, + year=collection.created.strftime('%Y'), + user=request.matchdict['user'], + slug=collection.slug), + links=atomlinks) for item in cursor: entry = item.get_media_entry diff --git a/setup.py b/setup.py index 12284f26..9c295dc4 100644 --- a/setup.py +++ b/setup.py @@ -59,6 +59,7 @@ setup( 'Markdown', 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', + 'mock', ## This is optional! # 'translitcodec', ## For now we're expecting that users will install this from