From 7525cdf9eb1dcf8e19b340072247426d0fd570c0 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 9 Jan 2013 12:36:26 +0100 Subject: [PATCH 001/130] Disallow ":" as part of a media slug We might want to use "id:IDN" as a special case slug to point to a media's id. Signed-off-by: Sebastian Spaeth --- mediagoblin/tools/url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'-'): From 4ca0755ab63192b9a79c1152673bfeb19e45e8a1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 9 Jan 2013 12:38:08 +0100 Subject: [PATCH 002/130] Sanitize slug input on media edit Previously we allowed EVERYTHING, even slashes as slug when editing the media. Make sure we slugify the input to sanitize it. (+ string formdata is unicode, so there is no need to convert it) Signed-off-by: Sebastian Spaeth --- mediagoblin/edit/views.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index ece11df5..646a9e5b 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -32,6 +32,7 @@ from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.text import ( convert_to_tag_list_of_dicts, media_tags_as_string) +from mediagoblin.tools.url import slugify from mediagoblin.db.util import check_media_slug_used, check_collection_slug_used import mimetypes @@ -57,22 +58,20 @@ def edit_media(request, media): if request.method == 'POST' and form.validate(): # Make sure there isn't already a MediaEntry with such a slug # and userid. - slug_used = check_media_slug_used(media.uploader, request.form['slug'], - media.id) + slug = slugify(request.form['slug']) + slug_used = check_media_slug_used(media.uploader, slug, media.id) if slug_used: form.slug.errors.append( _(u'An entry with that slug already exists for this user.')) else: - media.title = unicode(request.form['title']) - media.description = unicode(request.form.get('description')) + media.title = request.form['title'] + media.description = request.form.get('description') media.tags = convert_to_tag_list_of_dicts( request.form.get('tags')) media.license = unicode(request.form.get('license', '')) or None - - media.slug = unicode(request.form['slug']) - + media.slug = slug media.save() return redirect(request, From 66d9f1b2a041eeb3dd592b807ad06c25acb746c7 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 9 Jan 2013 12:40:18 +0100 Subject: [PATCH 003/130] Make generate_slug assign a slug in any case generate_slug could assign "none" as slug. Make sure it assigns a unique slug in any case. We now try based on: a) existing slug values b) media.title c) media.id d) random garbage Signed-off-by: Sebastian Spaeth --- mediagoblin/db/mixin.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 001b7826..daeda8ce 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -56,15 +56,22 @@ class MediaEntryMixin(object): # (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) + elif self.title: + #assign slug based on title + self.slug = slugify(self.title) + elif self.id: + # Does the object already have an ID? (after adding to the session) + self.slug = unicode(self.id) + else: + # Everything else failed, just use random garbage + self.slug = unicode(uuid4())[1:4] - 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 + while check_media_slug_used(self.uploader, self.slug, self.id): + # add garbage till it's unique + self.slug = self.slug + unicode(uuid4())[1:4] @property def description_html(self): From 72bb46c7c81983817f5060d67c65663f911c4504 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 15 Jan 2013 14:34:13 -0600 Subject: [PATCH 004/130] Need to import uuid4 for generate_slug to totally work --- mediagoblin/db/mixin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index daeda8ce..d3d4da66 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. """ +from uuid import uuid4 + from werkzeug.utils import cached_property from mediagoblin import mg_globals From 88de830fcfb3fb02af4b2d71b82efaa8c83df665 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 15 Jan 2013 15:48:19 -0600 Subject: [PATCH 005/130] A revised algorithm for generating slugs. This one does not *force* slugs, but usually it will probably result in a niceish one. The end *result* of the algorithm will (presumably, I have not tested it) 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! --- mediagoblin/db/mixin.py | 58 +++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index d3d4da66..7cb530e4 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -54,6 +54,26 @@ class UserMixin(object): class MediaEntryMixin(object): def generate_slug(self): + """ + This one does not *force* slugs, but usually it will probably result + in a niceish one. + + The end *result* of the algorithm will (presumably, I have not tested + it) 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 @@ -61,19 +81,35 @@ class MediaEntryMixin(object): #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 + # assign slug based on title self.slug = slugify(self.title) - elif self.id: - # Does the object already have an ID? (after adding to the session) - self.slug = unicode(self.id) - else: - # Everything else failed, just use random garbage - self.slug = unicode(uuid4())[1:4] - - while check_media_slug_used(self.uploader, self.slug, self.id): - # add garbage till it's unique - self.slug = self.slug + unicode(uuid4())[1:4] + + # 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 = "%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 = self.slug + u'-' + while check_media_slug_used(self.uploader, self.slug, self.id): + self.slug = self.slug + unicode(uuid4())[1:4] @property def description_html(self): From 985871095e873aca1e160a7eea4ad97f4b80de18 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 15 Jan 2013 16:11:15 -0600 Subject: [PATCH 006/130] Simplifying string concatenation in generate_slug and fixing docstring - made the mistake of copying some commit message things into the docstring. Fixed. - elrond points out that += is nicer and we don't need u"" in this case since we're not concatenating a variable, we're concatenating a known ascii string. --- mediagoblin/db/mixin.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 7cb530e4..0e000324 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -55,11 +55,13 @@ 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 (presumably, I have not tested - it) result in these resolutions for these situations: + 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. @@ -99,7 +101,7 @@ class MediaEntryMixin(object): # Can we just append the object's id to the end? if self.id: - slug_with_id = "%s-%s" % (self.slug, 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 @@ -107,9 +109,9 @@ class MediaEntryMixin(object): # okay, still no success; # let's whack junk on there till it's unique. - self.slug = self.slug + u'-' + self.slug += '-' while check_media_slug_used(self.uploader, self.slug, self.id): - self.slug = self.slug + unicode(uuid4())[1:4] + self.slug += uuid4()[1:4] @property def description_html(self): From f2c0bf3e34f1b56908444fc11504bb0114d0e0a3 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 4 Dec 2012 16:38:46 +0100 Subject: [PATCH 007/130] Implement user's tag filtered gallery page tags used to be global, you could only browse media by tag for all users. This patch implements a view that allows us to browse only a user's tagged media. Signed-off-by: Sebastian Spaeth --- .../templates/mediagoblin/user_pages/gallery.html | 5 +++-- mediagoblin/user_pages/routing.py | 5 +++++ mediagoblin/user_pages/views.py | 13 ++++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index e234914f..097cec54 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -39,11 +39,12 @@ 'mediagoblin.user_pages.user_home', user=user.username) -%} {{ username }}'s media - {%- endtrans %} + {%- endtrans %}{% if tag %}{% trans %} with tag '{{tag}}'{% 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/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 2b228355..a8a2eba7 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -40,6 +40,11 @@ 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_gallery', + '/u//tag//', + 'mediagoblin.user_pages.views:user_gallery') + add_route('mediagoblin.user_pages.atom_feed', '/u//atom/', 'mediagoblin.user_pages.views:atom_feed') diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index dea47fbf..cd0f4644 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.name == 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}) From 0c871f81220b3d5c1700a0e4141eb7e52efc04e0 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 22 Jan 2013 22:28:19 +0100 Subject: [PATCH 008/130] Use inspect_table; default user license==None. Use inspect_table in the new migration. Makes code more readable, really. And make the default for the preferred license be None. This is a userspace thing, so we can even change the migration here. Changing the migration means, that people running the migration before this commit get a "" in User.license_preference, while people running the migration now get a None. Both values are okay. None has been designated as "Use the site's default". We're not actually having a site default right now. Which means no license is selected in the dropdown. While "" means "All rights reserved" being chosen by the user. Side note: Having no license being selected in the submit dropdown is as "worse" as before and does not really hurt much. MediaEntry.license==None means "All rights reserved" as does "" also do. --- mediagoblin/db/migrations.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 3f43c789..b25d577d 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -190,9 +190,8 @@ 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() From 7cd7db5af402f9ff9160d80da2852c9e6db60859 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 22 Jan 2013 17:55:55 +0100 Subject: [PATCH 009/130] Made the image sampling filter configurable - Changed the default to BICUBIC instead of previous ANTIALIAS --- mediagoblin/config_spec.ini | 4 ++++ mediagoblin/media_types/image/processing.py | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index bee67d46..ca06cc0a 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -86,6 +86,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 +resize_filter = string(default="BICUBIC") + [media_type:mediagoblin.media_types.video] # Should we keep the original file? keep_original = boolean(default=False) diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index e6a34ca0..f5fb9a72 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -47,7 +47,25 @@ 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) + + pil_filters = { + 'NEAREST': Image.NEAREST, + 'BILINEAR': Image.BILINEAR, + 'BICUBIC': Image.BICUBIC, + 'ANTIALIAS': 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]) From 124081040b37c665c69d20f7cb55a7a81f091f78 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 22 Jan 2013 22:54:10 +0100 Subject: [PATCH 010/130] Changed sampling filter default to AA --- mediagoblin/config_spec.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index ca06cc0a..50ce252e 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -87,8 +87,8 @@ max_width = integer(default=180) max_height = integer(default=180) [media_type:mediagoblin.media_types.image] -# One of BICUBIC, BILINEAR -resize_filter = string(default="BICUBIC") +# One of BICUBIC, BILINEAR, NEAREST, ANTIALIAS +resize_filter = string(default="ANTIALIAS") [media_type:mediagoblin.media_types.video] # Should we keep the original file? From d63cc34e7122a9d34fbc36967365ecfef6761f24 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 22 Jan 2013 23:02:06 +0100 Subject: [PATCH 011/130] Made pil_filters a PIL_FILTERS (global) --- mediagoblin/media_types/image/processing.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index f5fb9a72..99be848f 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -28,6 +28,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)): @@ -48,22 +54,16 @@ def resize_image(entry, filename, new_path, exif_tags, workdir, new_size, raise BadMediaFail() resized = exif_fix_image_orientation(resized, exif_tags) # Fix orientation - pil_filters = { - 'NEAREST': Image.NEAREST, - 'BILINEAR': Image.BILINEAR, - 'BICUBIC': Image.BICUBIC, - 'ANTIALIAS': Image.ANTIALIAS} - filter_config = \ mgg.global_config['media_type:mediagoblin.media_types.image']\ ['resize_filter'] try: - resize_filter = pil_filters[filter_config.upper()] + 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()))) + u', '.join(PIL_FILTERS.keys()))) resized.thumbnail(new_size, resize_filter) From 6194344bf9a27d580f21b061a6e4b7c3d17ec4a9 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 22 Jan 2013 22:00:41 +0100 Subject: [PATCH 012/130] Use better relationships to delete collections. When deleting a User, his/her collections can be deleted by sqlalchemy: Collections do not need any special code to be executed on deletion. --- mediagoblin/db/models.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 7e2cc7d2..de491e96 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -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: @@ -415,7 +413,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 +437,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")) From 266b42b3dc7697801f726875e1a734b9e4ba7dc9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 23 Jan 2013 15:15:22 -0600 Subject: [PATCH 013/130] Switching uuid4()[1:4] -> uuid4().hex[:4] .hex is what we need to access to get at the ascii (hex) version anyway. Also, not sure why the previous version grabbed starting at the index of 1... just grab the first characters instead. --- mediagoblin/db/mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 0e000324..c4c508a4 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -111,7 +111,7 @@ class MediaEntryMixin(object): # let's whack junk on there till it's unique. self.slug += '-' while check_media_slug_used(self.uploader, self.slug, self.id): - self.slug += uuid4()[1:4] + self.slug += uuid4().hex[:4] @property def description_html(self): From b0118957ff3304226f3500b4f5cfaecc41e9ee48 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 23 Jan 2013 16:40:39 -0600 Subject: [PATCH 014/130] We don't want any empty string slugs, so make "" -> None --- mediagoblin/db/mixin.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index c4c508a4..98414d72 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -89,6 +89,10 @@ class MediaEntryMixin(object): # 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 + # 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. From 394a4a37f7f71a6182d47cf7e6fcdf4fcccddd5d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 23 Jan 2013 16:47:30 -0600 Subject: [PATCH 015/130] require mock for the new uuid-mocking tests --- setup.py | 1 + 1 file changed, 1 insertion(+) 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 From a81082fcaf41666841f40b823ddcef0255aebbe3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 23 Jan 2013 16:49:54 -0600 Subject: [PATCH 016/130] New mediaentry slug tests now pass! - fixed some issues with "whacking uuid junk on the slug" - uuid4() -> uuid.uuid4() so that mock will work right - added all the tests! --- mediagoblin/db/mixin.py | 7 +- mediagoblin/tests/test_modelmethods.py | 130 +++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 mediagoblin/tests/test_modelmethods.py diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 98414d72..b69e7d51 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -27,7 +27,7 @@ These functions now live here and get "mixed in" into the real objects. """ -from uuid import uuid4 +import uuid from werkzeug.utils import cached_property @@ -113,9 +113,10 @@ class MediaEntryMixin(object): # okay, still no success; # let's whack junk on there till it's unique. - self.slug += '-' + self.slug += '-' + uuid.uuid4().hex[:4] + # keep going if necessary! while check_media_slug_used(self.uploader, self.slug, self.id): - self.slug += uuid4().hex[:4] + self.slug += uuid.uuid4().hex[:4] @property def description_html(self): diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py new file mode 100644 index 00000000..4f2df19b --- /dev/null +++ b/mediagoblin/tests/test_modelmethods.py @@ -0,0 +1,130 @@ +# 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 mediagoblin.db.models import MediaEntry + +from mediagoblin.tests.tools import get_test_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_test_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 From d5600aa75c4b82c6b307e9f638151315b8bc8156 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 25 Jan 2013 12:10:27 -0600 Subject: [PATCH 017/130] Fix reference of get_test_app->get_app in test_modelmethods (This changed in master while this test was being written; correcting post-merge.) --- mediagoblin/tests/test_modelmethods.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py index 4f2df19b..c1064d3a 100644 --- a/mediagoblin/tests/test_modelmethods.py +++ b/mediagoblin/tests/test_modelmethods.py @@ -20,7 +20,7 @@ from mediagoblin.db.models import MediaEntry -from mediagoblin.tests.tools import get_test_app, \ +from mediagoblin.tests.tools import get_app, \ fixture_add_user import mock @@ -34,7 +34,7 @@ UUID_MOCK = mock.Mock(return_value=FakeUUID()) class TestMediaEntrySlugs(object): def setUp(self): - self.test_app = get_test_app(dump_old_app=True) + 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( From 3a8b18f85b9affca46a433607d7d9ae723380b94 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Fri, 25 Jan 2013 21:43:49 +0100 Subject: [PATCH 018/130] Updated video apt-get to not use glob Also changed some literal blocks to code-blocks --- docs/source/siteadmin/media-types.rst | 34 ++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) 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 From 92c597ca1cd0d93df7246eb2f81f84bcb08673ce Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 26 Jan 2013 00:12:18 +0100 Subject: [PATCH 019/130] Allow doc string extraction and use for pluginapi. Allow us to extract docstrings from our sources using the sphinx.ext.autodoc module. First use: Extract some of the docs for the pluginapi and provide it in a new "Plugin API" section. --- docs/source/conf.py | 2 +- docs/source/index.rst | 1 + docs/source/pluginwriter/api.rst | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 docs/source/pluginwriter/api.rst diff --git a/docs/source/conf.py b/docs/source/conf.py index 4209acc8..8113e247 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,7 +26,7 @@ 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'] # Add any paths that contain templates here, relative to this directory. templates_path = ['source/_templates'] diff --git a/docs/source/index.rst b/docs/source/index.rst index ac8bd110..adaafb59 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -70,6 +70,7 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/foreward pluginwriter/quickstart + pluginwriter/api Indices and tables diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst new file mode 100644 index 00000000..206c8b0b --- /dev/null +++ b/docs/source/pluginwriter/api.rst @@ -0,0 +1,23 @@ +.. 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 From b238a95464fae821b9f83ad723eecf3fd43a52d2 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 26 Jan 2013 13:03:54 +0100 Subject: [PATCH 020/130] Add Trim whitespace plugin docs. Added the documentation (which was already present in plugindocs/) to the TOC, so it's getting build and linked. --- docs/source/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/index.rst b/docs/source/index.rst index adaafb59..24cde4e6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -58,6 +58,7 @@ Part 2: Core plugin documentation plugindocs/flatpagesfile plugindocs/sampleplugin plugindocs/oauth + plugindocs/trim_whitespace Part 3: Plugin Writer's Guide From 3214c653dd72605ecacfffe13d1972c2c88506c1 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 26 Jan 2013 19:20:18 +0100 Subject: [PATCH 021/130] Docs: Create new area for developers. We need some "Part" for developers. Currently, it's named "Part 4: Developer's Zone". But we should come up with a better name soon. Moved the codebase docs in there for starters. --- docs/source/{siteadmin => devel}/codebase.rst | 0 docs/source/index.rst | 12 +++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) rename docs/source/{siteadmin => devel}/codebase.rst (100%) 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 24cde4e6..576e7af9 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: @@ -74,6 +73,17 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/api +Part 4: Developer's Zone +======================== + +This chapter contains various information for developers. + +.. toctree:: + :maxdepth: 1 + + devel/codebase + + Indices and tables ================== From ae9f0aec381c7f04898f0dde3af322ec876b9651 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 26 Jan 2013 19:21:40 +0100 Subject: [PATCH 022/130] Docs: Add a database guide to the plugin docs. Plugin writers will often need to create new tables. So give them some hints, what they need to do and where they might find more info. --- docs/source/index.rst | 1 + docs/source/pluginwriter/database.rst | 111 ++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 docs/source/pluginwriter/database.rst diff --git a/docs/source/index.rst b/docs/source/index.rst index 576e7af9..abd891a0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -70,6 +70,7 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/foreward pluginwriter/quickstart + pluginwriter/database pluginwriter/api 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() From f8107ccccc83a7b2aea3adb6f2fe55c45371c080 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sun, 27 Jan 2013 22:10:47 +0100 Subject: [PATCH 023/130] *docs* intersphinx, exception monitoring --- docs/source/conf.py | 3 +- .../siteadmin/production-deployments.rst | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 8113e247..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 = ['sphinx.ext.autodoc'] +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/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 From e9b4e50007405d548572ad874bdf7d76f6668b27 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 29 Jan 2013 21:13:49 +0100 Subject: [PATCH 024/130] Failing testcase for issue 611. This currently fails (with foreign key constrain error): 1. Have user A and B. 2. User B creates media M. 3. User A post a comment on M. 4. User A deletes his own account. The test is a little bit wider. --- mediagoblin/tests/test_misc.py | 52 +++++++++++++++++++++++++++++++++- mediagoblin/tests/tools.py | 18 +++++++++++- 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index ae5d7e50..22a06898 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -16,9 +16,59 @@ from nose.tools import assert_equal -from mediagoblin.tests.tools import get_app +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) + media_b = fixture_media_entry(uploader=user_b.id) + + # 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" + cmt.save() + + usr_cnt1 = User.query.count() + med_cnt1 = MediaEntry.query.count() + cmt_cnt1 = MediaComment.query.count() + + User.query.get(user_a.id).delete() + + 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) 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() From ff68ca9fc2b329d1c2ec395abf50358845c4e5fc Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 29 Jan 2013 21:23:21 +0100 Subject: [PATCH 025/130] Fix issue 611: Proper (back)relationship on MediaComment. well, fix the relationship on the comments. --- mediagoblin/db/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index de491e96..101e7cee 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -393,7 +393,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): From 3f931680e361086508d24d357f3d4d44466164bf Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 29 Jan 2013 21:45:16 +0100 Subject: [PATCH 026/130] Improve runtime of one test. Do not commit so often. flushing is enough. --- mediagoblin/tests/test_misc.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index 22a06898..b48b8762 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -16,6 +16,7 @@ from nose.tools import assert_equal +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 @@ -31,8 +32,11 @@ 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) - media_b = fixture_media_entry(uploader=user_b.id) + 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): @@ -41,13 +45,15 @@ def test_user_deletes_other_comments(): cmt.media_entry = m_id cmt.author = u_id cmt.content = u"Some Comment" - cmt.save() + 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() + User.query.get(user_a.id).delete(commit=False) usr_cnt2 = User.query.count() med_cnt2 = MediaEntry.query.count() From 04453ccf422539a2f5752a83084cfac7a8c701ee Mon Sep 17 00:00:00 2001 From: Elrond Date: Wed, 30 Jan 2013 15:03:04 +0100 Subject: [PATCH 027/130] Better Py3 compat: d.has_key(k) -> k in d py3 does not have dict.has_key any more. You have to use "key in dict" instead. As that works in python2 as well, let's use that. Also some small bits of pep8. --- mediagoblin/tests/test_auth.py | 31 ++++++++++--------------------- mediagoblin/tests/test_config.py | 2 +- mediagoblin/tools/request.py | 3 +-- mediagoblin/tools/template.py | 2 +- mediagoblin/tools/translate.py | 2 +- 5 files changed, 14 insertions(+), 26 deletions(-) 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/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..6e01a7dd 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -40,7 +40,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 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']) From 1c2d01ae3ba421536d5775e5992393019714b856 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 25 Jan 2013 10:39:20 -0600 Subject: [PATCH 028/130] Very start of plugin hooks and openstreetmap pluginification - Added start of template hook code to pluginapi.py - Started to break openstreetmap into plugin; moved templates - Added plugin hooks in media and image media templates ... almost certainly, none of this works yet. :) --- .../mediagoblin/plugins/geolocation/map.html} | 0 .../mediagoblin/media_displays/image.html | 8 ++++++ .../mediagoblin/user_pages/media.html | 14 ++++------ mediagoblin/tools/pluginapi.py | 27 +++++++++++++++++++ 4 files changed, 40 insertions(+), 9 deletions(-) rename mediagoblin/{templates/mediagoblin/utils/geolocation_map.html => plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html} (100%) diff --git a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html similarity index 100% rename from mediagoblin/templates/mediagoblin/utils/geolocation_map.html rename to mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index 30c2a90d..b03cfc78 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -18,5 +18,13 @@ {% extends 'mediagoblin/user_pages/media.html' %} +{% from "/mediagoblin/utils/templatehooks.html" import template_hook %} + +{% block mediagoblin_head %} + {{ super() }} + {% template_hook "image_extrahead" %} +{% endblock mediagoblin_head %} + {% block mediagoblin_sidebar %} + {% template_hook "image_sideinfo" %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 7e184257..b18e0828 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -18,6 +18,7 @@ {% extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} +{% from "/mediagoblin/utils/templatehooks.html" import template_hook %} {% from "mediagoblin/utils/pagination.html" import render_pagination %} {% block title %}{{ media.title }} — {{ super() }}{% endblock %} @@ -30,15 +31,7 @@ - {% if app_config['geolocation_map_visible'] %} - - - - - {% endif %} + {% template_hook "media_extrahead" %} {% endblock mediagoblin_head %} {% block mediagoblin_content %} @@ -206,8 +199,11 @@

{% endif %} + {% template_hook "media_sideinfo" %} + {% block mediagoblin_sidebar %} {% endblock %} +
{% endblock %} diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 38ab631b..2b8e95f4 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,28 @@ class PluginManager(object): def get_routes(self): return tuple(self.routes) + def register_template_hooks(self, 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: + {"media_sidebar": "/plugin/sidemess/mess_up_the_side.html", + "media_descriptionbox": ["/plugin/sidemess/even_more_mess.html", + "/plugin/sidemess/so_much_mess.html"]} + """ + 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.hooks.setdefault(hook, []).append(templates) + def register_routes(routes): """Registers one or more routes @@ -208,3 +233,5 @@ def get_config(key): return plugin_section.get(key, {}) +def register_template_hooks(template_hooks): + PluginManager().register_template_hooks(template_hooks) From a3f811a6e8589fc4b47c9f3036ac1cf0c8b0e200 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 28 Jan 2013 11:58:38 -0600 Subject: [PATCH 029/130] Geolocation stuff, including including templates seems to be working-ish - I'm having trouble seeing if the geolocation stuff actually works, but plugins are included - including a list of template hooks works, however the macro to include them does not, so it's kinda verbose --- mediagoblin/plugins/geolocation/__init__.py | 35 +++++++++++++++++++ .../plugins/geolocation/map_js_head.html | 25 +++++++++++++ .../mediagoblin/media_displays/image.html | 12 +++++-- .../mediagoblin/user_pages/media.html | 6 ++-- .../mediagoblin/utils/templatehooks.html | 22 ++++++++++++ mediagoblin/tools/pluginapi.py | 9 ++++- mediagoblin/tools/template.py | 4 +++ 7 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 mediagoblin/plugins/geolocation/__init__.py create mode 100644 mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map_js_head.html create mode 100644 mediagoblin/templates/mediagoblin/utils/templatehooks.html diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py new file mode 100644 index 00000000..c55e1e6a --- /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_extrahead": "mediagoblin/plugins/geolocation/map_js_head.html"}) + + +hooks = { + 'setup': setup_plugin + } 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/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index b03cfc78..f27433bd 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -18,13 +18,19 @@ {% extends 'mediagoblin/user_pages/media.html' %} -{% from "/mediagoblin/utils/templatehooks.html" import template_hook %} +{% from "/mediagoblin/utils/templatehooks.html" import template_hook with context %} {% block mediagoblin_head %} {{ super() }} - {% template_hook "image_extrahead" %} + {% for template in get_hook_templates("image_extrahead") %} + {% include template %} + {% endfor %} + {# {{ template_hook("image_extrahead") }} #} {% endblock mediagoblin_head %} {% block mediagoblin_sidebar %} - {% template_hook "image_sideinfo" %} + {% for template in get_hook_templates("image_sideinfo") %} + {% include template %} + {% endfor %} + {# {{ template_hook("image_sideinfo") }} #} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index b18e0828..2e159be4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -31,7 +31,7 @@ - {% template_hook "media_extrahead" %} + {{ template_hook("media_extrahead") }} {% endblock mediagoblin_head %} {% block mediagoblin_content %} @@ -156,8 +156,6 @@ {% include "mediagoblin/utils/license.html" %} - {% include "mediagoblin/utils/geolocation_map.html" %} - {% include "mediagoblin/utils/exif.html" %} {% if media.attachment_files|count %} @@ -199,7 +197,7 @@

{% endif %} - {% template_hook "media_sideinfo" %} + {{ template_hook("media_sideinfo") }} {% block mediagoblin_sidebar %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/templatehooks.html b/mediagoblin/templates/mediagoblin/utils/templatehooks.html new file mode 100644 index 00000000..615ea635 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/utils/templatehooks.html @@ -0,0 +1,22 @@ +{# +# 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 . +#} +{% macro template_hook(hook_name) %} + {% for template in get_hook_templates(hook_name) %} + {% include template %} + {% endfor %} +{% endmacro %} diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 2b8e95f4..99b13ac7 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -154,7 +154,10 @@ class PluginManager(object): else: # In this case, it's actually a single callable---not a # list of callables. - self.hooks.setdefault(hook, []).append(templates) + 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): @@ -235,3 +238,7 @@ def get_config(key): def register_template_hooks(template_hooks): PluginManager().register_template_hooks(template_hooks) + + +def get_hook_templates(hook_name): + return PluginManager().get_template_hooks(hook_name) diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index 6e01a7dd..c76ce639 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -23,6 +23,7 @@ from mediagoblin import mg_globals from mediagoblin import messages 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 @@ -64,6 +65,9 @@ def get_jinja_env(template_loader, locale): 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 From e9c3384b84fd8735a07a730ef4bcf9f8c2bc350f Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 28 Jan 2013 12:07:30 -0600 Subject: [PATCH 030/130] Removing unused geolocation_map_visible variable and turning geolocation on in default config --- mediagoblin.ini | 4 +--- mediagoblin/config_spec.ini | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mediagoblin.ini b/mediagoblin.ini index aee48595..6325c8e0 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -27,9 +27,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 +40,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/config_spec.ini b/mediagoblin/config_spec.ini index 50ce252e..13840564 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/") From 927be5e8cafbf561ee6ff6a6d74ad566fa3402f0 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 28 Jan 2013 14:08:16 -0600 Subject: [PATCH 031/130] Move template hook over to a template_hook tag. Seems to work! :) --- .../mediagoblin/media_displays/image.html | 13 ++----- .../mediagoblin/user_pages/media.html | 5 +-- .../mediagoblin/utils/templatehooks.html | 22 ----------- mediagoblin/tools/template.py | 38 ++++++++++++++++++- 4 files changed, 42 insertions(+), 36 deletions(-) delete mode 100644 mediagoblin/templates/mediagoblin/utils/templatehooks.html diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index f27433bd..bc03c456 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -18,19 +18,12 @@ {% extends 'mediagoblin/user_pages/media.html' %} -{% from "/mediagoblin/utils/templatehooks.html" import template_hook with context %} - {% block mediagoblin_head %} {{ super() }} - {% for template in get_hook_templates("image_extrahead") %} - {% include template %} - {% endfor %} - {# {{ template_hook("image_extrahead") }} #} + {% template_hook("image_extrahead") %} {% endblock mediagoblin_head %} {% block mediagoblin_sidebar %} - {% for template in get_hook_templates("image_sideinfo") %} - {% include template %} - {% endfor %} - {# {{ template_hook("image_sideinfo") }} #} + {{ super() }} + {% template_hook("image_sideinfo") %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 2e159be4..1cc2a763 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -18,7 +18,6 @@ {% extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} -{% from "/mediagoblin/utils/templatehooks.html" import template_hook %} {% from "mediagoblin/utils/pagination.html" import render_pagination %} {% block title %}{{ media.title }} — {{ super() }}{% endblock %} @@ -31,7 +30,7 @@ - {{ template_hook("media_extrahead") }} + {% template_hook("media_extrahead") %} {% endblock mediagoblin_head %} {% block mediagoblin_content %} @@ -197,7 +196,7 @@

{% endif %} - {{ template_hook("media_sideinfo") }} + {% template_hook("media_sideinfo") %} {% block mediagoblin_sidebar %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/templatehooks.html b/mediagoblin/templates/mediagoblin/utils/templatehooks.html deleted file mode 100644 index 615ea635..00000000 --- a/mediagoblin/templates/mediagoblin/utils/templatehooks.html +++ /dev/null @@ -1,22 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -#} -{% macro template_hook(hook_name) %} - {% for template in get_hook_templates(hook_name) %} - {% include template %} - {% endfor %} -{% endmacro %} diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index c76ce639..f83c8228 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -15,7 +15,11 @@ # 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 @@ -49,7 +53,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, @@ -102,3 +108,33 @@ 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={"template_hook"} + + def __init__(self, environment): + super(TemplateHookExtension, self).__init__(environment) + + 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 From 46da25827faa4426b83ebc0ac3c522bcdf2758be Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 28 Jan 2013 14:41:01 -0600 Subject: [PATCH 032/130] No need for an __init__ at all in the TemplateHookExtension, really. --- mediagoblin/tools/template.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index f83c8228..5bd20505 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -120,10 +120,7 @@ class TemplateHookExtension(Extension): ... will include all templates hooked into the comment_extras section. """ - tags={"template_hook"} - - def __init__(self, environment): - super(TemplateHookExtension, self).__init__(environment) + tags = {"template_hook"} def parse(self, parser): includes = [] From 08f3966d543386ec2a8696edd40148b43d474e27 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 30 Jan 2013 13:22:06 -0600 Subject: [PATCH 033/130] Moved the docstring for the plugin template stuff from the class to module method --- mediagoblin/tools/pluginapi.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 99b13ac7..1f28690e 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -135,19 +135,6 @@ class PluginManager(object): return tuple(self.routes) def register_template_hooks(self, 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: - {"media_sidebar": "/plugin/sidemess/mess_up_the_side.html", - "media_descriptionbox": ["/plugin/sidemess/even_more_mess.html", - "/plugin/sidemess/so_much_mess.html"]} - """ for hook, templates in template_hooks.items(): if isinstance(templates, (list, tuple)): self.template_hooks.setdefault(hook, []).extend(list(templates)) @@ -237,8 +224,27 @@ def get_config(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: + {"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. + + Returns: + A list of strings representing template paths. + """ return PluginManager().get_template_hooks(hook_name) From f097cf648c6f9d322a78bfbf3a677488ff495915 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 30 Jan 2013 13:25:08 -0600 Subject: [PATCH 034/130] Improved documentation for get_hook_templates, noting the template tag --- mediagoblin/tools/pluginapi.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 1f28690e..5794bf63 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -244,7 +244,16 @@ 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: + + {% template_hook "media_sidebar" %} + + ... which will include all templates for you, partly using this + method. + Returns: A list of strings representing template paths. + """ return PluginManager().get_template_hooks(hook_name) From ec553298ff78646b0b91f9f2329448bfc690e3a9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 30 Jan 2013 13:27:05 -0600 Subject: [PATCH 035/130] Even better documentation for get_hook_templates! Tells how you *can* use it in templates if you really like. --- mediagoblin/tools/pluginapi.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 5794bf63..8321d73d 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -252,8 +252,16 @@ def get_hook_templates(hook_name): ... 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: + + {% 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) From 75621003af128969c322d11aff74ec0c425a9ff4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 30 Jan 2013 13:27:40 -0600 Subject: [PATCH 036/130] Added register_template_hooks and get_hook_templates to the plugin api auto module documentation. --- docs/source/pluginwriter/api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst index 206c8b0b..f700e161 100644 --- a/docs/source/pluginwriter/api.rst +++ b/docs/source/pluginwriter/api.rst @@ -20,4 +20,4 @@ Plugin API ----------------------- .. automodule:: mediagoblin.tools.pluginapi - :members: get_config, register_routes, register_template_path + :members: get_config, register_routes, register_template_path, register_template_hooks, get_hook_templates From 8a4d0dbc07c2243c5b5ce123ac1ffafb6bfb19cb Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 31 Jan 2013 12:33:50 -0600 Subject: [PATCH 037/130] Switching set syntax to python2.6 compatible --- mediagoblin/tools/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index 5bd20505..a58dd2ca 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -120,7 +120,7 @@ class TemplateHookExtension(Extension): ... will include all templates hooked into the comment_extras section. """ - tags = {"template_hook"} + tags = set(["template_hook"]) def parse(self, parser): includes = [] From cf41e7d7444fb9d19a777a4720d9b00684e6fe7b Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 31 Jan 2013 20:57:03 +0100 Subject: [PATCH 038/130] Improve formatting for hook template docs. --- docs/source/pluginwriter/api.rst | 3 ++- mediagoblin/tools/pluginapi.py | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst index f700e161..42dc3a3d 100644 --- a/docs/source/pluginwriter/api.rst +++ b/docs/source/pluginwriter/api.rst @@ -20,4 +20,5 @@ Plugin API ----------------------- .. automodule:: mediagoblin.tools.pluginapi - :members: get_config, register_routes, register_template_path, register_template_hooks, get_hook_templates + :members: get_config, register_routes, register_template_path, + register_template_hooks, get_hook_templates diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 8321d73d..784bede9 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -233,6 +233,9 @@ def register_template_hooks(template_hooks): 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"]} @@ -247,6 +250,8 @@ def get_hook_templates(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 @@ -255,9 +260,11 @@ def get_hook_templates(hook_name): 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 %" + {% include template_path %}
{% endfor %} From d728c636b987fa774948ffc122fd080153d8f906 Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 1 Feb 2013 19:57:39 +0100 Subject: [PATCH 039/130] Some tests for media_data, yeah! One in the submissions, that posts a jpg with gps data. One in the modelmethods to test some behaviours. The later test fails. Fixes coming up. --- mediagoblin/tests/test_modelmethods.py | 17 +++++++++++++++++ mediagoblin/tests/test_submission.py | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py index c1064d3a..7719bd97 100644 --- a/mediagoblin/tests/test_modelmethods.py +++ b/mediagoblin/tests/test_modelmethods.py @@ -17,7 +17,9 @@ # 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, \ @@ -128,3 +130,18 @@ class TestMediaEntrySlugs(object): 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, From 57f8d263e1773be7458f09f9b3f1b7571cb0e026 Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 1 Feb 2013 15:42:44 +0100 Subject: [PATCH 040/130] Rewrite media_data handling to use relationships Instead of doing query by hand, use the relationships on the models to find the media_data. Is is made possible by the BACKREF_NAME in each models.py, which lets us know the local attr to ask for. Also initialize the relationship attribute on new media_data instead of the media_id. Also do not add it to the session. This gives us: - This automatically initializes the other side of the relationship, which will allow later acces via that way. - If the media_data is too early in the session, when the (new) media_entry is not yet in there, this could get conflicts. Avoid those by not adding to session. - Uses cascading to commit media_data together with the media_entry. --- mediagoblin/db/models.py | 41 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 101e7cee..bdd957dd 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -20,7 +20,7 @@ TODO: indexes on foreignkeys, where useful. import logging import datetime -import sys +from collections import Sequence from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \ Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \ @@ -32,9 +32,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 @@ -165,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): @@ -195,40 +195,41 @@ 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() + r = getattr(self, self.media_data_ref, None) + if isinstance(r, Sequence): + assert len(r) < 2 + if r: + return r[0] + else: + return None + return r 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: + # No media data, so actually add a new one media_data = self.media_data_table( - media_entry=self.id, **kwargs) - session.add(media_data) - # Update old media data + # 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 + return import_component(self.media_type + '.models:DATA_MODEL') + + @memoized_property + def media_data_ref(self): + return import_component(self.media_type + '.models:BACKREF_NAME') def __repr__(self): safe_title = self.title.encode('ascii', 'replace') From 1f268deda4af36d9547effd890c11e6005d4877f Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 1 Feb 2013 15:52:17 +0100 Subject: [PATCH 041/130] Turn media.{backref_nam} from a list to a scalar. For all our media_types, let the backref on the media_entry be a scalar (there is only one media_data per media_entry) instead of a list with zero or one entry. The media_data toolchain on MediaEntry currently handles both transparently. --- mediagoblin/media_types/ascii/models.py | 3 ++- mediagoblin/media_types/audio/models.py | 3 ++- mediagoblin/media_types/image/models.py | 3 ++- mediagoblin/media_types/stl/models.py | 3 ++- mediagoblin/media_types/video/models.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) 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/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/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/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/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) From 139c6c099fdbf139d2441db0c1a774081394a47d Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 1 Feb 2013 16:33:53 +0100 Subject: [PATCH 042/130] Drop media_data_table property. Only when creating a new media_data row, we need the table. So load that locally in media_data_init(). --- mediagoblin/db/models.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index bdd957dd..c9bc3c11 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -213,9 +213,10 @@ class MediaEntry(Base, MediaEntryMixin): media_data = self.media_data if media_data is None: + # Get the correct table: + table = import_component(self.media_type + '.models:DATA_MODEL') # No media data, so actually add a new one - media_data = self.media_data_table( - **kwargs) + media_data = table(**kwargs) # Get the relationship set up. media_data.get_media_entry = self else: @@ -223,10 +224,6 @@ class MediaEntry(Base, MediaEntryMixin): for field, value in kwargs.iteritems(): setattr(media_data, field, value) - @memoized_property - def media_data_table(self): - return import_component(self.media_type + '.models:DATA_MODEL') - @memoized_property def media_data_ref(self): return import_component(self.media_type + '.models:BACKREF_NAME') From 485404a9c42b09f0fda38aeb8d1242f24ccfa143 Mon Sep 17 00:00:00 2001 From: Elrond Date: Fri, 1 Feb 2013 16:33:53 +0100 Subject: [PATCH 043/130] Drop backward compatibility for media_data backref. Now we only support media_type backrefs with uselist=False. --- mediagoblin/db/models.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index c9bc3c11..10e0c33f 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 -from collections import Sequence from sqlalchemy import Column, Integer, Unicode, UnicodeText, DateTime, \ Boolean, ForeignKey, UniqueConstraint, PrimaryKeyConstraint, \ @@ -197,14 +196,7 @@ class MediaEntry(Base, MediaEntryMixin): @property def media_data(self): - r = getattr(self, self.media_data_ref, None) - if isinstance(r, Sequence): - assert len(r) < 2 - if r: - return r[0] - else: - return None - return r + return getattr(self, self.media_data_ref) def media_data_init(self, **kwargs): """ From c9abf931cb34a26642049ad34593ad1a16ebfb6e Mon Sep 17 00:00:00 2001 From: Elrond Date: Sat, 2 Feb 2013 20:40:19 +0100 Subject: [PATCH 044/130] issue 615: config geolocation_map_visible gone. The template in the geolocation plugin still used the old config option. Just remove that. To enable it, you enable the plugin. No need for extra config. Tested by manwesulimo2004 (via IRC). --- .../templates/mediagoblin/plugins/geolocation/map.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html index b48678bb..70f837ff 100644 --- a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/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 %} From a2ec25e3d1f01a711b4371ec9cc9342fe310395b Mon Sep 17 00:00:00 2001 From: Elrond Date: Mon, 4 Feb 2013 14:17:00 +0100 Subject: [PATCH 045/130] Search for translation in all templates. We missed to search for translatable strings in our plugins and other things that might have templates. The search is now for **/templates/**.html. That should catch a lot more. --- babel.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.ini b/babel.ini index 1a8231f5..2c005c4c 100644 --- a/babel.ini +++ b/babel.ini @@ -1,7 +1,7 @@ # 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 From bee998d5fd1855edbfcc44b2383f5627a5be65eb Mon Sep 17 00:00:00 2001 From: Elrond Date: Mon, 4 Feb 2013 17:11:01 +0100 Subject: [PATCH 046/130] Issue 621: Extract strings from hooked templates. templates using the new hook system were not extracted properly. One needs to add the new extension to the extraction process as well. --- babel.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.ini b/babel.ini index 2c005c4c..1c5e54f0 100644 --- a/babel.ini +++ b/babel.ini @@ -4,7 +4,7 @@ [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) From b79a1fa9253c0e668044fcadaba926ce68584c51 Mon Sep 17 00:00:00 2001 From: Aleksej Date: Tue, 5 Feb 2013 00:07:47 +0400 Subject: [PATCH 047/130] Small changes to "Add to collection" string Add quotation marks and "a" ("a" was proposed by Elrond). --- mediagoblin/templates/mediagoblin/user_pages/media_collect.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 4f35dfa3..7fd4b7eb 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -33,7 +33,7 @@

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

From accb073e8ca9907b1fe88a775c8fe8632e0e2e7f Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 5 Feb 2013 16:25:19 +0100 Subject: [PATCH 048/130] Mark "Collection" for translation in media_collect. --- mediagoblin/user_pages/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()],) From 8c659fd95c6a1e2fa8f450447c52c9a1a8f39eb6 Mon Sep 17 00:00:00 2001 From: Elrond Date: Tue, 5 Feb 2013 16:50:35 +0100 Subject: [PATCH 049/130] Rename {{title}} to {{media_title}}. Rename a variable in a translated string to make it easier for translators to know what they're dealing with. And add a block. --- .../mediagoblin/user_pages/media_collect.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 7fd4b7eb..8cdb64fe 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') }}"></script> {% endblock %} -{% block mediagoblin_content %} +{% block title -%} + {% trans media_title=media.title -%} + Add “{{ media_title }}” to a collection + {%- endtrans %} — {{ super() }} +{%- endblock %} +{% block mediagoblin_content %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_collect', user=media.get_uploader.username, media=media.id) }}" method="POST" enctype="multipart/form-data"> <div class="form_box"> <h1> - {%- trans title=media.title -%} - Add “{{ title }}” to a collection - {%- endtrans %} + {%- trans media_title=media.title -%} + Add “{{ media_title }}” to a collection + {%- endtrans -%} </h1> <div style="text-align: center;" > From cd2def45fa76e60b1538e8987aaa375022683fe1 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 5 Feb 2013 15:12:27 -0600 Subject: [PATCH 050/130] Committing present MediaGoblin translations before pushing extracted messages --- .../i18n/de/LC_MESSAGES/mediagoblin.po | 21 +- .../i18n/ja/LC_MESSAGES/mediagoblin.po | 19 +- .../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 253 +++++++++--------- 3 files changed, 148 insertions(+), 145 deletions(-) diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index d3a56821..37893a09 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -6,6 +6,7 @@ # <benjamin@lebsanft.org>, 2011. # <cwebber@dustycloud.org>, 2011. # Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011-2012. +# Elrond <elrond+mediagoblin.org@samba-tng.org>, 2013. # <jakob.kramer@gmx.de>, 2011, 2012. # Jakob Kramer <jakob.kramer@gmx.de>, 2012. # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011. @@ -20,9 +21,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 <cwebber@dustycloud.org>\n" +"POT-Creation-Date: 2012-12-20 10:11-0600\n" +"PO-Revision-Date: 2013-02-05 12:39+0000\n" +"Last-Translator: Elrond <elrond+mediagoblin.org@samba-tng.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +227,7 @@ msgstr "Falsches Passwort" #: mediagoblin/user_pages/views.py:210 #, 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 msgid "A collection with that slug already exists for this user." @@ -342,7 +343,7 @@ msgstr "JAAA! Geschafft!" #: mediagoblin/submit/views.py:215 #, 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" @@ -737,12 +738,12 @@ 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 "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" +msgstr "%(collection_title)s von <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:87 @@ -1044,12 +1045,12 @@ 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\"" +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" +msgstr "»%s« zur Sammlung »%s« hinzugefügt" #: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." @@ -1089,7 +1090,7 @@ msgstr "Du bist dabei ein Objekt aus der Sammlung eines anderen Nutzers zu entfe #: mediagoblin/user_pages/views.py:417 #, 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 msgid "" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index abbf5b26..81515f47 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po @@ -4,13 +4,14 @@ # # Translators: # <averym@gmail.com>, 2011. +# <parlegon@gmail.com>, 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" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"POT-Creation-Date: 2012-12-20 10:11-0600\n" +"PO-Revision-Date: 2013-01-18 09:32+0000\n" +"Last-Translator: parlegon <parlegon@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -407,7 +408,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/root.html:53 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "" +msgstr "こんにちは、このMediaGoblinサイトへようこそ！" #: mediagoblin/templates/mediagoblin/root.html:55 msgid "" @@ -517,7 +518,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 @@ -610,7 +611,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Download" -msgstr "" +msgstr "ダウンロード" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -715,7 +716,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/submit/start.html:34 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 msgid "Add" -msgstr "" +msgstr "追加" #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 @@ -735,12 +736,12 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:87 msgid "Edit" -msgstr "" +msgstr "編集" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:56 #: mediagoblin/templates/mediagoblin/user_pages/media.html:91 msgid "Delete" -msgstr "" +msgstr "削除" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index 66a28516..6632d78f 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po @@ -5,13 +5,14 @@ # Translators: # <snd.noise@gmail.com>, 2011. # ufa <ufa@technotroll.org>, 2011. +# Vinicius SM <viniciussm@rocketmail.com>, 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" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"POT-Creation-Date: 2012-12-20 10:11-0600\n" +"PO-Revision-Date: 2013-01-26 16:38+0000\n" +"Last-Translator: Canopus <viniciussm@rocketmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Endereço de email" #: mediagoblin/auth/forms.py:51 msgid "Username or email" -msgstr "" +msgstr "Nome de usuário ou email" #: mediagoblin/auth/forms.py:58 msgid "Incorrect input" @@ -50,7 +51,7 @@ msgstr "Desculpe, um usuário com este nome já existe." #: mediagoblin/auth/views.py:79 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 msgid "" @@ -64,20 +65,20 @@ msgstr "A chave de verificação ou nome usuário estão incorretos." #: mediagoblin/auth/views.py:206 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 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 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 msgid "" "An email has been sent with instructions on how to change your password." -msgstr "" +msgstr "Um email foi enviado com instruções para trocar sua senha." #: mediagoblin/auth/views.py:273 msgid "" @@ -87,11 +88,11 @@ msgstr "Não foi possível enviar o email de recuperação de senha, pois seu no #: mediagoblin/auth/views.py:285 msgid "Couldn't find someone with that username or email." -msgstr "" +msgstr "Não foi possível encontrar alguém com este nome de usuário ou email." #: mediagoblin/auth/views.py:333 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/submit/forms.py:28 mediagoblin/submit/forms.py:47 @@ -110,7 +111,7 @@ msgid "" "You can use\n" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" " Markdown</a> for formatting." -msgstr "" +msgstr "Você pode usar\n<a href=\"http://daringfireball.net/projects/markdown/basics\">\nMarkdown</a> para formatação." #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 msgid "Tags" @@ -118,7 +119,7 @@ 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 msgid "Slug" @@ -132,12 +133,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 +150,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,30 +158,30 @@ 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 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 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 msgid "Description of this collection" -msgstr "" +msgstr "Descrição desta coleção" #: mediagoblin/edit/forms.py:92 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 msgid "An entry with that slug already exists for this user." @@ -193,7 +194,7 @@ msgstr "Você está editando a mídia de outro usuário. Tenha cuidado." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Você adicionou o anexo %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -201,11 +202,11 @@ msgstr "Você está editando um perfil de usuário. Tenha cuidado." #: mediagoblin/edit/views.py:197 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 "" +msgstr "As mudanças na conta foram salvas" #: mediagoblin/edit/views.py:251 msgid "Wrong password" @@ -215,15 +216,15 @@ msgstr "Senha errada" #: mediagoblin/user_pages/views.py:210 #, 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 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 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" @@ -240,39 +241,39 @@ msgstr "" #: 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/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 +283,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:41 msgid "Type" -msgstr "" +msgstr "Tipo" #: mediagoblin/plugins/oauth/forms.py:46 msgid "" @@ -296,7 +297,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:53 msgid "Redirect URI" -msgstr "" +msgstr "Redirecionar URI" #: mediagoblin/plugins/oauth/forms.py:55 msgid "" @@ -306,11 +307,11 @@ 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 msgid "The client {0} has been registered!" -msgstr "" +msgstr "O cliente {0} foi registrado!" #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." @@ -331,7 +332,7 @@ msgstr "Eba! Enviado!" #: mediagoblin/submit/views.py:215 #, python-format msgid "Collection \"%s\" added!" -msgstr "" +msgstr "Coleção \"%s\" adicionada!" #: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" @@ -340,11 +341,11 @@ msgstr "Logo MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "" +msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "sair" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -367,7 +368,7 @@ msgstr "Entrar" msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." -msgstr "" +msgstr "Fornecido pelo <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um projeto <a href=\"http://gnu.org/\">GNU</a>." #: mediagoblin/templates/mediagoblin/base.html:90 #, python-format @@ -375,7 +376,7 @@ msgid "" "Released under the <a " "href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a " "href=\"%(source_link)s\">Source code</a> available." -msgstr "" +msgstr "Lançado sob a <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\">Código fonte</a> disponível." #: mediagoblin/templates/mediagoblin/error.html:24 msgid "Image of goblin stressing out" @@ -383,15 +384,15 @@ msgstr "" #: mediagoblin/templates/mediagoblin/root.html:25 msgid "Actions" -msgstr "" +msgstr "Ações" #: mediagoblin/templates/mediagoblin/root.html:31 msgid "Create new collection" -msgstr "" +msgstr "Criar nova coleção" #: mediagoblin/templates/mediagoblin/root.html:34 msgid "Change account settings" -msgstr "" +msgstr "Mudas configurações da conta" #: mediagoblin/templates/mediagoblin/root.html:38 #: mediagoblin/templates/mediagoblin/root.html:44 @@ -408,19 +409,19 @@ msgstr "Explorar" #: mediagoblin/templates/mediagoblin/root.html:53 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "Olá, bemvindo ao site de MediaGoblin." +msgstr "Olá, bem-vindo ao site de MediaGoblin." #: mediagoblin/templates/mediagoblin/root.html:55 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." -msgstr "" +msgstr "Este site roda o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um programa excelente para hospedar, gerenciar e compartilhar mídia." #: mediagoblin/templates/mediagoblin/root.html:56 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 msgid "Don't have one yet? It's easy!" @@ -432,7 +433,7 @@ msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" " or\n" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" -msgstr "" +msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Criar uma conta neste site</a>\nou\n<a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Configurar MediaGoblin em seu próprio servidor</a>" #: mediagoblin/templates/mediagoblin/root.html:67 msgid "Most recent media" @@ -461,16 +462,16 @@ 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 @@ -544,18 +545,18 @@ msgstr "Olá %(username)s,\n\nPara ativar sua conta GNU MediaGoblin, visite este #: 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 msgid "Attachments" -msgstr "" +msgstr "Anexos" #: mediagoblin/templates/mediagoblin/edit/attachments.html:56 #: mediagoblin/templates/mediagoblin/user_pages/media.html:192 msgid "Add attachment" -msgstr "" +msgstr "Adicionar anexo" #: mediagoblin/templates/mediagoblin/edit/attachments.html:60 #: mediagoblin/templates/mediagoblin/edit/edit.html:41 @@ -585,12 +586,12 @@ 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_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 @@ -604,14 +605,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 msgid "Download" -msgstr "" +msgstr "Baixar" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 msgid "Original" @@ -622,23 +623,23 @@ 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á executar 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 <a href=\"http://getfirefox.com\">\n" "\t http://getfirefox.com</a>!" -msgstr "" +msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/video.html:56 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 @@ -652,86 +653,86 @@ msgstr "" #: 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:40 msgid "" "Sorry, this video will not work because \n" "\t your web browser does not support HTML5 \n" "\t video." -msgstr "" +msgstr "Desculpe, esse vídeo não irá rodar porque\n» seu navegador não oferece suporte a vídeos\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 <a href=\"http://getfirefox.com\">\n" "\t http://getfirefox.com</a>!" -msgstr "" +msgstr "Você pode obter um navegador moderno\n» capaz de reproduzir este vídeo em <a href=\"http://getfirefox.com\">\n» http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:59 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 "" +msgstr "Adicionar uma coleção" #: 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" #: 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 <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:87 @@ -752,28 +753,28 @@ 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 "" +msgstr "Deletar permanentemente" #: 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/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 "" +msgstr "Mídia de %(username)s's" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 #, python-format @@ -783,22 +784,22 @@ msgstr "Mídia de <a href=\"%(user_url)s\"> %(username)s </a> " #: mediagoblin/templates/mediagoblin/user_pages/media.html:46 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" -msgstr "" +msgstr "❖ Vendo mídia de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" -msgstr "" +msgstr "Adicionar um comentário" #: mediagoblin/templates/mediagoblin/user_pages/media.html:109 msgid "" "You can use <a " "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" " formatting." -msgstr "" +msgstr "Você pode usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para formatação." #: 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 msgid "at" @@ -809,24 +810,24 @@ msgstr "" msgid "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" -msgstr "" +msgstr "<h3>Adicionado em</h3>\n<p>%(date)s</p>" #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Adicionar mídia à coleção" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" -msgstr "" +msgstr "Adicionar %(title)s à coleção" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" -msgstr "" +msgstr "+" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" -msgstr "" +msgstr "Adicionar uma nova coleção" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" @@ -835,7 +836,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 +855,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 "" @@ -914,12 +915,12 @@ msgstr "Aparentemente não há nenhuma mídia aqui ainda..." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(apagar)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format msgid "In collections (%(collected)s)" -msgstr "" +msgstr "Nas coleções (%(collected)s)" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" @@ -931,16 +932,16 @@ msgstr "Atom feed" #: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 msgid "Location" -msgstr "" +msgstr "Localização" #: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 #, python-format msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" +msgstr "Ver no <a href=\"%(osm_url)s\">OpenStreetMap</a>" #: 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" @@ -966,11 +967,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" -msgstr "" +msgstr "Etiquetas" #: mediagoblin/tools/exif.py:78 msgid "Could not read the image file." -msgstr "" +msgstr "Não foi possível ler o arquivo de imagem." #: mediagoblin/tools/response.py:30 msgid "Oops!" @@ -978,33 +979,33 @@ msgstr "Oops" #: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Um erro ocorreu" #: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Operação não permitida" #: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Me desculpe Dave, não posso deixar você fazer isso!</p><p>Você tentou executar uma função sem autorização. Por acaso estava novamente tentando deletar todas as contas de usuários?" #: mediagoblin/tools/response.py:55 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "" +msgstr "Parece que não há uma página com este endereço. Desculpe!</p><p>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 msgid "I am sure I want to delete this" -msgstr "Eu tenho certeza de que quero pagar isso" +msgstr "Eu tenho certeza de que quero apagar isso" #: mediagoblin/user_pages/forms.py:32 msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "Tenho certeza que quero remover este item da coleção" #: mediagoblin/user_pages/forms.py:35 msgid "-- Select --" @@ -1012,15 +1013,15 @@ msgstr "" #: mediagoblin/user_pages/forms.py:37 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 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 msgid "Your comment has been posted!" @@ -1028,17 +1029,17 @@ msgstr "Seu comentário foi postado!" #: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" -msgstr "" +msgstr "Você deve selecionar ou adicionar uma coleção" #: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" -msgstr "" +msgstr "\"%s\" já está na coleção \"%s\"" #: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "" +msgstr "\"%s\" adicionado à coleção \"%s\"" #: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." @@ -1055,7 +1056,7 @@ msgstr "Você deletou a mídia." #: mediagoblin/user_pages/views.py:304 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 msgid "You are about to delete another user's media. Proceed with caution." @@ -1063,29 +1064,29 @@ msgstr "Você vai apagar uma mídia de outro usuário. Tenha cuidado." #: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." -msgstr "" +msgstr "Você deletou o item da coleção." #: mediagoblin/user_pages/views.py:374 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 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 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "Você deletou a coleção \"%s\"" #: mediagoblin/user_pages/views.py:424 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 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." From d9b59fc6e12aada327f84b1ac5532dc2af8af685 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 5 Feb 2013 15:13:44 -0600 Subject: [PATCH 051/130] Committing extracted and compiled translations --- .../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 22564 -> 24306 bytes .../i18n/ar/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 22314 -> 24006 bytes .../i18n/ca/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 21386 -> 23139 bytes .../i18n/da/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 22702 -> 22730 bytes .../i18n/en/LC_MESSAGES/mediagoblin.po | 488 +++++++++-------- .../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 22387 -> 23889 bytes .../i18n/eo/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 23107 -> 24554 bytes .../i18n/es/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 22210 -> 23952 bytes .../i18n/fa/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 23218 -> 24889 bytes .../i18n/fr/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 24165 -> 25760 bytes .../i18n/he/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 21386 -> 23128 bytes .../i18n/ia/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 23175 -> 24854 bytes .../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 22407 -> 24095 bytes .../i18n/it/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 21955 -> 22004 bytes .../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 23379 -> 25011 bytes .../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 21850 -> 23603 bytes .../i18n/nl/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 20935 -> 22707 bytes .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 22222 -> 23892 bytes .../i18n/pl/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 21560 -> 22102 bytes .../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 22885 -> 24388 bytes .../i18n/ro/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 28560 -> 29712 bytes .../i18n/ru/LC_MESSAGES/mediagoblin.po | 491 ++++++++++-------- .../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 22277 -> 23799 bytes .../i18n/sk/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 21566 -> 23308 bytes .../i18n/sl/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 22754 -> 24458 bytes .../i18n/sq/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 21482 -> 23224 bytes .../i18n/sr/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 21712 -> 23454 bytes .../i18n/sv/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 21628 -> 23370 bytes .../i18n/te/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 21426 -> 23168 bytes .../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 20709 -> 22496 bytes .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 489 +++++++++-------- 54 files changed, 7390 insertions(+), 5335 deletions(-) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo index d8d02dedf687d84ff1b6faa9efd627ec18d77c03..fce799a51b5c16fe7eb0d24679fc98740f78a570 100644 GIT binary patch delta 5611 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 delta 4200 zcmb`|d2m(b8OQPWWFZL%sR0up0S+NyX%fOsNlXGtAORwmMH)7PG?3&1w`PIl0=*Qt zES9ATOg(n0rEWtqwhA4{5nL);MdLW7!Y~8PNCk^*m6j@w)}d;@KhB-jnf9N~G?V0W z-uIk$d*0_g=aWNL+deDueoEX=4L|4j%i!-H-BkMb&$*t)450W&9E7)U6sGqwW*kn% zKKLl6;&YgYub_p;@D6+fFXBloz?YJZ$u}lqu5dAoinMPTvxOGpu!M5wonD7liZKb4 z`(iBGn2uS<qoxd*lbMN{NDVTE31Jd$!Zh5DdcHk+{~-2eeDfw3@!aUbB0P_knA+Qz zDOiJr_yVef3#g7i#vXVJHL(OnSMYjZCZ?bUF2vzD4b^TXDpKolAmf{#aj_Z?VgdT@ z@;a(V=3*W~e$6`mX#$U<25Lv$--B^@1T~@KI1o=_U%Y|+F_BSKKLoW!6ELDs`MFRB z)u_FyLFGaNY6aU+4WC18)lpQ)ucB7=8TP|LJY0k&s4ZKD>h}kziLFKEVz!|o{!AM2 z*Nt{6CgXn0#V>Fz4rTghu?=f+4Ws1Xc^r*BSeBBq42y9ghVe<%gnE-GO5QwVmy92^ zkQ&s&*QFDG^3QCiLVNZU($*YBt>8UWs4k*HejOF^o2U-E5hfOI`lBY|Lv7JaB!5jU zDgq%?WW%WbHlxPd8R0@5cAz?X6E%Tzs1SdSY8cNllsqY@&}E=jmdQVbv<%hp98|lS zXt@y;;gzVZ+K54X5!Eho7x7S%<e)-Wfm*>@)WAD%C+<Q;Actitv<0XYPvxJUYe20y zjOy=^Xnh-Mp#7*wbVmIhvgHwTii^42=x37$xEwXpw87r7E5lsMD^ZczjXpe#)%Z75 zZup6(R{CqyK(FBtJc53_h!ZiN%1O8aGj#r6=c0*<E+p?vWtO*sg;+&7jMMQ1Y9blg zoCLfNN8(3lWB;MvsTqSKD9^)LxDnUmS>%mp<_#lJaVy3%zPZN5_wWX4@20c-SbPxU za3LmQ02SgURL-nNh1x+I_n-zif${hyl0GJu+2}bN6R-r;emvej|FgKzgLU|AT#vKy zMXW@N%5t27cjFE$!?$n@CU7P<VL7hBPUP2A5U$C%3?IW+Fo6C%FL(Cm5r4)or>Ic& z-$J5fQiy9QmY`-HLUp(uNnG<PDq?4m^f5&&I|k>V`gs78a2aaFt5Ffz7<Fs({*HX& ze-AgFpyDITm@}vWeoKa_;|n+n^<EwaKIAQJmZOcEF%h3fnwx!i2X^2^Jc9h1-QV#% zgY2?N;_ao6oiD;g2^FsvdNaR?nsN6cF9%YPca2F!9m@h#j+CP&G822@VpMLdKqc`O z)br0o@9#ssu#TW2aT*oDNEa8{<6<^;E^ff7*oEp~Xt5W{yRir5@u(F}L#@0TIa#I- z({M8m$EQ(S(21#d3VDT?tGE{vST&J}m;+p>qpPR~KSsSU5=j7U#X#(aV=)EGQKw=K zYC`i-9WTLtxEZtY*=YS+sQxdZBK22P`!6w5=RbxNR`zFOf1H3ywgsrY+J+>q*^gS; z`$$`pFxLCpO+al~7`x*J)Wjae4159=@&nQO-{54*omkHJCYcOu!z#=rDgKVNl(We= zO=K&QCgvrijk$(I(F`r~UPLvhm0RPzh^3=)p#&8fKWgRQ$7Bqnwrm?lwBkKnXa$|9 zP`!%^`5#b8b{;j6PcaMa3Et_Lhyy4GP<y`#71~{>9C;Si-(JkbgQzX+LY=DX6NtYi zFo3s<vbq@6a1ttcs-iAH4YUN68$UvIybIN?4YlG9ROpYRw(2AX@e5SDx(e@`5JpAt zsfvh~<!7kSz*lf5eu|2~!xO!C`6I}?#vH(O{17#uz9fAi1=T(WHBd3e;q+*I6>85H zVhjEf+c7;tt!8=*3-QlL-^Q-=zFLcscZTV}YP^iKIQ~9wrEREz_u&vcgns-0)lc3O z?`zkJ8I)hcCOnH;P-GHMYXvK?3U}ai{1cLA#y8bVvgN21^q%IOhWV%tx8ewF$9ecJ zuE*hYLLQr6;X=HEy|8kI_u`q0J$3#MauLgo<EW6mjY_5ys1RR5CC%rkiFUu=JC;K* zpRyn0@rS4hZ9qNuG!Dj>qxD^=349hU$IsNqj{VQ%Vm3FXA<;FvaWP&;t*Gj|-q&sq zK1lg5xCy5at~L03%t8MwW4L8j;bZs?25<qL55hN4k-CU_(e<3e5oUao#f4rde$;v0 zjOwr*mG!6aalC=*=;68E*RBmyDL;=%co-A#ZB#@~Mm-a~e-5=Jm(gTqw`SUl>YWdJ zz3d)LUTL|tcP7RRtqTR4n_A8I`g;A@*~3G@P(xrus~u{#>zW%H0=FM<8hUSWzAEkK z7WK)soaEGq^JHqWvoG~%lHJ^52O1Xz8=PfnGu_i^*W#Qp18(-LYi?<wsU2)uwj$)r z7+C4PFtCs1d|jF4-Wrr|xs8K=Y?a&1i|x?TfW0`_5NNem1w%_I23zewQ>Z0uw*~@@ znni8EZVa}z2Ah_QwC##OLm<SZy{IX?YEgKk`$=YXOsw5K$(fOzXC=AovX90(zo^P` zJ4V!5Ze`AD%e|1B5aR^$$686wPpXGGog>#e@8svY{YUkUaq0_3y6pv9teypVzJk1h zQTC{kQeUxCGCKWVHNL`9-)MKy=x#CY#-cfv+pD<ne~4Ozv#r$cepUK&%b9r3hG^6V zIPv$M`9|d4ySLssoi^6pKCUa?y)-ey`Y+*IJ2_~%Uspb4xqGL)ZcVOgZVdcC!nbtl zv2TRWS(lx*yJbck5gg=xP!+b^?XwSC&V}5|&ixN0x^w5Pv;HHJSsn9zw*%?47xZ%v IEhx192}Q(aN&o-= diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po index 6bdfacc6..a29958e8 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "اسم المستخدم" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "كلمة السر" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "عنوان البريد الإلكتروني" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +178,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم." @@ -196,33 +218,41 @@ msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثن msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -238,15 +268,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "لِج" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "أضف وسائط" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "لوحة معالجة الوسائط" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "أحدث الوسائط" @@ -541,6 +595,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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 الشخصي" @@ -610,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 "" @@ -633,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 "" @@ -645,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 "" @@ -691,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -735,12 +808,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -764,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,51 +859,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "وسائط <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -887,27 +959,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..." @@ -923,22 +999,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -973,45 +1042,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "أنا متأكد من رغبتي بحذف هذا العمل" -#: mediagoblin/user_pages/forms.py: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 +1103,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "أنت على وشك حذف وسائط مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo index ae6216cfefec7055ec32d2acb0e96ce53576f610..062dafb90dc60449b606ccb50f031a4cc283677d 100644 GIT binary patch delta 5661 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 delta 4405 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 diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index 79f26e8f..e6233854 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nom d'usuari" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Contrasenya" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adreça electrònica" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +178,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Ja existeix una entrada amb aquest llimac per aquest usuari" @@ -196,33 +218,41 @@ msgstr "Esteu editant fitxers d'un altre usuari. Aneu amb compte." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Els detalls del compte s'han guardat" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Ja tens una col.lecció anomenada \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 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,15 +268,31 @@ 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.<br/>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 :(" msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Veure a <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID del client" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "Afegir" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és vàlid." @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Entra" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Tots els fitxers" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Modificar els ajustaments del compte" + +#: 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 "Quadre de processament de fitxers" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Alimentat per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un projecte <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "Alliberat segons la <a href=\"http://www.fsf.org/licensing/licenses/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 "Modificar els ajustaments del compte" - -#: 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 "Quadre de processament de fitxers" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hola, una benvinguda al MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "El lloc esta usant <a href=\"http://mediagoblin.org\">MediaGoblin</a>, una gran i extraordinària peça de software per allotjar mitjans." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crear un compte a aquest lloc</a> \no\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Preparar MediaGoblin al teu propi servidor</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Mitjans més recents" @@ -541,6 +595,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 +607,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +663,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 +689,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 +712,7 @@ msgid "" msgstr "Pots obtenir un navegador web modern que \n »podrà reproduir l'àudio, a <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Arxiu original" @@ -645,8 +724,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 +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 "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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Pots obtenir un navegador web modern que \n » podrà reproduir aquest vídeo, a <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +792,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 +808,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s per a <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +823,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 +832,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,51 +859,45 @@ msgstr "Mitjà de %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Navegant mitjà per a <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Pots usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> per donar format." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Afegit el</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "Afegir %(title)s a la col.lecció" +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: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 "Afegir una nova col.lecció" @@ -887,27 +959,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..." @@ -923,22 +999,15 @@ msgid "In collections (%(collected)s)" msgstr "A les col.leccions (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Veure a <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tots els drets reservats" @@ -973,45 +1042,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Pots usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 +1103,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:159 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +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:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Has esborrat el mitjà" -#: 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 mitjà no s'ha esborrat perque no has marcat que n'estiguessis segur." -#: 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 "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:365 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:369 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:379 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:412 #, 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:419 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:429 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 9d9955ce9062515df3b7f145231ed872af2abbce..2ee634c353bd8d36b75e0b4a3cddd8ab4e796022 100644 GIT binary patch delta 5610 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 K#V>D8@%<Y!VHuwQ delta 4231 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 diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index c0677f43..bc010dd0 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +178,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -196,33 +218,41 @@ msgstr "Du er ved at ændre en anden brugers' medier. Pas på." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Kontoindstillinger gemt" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 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,15 +268,31 @@ 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.<br/>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 :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Log ind" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Udforsk" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hey, velkommen til denne MediaGoblin side!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -541,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 logo" + #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format @@ -548,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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 "Redigerer %(username)s profil" @@ -610,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 "" @@ -633,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 "" @@ -645,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 "" @@ -691,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -735,12 +808,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -764,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,51 +859,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -887,27 +959,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..." @@ -923,22 +999,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -973,45 +1042,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1103,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo index 6374be42ed3d4f7767b64a127b33ebb772a9b98f..d6876a021908b16280b34bb4a06b041861ebc20e 100644 GIT binary patch delta 2053 zcmXxke@v8h9Ki7}2$vl{lu|$xd=7`Aboks6hkziWBq#*}3e{Xaa>sG&e&pSOg`*R< zrlo&G$69M?BS$}Gk?v}1Q&!oE>W@}!x>jacZv4^GW%Wl3tM|v}k$+yF&-b41_w)V9 z^qI6T&ZM25w<Rv6DRptZQfrh_DVI`f@q5%U)2&n!dT<Huw>*Yf<daBu^)@cXckn8H zhzzNws!T5+L#oVs`GyWP*h)TEtrDt)K=&xM5Iax??!!{_;xasJIf?T9S-cCsv-}Mm z<f_JOFU4%qYAnEJl<^<J4cL#n@a38WMG0=uunwE~^==H|oj8Wl@hIAH!fJm7>&V~4 zBD{*__@DKAd96~#<ZhI4JMknQz^%BF&N4x7f?y@VKFr5)loh^#Qg{|+rC*^;;1`sR z*Kh^?g9TVvZyu43733`_{r6!mj-d2^2J>(NrB32Cf+B)XP$u#du12-d?6?Luk$O-H z4&(ipMA@M$n2Eol9Nq6IJ9yJ-&ucKhE5L_occ9$0QGAj5YKkD8OVQY<RFEGwQ;qwh zrf~~i!KGN%q*NQ$BOTS#xC~1+n=9FXh2*{Hz{gQm{yfTrCXrI=J(LChfi~)^qGogE z4wNl(qHK)^rSLA4BX|r~;ZrEL{Z-7t6lUN@C<Q-7Iid?FxBh2z;1X7|96c!GbYT|t z)i8l{JR}V`j(6a3l#Wv<cViZ1f|pSW&sq6jDE<CL**QBmY#1A`7~e&C*54qfqUKR{ zuC|5!mz8xB9K`{YGrfVb1M?_nwfsJFC$^w`{~*f1L0p8-qHOU?n1RzM<D^ht*9;C| z&Nhw#<H$o%`K|1K6G2Dot*5J=L;g3Y&yZtRH!+M29Q+`@g|hOc+f7%YOvHt9xjHa_ zr?6kX+hJbrCvk*)0_FQf?dAfV?d*Ri4ed1S#N*h2*Kr!1T=ms>3D@C*2h3MciE_3( zP$oKxPv8v7$~-JvCLF;`{1#()8D#-o6kULiCal1V*)$BIhC?WYUqHD7Ggkg1${E|3 ztqfd?vZ75WXSxR$;(lC=2Qd%Fu?$b*di)&sVB&8ACZ&42*adtYIWF}la!*u!x0xTr zG4feFjBP#UO25WFay$P|qu6hG5v5?;Zlx+Qf-=z)=*Dx%!$_#>1S@E8_p;sCff|mY zyp9uCjwMt{$89LjXgg-%0LqG^C_8chZ8(N@Jc1rfqAD$mm1>69>+@>yh}Itormp2Y zQkrn-buO1v_vpI4v%}ft8xF(*k+5^C5%<+;ZrxSo)ZI?KT64MUs%k5A{_O2WEbi=y z8sS*bh)1GzT1zk*3467TzFSs=eBOZJkL(Qw!j+MzzbR&f_8QK3*e_Wl-NXJN!|!wU z_>55U1AVUY{MoYD`BU1+P*m$SLZRSL*sob_gMskKkl#1(@i~87nQh50UBxyl)ZF<= nJ=c{y)OSzvSZ;PI<bK~~{gzr=d%Ey;{KHOv#_hOu_dxppGlV?; delta 2000 zcmXZce@xV69Ki7p2&aJfD^Wni@4-M6Pwo!n#~}%ZiFP6ifv%JtcgK%9VBQZDa^9j@ zGe)_cvzoQl8f~@7kMT#=Y_;VqY0EV?T~=!?Z2j2GwKZ3>AMX#}ufx4Q&-490&+~bn z=kvX}nWV{?r0EB?`1K@_n`I(}BJz$)qzLEGiT7{^+T9|n(Pue?8MMcc;qnTuz}Ijd z-$SO9m&;8*My8VAaf$)<3Xvw-Uu~1P<P+ppiY&nz)QNXu0XAa}9<v-neSZR1;T6kU zXs7+F)m~a9vXu4)T#H*!=WoPn+=q|j^Hp(?{RH3Au^G4U^daoPG<+I$U<}jol+}L* zJ+u>;i(g_1{$f2}RU@*Fb{^`y)%Z60u@M(DSQGTd2{sTM#x*#My2G=m3s0f$^b%?U zU!V@WiFx=Vu0^ReuP7T!X*y8HAI4?ag*yHiuEdk5>%?Co$R)Uln#ku^j6b6eT)y3` zfqc{jkK#Uj2K9ulVJhB0y}GYaPw<Y_{}<|e|KSsuRwuF%gZL`z%Q!(YMN#~)NQeiU zs5t6J&f_C^4YM$_UStmzA_Ju#bI{gc?!>@s+B?vWhfp^#f|}47WGQ(Ab%WoajrApY zr<r*g>XBuk9!);#!gZ)u(2Dw%bfZ@Li<pTQFa_U5U2qchiatWE`Z=`Y16+ss>`LeH zU<T{UQ34(Kly=}SF2>WS1IJNoV+u9FtEdZKx7y#Kj{6Dq<o>`RETYoZ<LkHyKSXXp z=21`1zKiqMoz)VIVKeGo-9|ludDOdF^r(3frKs;WpibO|%Q1|4#G{yk=TYamfckY! zU^o7WZ{d@>&Cl@P-JE|t9aT;I#}mkJgG?jWE_ZMMi@5k+JcqjTe=IZhnu+9~7FQMa zVFLa79%^y>9-|KMBx>UKQ8$?7<@{R+D!d{G@HA?X+`>tHfl@EVE4Ued!#rHmY~F1- zYNA0rffHDb`D|Mg?!Z+11S5DAbpsw2U4%_>EAXNgO$!=$1a;w4s5LNQwLe3><GZL6 z+sRsYv=Q}Aci|H3#1+_!D{&Z$a10$dgGVs_JpoBc-9dhha2&ZNxsB9`*jvqZH$F@I zBEEoSZRSqj$3wL5VHo%DyQ*HsLVd4YWGl9!COV34d=vQ~;&Ovv;Yd5o%*xT=1t03y zF^VOa%qq!PiuxIC#SGkwy5n}#6X`@71~DB&Sc%6`3W_2HhA$8Z28`&S;U5gm-p%YR z=ycY2T-6R|rPG<-vfptqIMf&E8ys*n`l3OP;dZ**4*uLu!?n%hswj2xFWu{lL>+Bm z-#{efiw=f8hW~i5t1B2bwp&4cAQp)Z`$L1VK;i@E-z5u6kHo@8tFOO56dUL<7J7R7 z21a5%!R}8l_e2-cOZ?zkpQ?`}F<rYlQMRma_Br<@TZ(qgHq=aKo6-FPJt<}sXzxz` EA7<Sd6951J diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index 3ac01f5a..617d998d 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 <EMAIL@ADDRESS>, 2012. +# FIRST AUTHOR <EMAIL@ADDRESS>, 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-05 15:12-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a " @@ -117,11 +131,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 "" @@ -160,26 +174,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -192,33 +214,41 @@ msgstr "" msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -234,15 +264,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, " "an extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an " @@ -438,7 +492,7 @@ msgid "" "your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -543,6 +597,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 +609,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +665,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 +691,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 +714,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 +726,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 +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 "" - -#: mediagoblin/templates/mediagoblin/media_displays/video.html:43 -msgid "" "You can get a modern web browser that \n" -"\t can play this video at <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +794,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 +810,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +825,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 +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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -784,51 +862,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> " -"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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -888,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..." @@ -924,22 +1000,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -974,45 +1043,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're " "sure the address is correct, maybe the page you're looking for has been " "moved or deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> " +"for formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1104,70 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo index 28500ceb5c8ea9993f433a8a92644b5df615b139..59ac47baac06bf00c49e68d3884d5b239e920156 100644 GIT binary patch delta 5646 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 GzP|yb-!EYR delta 4602 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 diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index 3b1dce48..edef9c22 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,82 +21,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Uzantnomo" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Pasvorto" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Retpoŝtadreso" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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 +119,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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" @@ -121,11 +135,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,26 +178,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto." @@ -196,33 +218,41 @@ msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Kontagordoj estis konservitaj" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Vi jam havas kolekton kun la nomo «%s»!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vi redaktas kolekton de alia uzanto. Agu singardeme." @@ -238,15 +268,31 @@ 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.<br/>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 :(" msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Vidi sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "Aldoni" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoŝtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Ensaluti" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Aldoni dosieron" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Ŝanĝi kontagordojn" + +#: 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 "Kontrolejo pri dosierpreparado." + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, unu el la <a href=\"http://gnu.org/\">projektoj de GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "Disponigita laŭ la permesilo <a href=\"http://www.fsf.org/licensing/lic 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 "Ŝanĝi kontagordojn" - -#: 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 "Kontrolejo pri dosierpreparado." - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Ĉirkaŭrigardi" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Saluton, kaj bonvenon al ĉi tiu MediaGoblina retpaĝaro!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ĉi tiu retpaĝaro funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eksterordinare bonega programaro por gastigado de aŭd‐vid‐dosieroj." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Kreu konton en ĉi tiu retejo</a>\n aŭ\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">ekfunkciigu MediaGoblin’on en via propra servilo</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Laste aldonitaj dosieroj" @@ -541,6 +595,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 +607,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +663,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 +689,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 +712,7 @@ msgid "" msgstr "Vi povas akiri modernan TTT-legilon, kapablan \n\tsonigi la registraĵon ĉe <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "originalan dosieron" @@ -645,8 +724,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 +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 "Bedaŭrinde ĉi tiu filmo ne spekteblas, ĉar\n<span class=\"whitespace other\" title=\"Tab\">»</span> via TTT-legilo ne subtenas montradon\n<span class=\"whitespace other\" title=\"Tab\">»</span> 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Vi povas akiri modernan TTT-legilon,\n<span class=\"whitespace other\" title=\"Tab\">»</span> kapablan montri ĉi tiun filmon, ĉe <a href=\"http://getfirefox.com\">\n<span class=\"whitespace other\" title=\"Tab\">»</span> http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +792,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 +808,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +823,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 +832,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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,51 +859,45 @@ msgstr "Dosieroj de %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a>" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Vi povas uzi por markado la lingvon «<a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>»." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Aldonita je</h3>\n <p>la %(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "Aldoni novan kolekton" @@ -887,27 +959,31 @@ msgstr "Se vi estas tiu sed vi perdis vian kontrolmesaĝon, vi povas <a href=\"% msgid "Here's a spot to tell others about yourself." msgstr "Jen estas spaceto por rakonti pri vi al aliaj." -#: mediagoblin/templates/mediagoblin/user_pages/user.html: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 "Redakti profilon" -#: 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 "Ĉi tiu uzanto ne jam aldonis informojn pri si." -#: 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 "Rigardi ĉiujn dosierojn 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 "Ĝuste ĉi tie aperos viaj dosieroj, sed vi ŝajne ankoraŭ nenion alŝutis." -#: 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..." @@ -923,22 +999,15 @@ msgid "In collections (%(collected)s)" msgstr "En %(collected)s kolekto(j)" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" msgstr "flusimbolo" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Atom-a informfluo" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25 -msgid "Location" -msgstr "Loko" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Vidi sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Ĉiuj rajtoj estas rezervitaj" @@ -973,45 +1042,60 @@ msgstr "Markita per" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Vi povas uzi por markado la lingvon «<a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>»." + +#: 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 +1103,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:159 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Via komento estis afiŝita!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: 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 "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:294 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:365 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:369 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:379 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:412 #, 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:419 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:429 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 98dbebdd7e6fb0131e1c6e14479a4e1455e294ab..8b7b729097d3c44864026f63c66c9b5ebea8a25d 100644 GIT binary patch delta 5653 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 delta 4579 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 Tol7gLV(jWQInJ&%D~<mFgY4<R diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index e1249591..00f765ad 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: @@ -18,8 +18,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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:11+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" @@ -29,82 +29,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 "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: 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 "" + +#: 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 "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 +127,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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" @@ -129,11 +143,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 +186,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 "" + +#: 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 "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 +226,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 "" + +#: 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 "" + +#: 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 +276,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.<br/>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 :(" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID del Cliente" @@ -317,10 +363,25 @@ msgstr "La URI para redireccionar las aplicaciones, este campo es <strong>requer msgid "This field is required for public clients" msgstr "Este campo es requerido para los clientes públicos" -#: mediagoblin/plugins/oauth/views.py: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 "" + +#: 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: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 +390,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!" -#: 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Cuenta de <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Cuenta de <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html: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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Proveído por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proyecto <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -390,52 +465,31 @@ msgstr "Publicado bajo la <a href=\"http://www.fsf.org/licensing/licenses/agpl-3 msgid "Image of goblin stressing out" msgstr "Imagen de un goblin estresándose" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Acciones" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Crear nueva colección" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Cambiar la configuración de la cuenta" - -#: 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 "Panel de procesamiento de contenido" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Este sitio está montado con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un extraordinario programa libre para alojar, gestionar y compartir contenido multimedia." -#: mediagoblin/templates/mediagoblin/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 "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -443,7 +497,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea una cuenta en este sitio</a>\n o\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instala Mediagoblin en tu propio servidor</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "El contenido más reciente" @@ -549,6 +603,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 +615,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 "" + +#: 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 "Eliminar permanentemente" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -596,13 +671,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 "" + #: 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 +697,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 +720,7 @@ msgid "" msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el audio <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Archivo original" @@ -653,8 +732,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 +778,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 "" + #: 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<span class=\"whitespace other\" title=\"Tab\">»</span> Tu navegador web no soporta HTML5\n<span class=\"whitespace other\" title=\"Tab\">»</span> 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Tú puedes conseguir un navegador web moderno que\n<span class=\"whitespace other\" title=\"Tab\">»</span> puede reproducir este vídeo en <a href=\"http://getfirefox.com\">\n<span class=\"whitespace other\" title=\"Tab\">»</span> http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +msgstr "" -#: 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 +800,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 +816,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s por <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +831,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 +840,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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -789,51 +867,45 @@ msgstr "Contenidos de %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>'s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Explorando contenido de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para el formato." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Añadido en</h3>\n <p>%(date)s</p>" -#: 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 "" -#: 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 +967,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 "" + +#: 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 +1007,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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Todos los derechos reservados" @@ -981,45 +1050,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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "¡Lo siento Dave, no puedo permitir que hagas eso!</p><p>Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Parece que no hay ninguna página en esta dirección. ¡Lo siento!</p><p>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 "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para el formato." + +#: 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 "" + +#: 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 +1111,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 ba9aad9b8dbab82e195723734ea42e3fe05c1c9a..5b66a5a7312d235d87c9856028c4e4db77426d86 100644 GIT binary patch delta 5603 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 DBaJ0* delta 4187 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 diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po index 44e8b802..257992df 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "نام کاربری" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "گذرواٰژه" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "آدرس ایمیل" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -194,33 +216,41 @@ msgstr "شما در حال ویرایش رسانه کاربر دیگری هست msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "فایلی نا معتبر برای نوع رسانه داده شده." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "ورود" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "پنل رسیدگی به رسانه ها" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -539,6 +593,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +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 "" @@ -631,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 "" @@ -643,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 "" @@ -689,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -733,12 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -762,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s رسانه های" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -885,27 +957,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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -971,45 +1040,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1101,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo index b01068329326662cf5d7d9e65443948b719139a1..ef38b9c96c5bbf0018b8a45788ce652a66d46d83 100644 GIT binary patch delta 5671 zcmdVcdvH|M9l-IkF+5zzgOCIbAzXqn33-qgfgo=J1d<2@0tN-L*}XAWcK6b~yC6(p zp-`#vvR?639O{Fjt*FhSBaC7ZAL!6JK3bisymZECwJ7+iV@Lb_?cI(r)l&VhOvvY) zyZ4^+JHPWgchmEjYyUH@=&_9C9g2S+@;{gV-F>9@?Z3BEl^R0#9UO{ZVFeCOQ)(hM zVGeG=Ox%On_$2nl*U*J;V}Cq`@8SnorBqbCoUYU;E+h?5Y9x-qLhQm#Jb5$L(Z6J% zGjI!DMBhLjRRK)FwI~5>L1I+*;KleT4#EQ{_rIF>{9P<&esz`xKPs1}dtn9EVl6gc z0B7OjD1o}NoPkE8OwfS+umvTsC76L7cqc}%H>Q!6e9T4(s1A#mU(KZ<1Fc3kZbW|6 zc7Dlj{2KG{VO))Wz+!A*6d5>#GT|y@F0}<^rS~R2k0D7^2T<-iiph8!qZ0XhG-QI0 z@e)kqm+WZ~%Jr!zd)a}K+GQvMtVY?>C`#>YL55HdqC9s9Wh+mhY*F7!856USA2sn( z@?T4%jh?LZW|V>NKnd(_lodUQvNca9u0Mw}=)Z!ccq!4Y!Rh!0K8qc=bFfk+_zl)z z2~kQBx8oRGmrMTF(%8?1RXB!HXH3<DQuRmqCAIN4lofrAl7S&~hGQwpp3XtZn1!;C zZ78X}4JC6AqHI-9;`)A+agRo6u$}4zN@QQ4?A;(bvS&po85xU`>WL@=Hla-1iZapl zDC2BK3FKZR>*^_#)c+af`S(z2?F>prqhHaGmAW)1)k9Gx7=`lSghamyWlLI7_Rxa{ z-h{G6pQ23Y9;Vb39FCIWPLu`hLJ8ne+>TEn8HuW9mLVyhkHn&aC^v3H$-pmB2Hu;v z{yfTruc2h-uL)1%Li(TJZfs<KB+xTB3Ue-VYGn>ehSp%Eoc}v$EaJjT=*5BpXQek{ zGW{LM80s!;#Dh2u-Ir5vI0vQrZ^t0+LpcS*DSZk23Y>@Y@k)FEOYsZ5hxyfIgjtTy zqlTZM44BO!mvdg7a4|Bs+Jy6QFRsI+5zd=)1GdwTVHIXl`n_-lF2QD$Eqw?t!UGtU z6&|F~7Z0PP{3uFM9Ya~c8Pw2C*z$@lK^gdJlt4Ww_pQY~cst7TyHHL`4@!+4Lb?Aq z5~KQODfw@uQCQ}@YS-XY`p@HNbd#1zI0di34cLuO<Iiv$(GZ(@24#y*;|$EGQ0f+3 zggX8mrMBi(IvKT4PRreu<e%+Q`?xR`-$GeQHu<BeMxspM!3^ArvXWn+r1T)lz(cCp z1{{wv@Fct#7oudugOV{Lp_%wR5~VSo55zyZI2I@qZlPqU5A_5RygGpsaX_t8y>n3} z@+aJYvW0gc!>IdkAnwM~xF3mCJwRF+O1*{Bj}92)q^=(2>$VH)_~2uH$ySUYEwX|j zX5)&4TTxbiKg#ia7G=U?DAj)!<$gE&mWjiVdR4V3*V~Z{Mb%0g<G8RMm*PQOjCov~ zj@_7!hfz}cI;P<<lqx=r8F&` pLR0^WrzTJ6DMcr4LZ6P$5Iqg&4ZWEwf#(1h~f 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 HTgde<1M@$K delta 4339 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 diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 39480ea9..cd691e10 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/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: @@ -15,8 +15,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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -26,82 +26,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nom d'utilisateur" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Mot de passe" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adresse e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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 "" + +#: 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 +124,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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" @@ -126,11 +140,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,26 +183,34 @@ 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:67 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." @@ -201,33 +223,41 @@ msgstr "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuill msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Les changements des préférences du compte ont étés sauvegardés" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Vous avez déjà une collection appelée \"%s\" !" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Vous éditez la collection d'un autre utilisateurs. Faites attention." @@ -243,15 +273,31 @@ 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.<br/>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 :(" msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Regarder sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -314,10 +360,25 @@ msgstr "L'URI de redirection pour l'application, ce champ est <strong>requis</st msgid "This field is required for public clients" msgstr "Ce champ est requis pour les clients publics" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Le client {0} as été enregistré !" +#: 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:87 +msgid "Add" +msgstr "Ajouter" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Le fichier envoyé ne correspond pas au type de média." @@ -326,56 +387,70 @@ msgstr "Le fichier envoyé ne correspond pas au type de média." msgid "File" msgstr "Fichier" -#: mediagoblin/submit/views.py:57 +#: mediagoblin/submit/views.py:51 msgid "You must provide a file." msgstr "Il vous faut fournir un fichier." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Youhou, c'est envoyé !" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "Collection \"%s\" ajoutée !" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "Logo MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "S'identifier" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Ajouter des médias" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Changer les paramètres du compte" + +#: 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 "Panneau pour le traitement des médias" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Conçu avec <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un projet <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -387,52 +462,31 @@ msgstr "Disponible sous la licence <a href=\"http://www.fsf.org/licensing/licens 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 "Changer les paramètres du compte" - -#: 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 "Panneau pour le traitement des médias" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Explorer" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Bonjour, et bienvenu sur ce site MediaGoblin !" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ce site fait tourner <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un logiciel d'hébergement de média extraordinairement génial." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -440,7 +494,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Créez un compte sur ce site</a>\n ou\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Déployez MediaGoblin sur votre propre serveur</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Tout derniers media" @@ -546,6 +600,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 +612,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +668,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 +694,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 +717,7 @@ msgid "" msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Fichier original" @@ -650,8 +729,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 +775,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Vous pouvez obtenir un navigateur à jour capable de lire cette vidéo sur <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +797,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 +813,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +828,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 +837,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -786,51 +864,45 @@ msgstr "Medias de %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Parcourir les médias de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Vous pouvez utilisez les <a href=\"http://daringfireball.net/projects/markdown/basics\">Balises</a> pour la mise en page." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Ajouté le</h3>\n<p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "Ajouter %(title)s à la 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: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 "Ajouter une nouvelle collection" @@ -892,27 +964,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..." @@ -928,22 +1004,15 @@ msgid "In collections (%(collected)s)" msgstr "Dans les collections (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Regarder sur <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tous droits réservés" @@ -978,45 +1047,60 @@ msgstr "Taggé avec" 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 "" -#: 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Vous pouvez utilisez les <a href=\"http://daringfireball.net/projects/markdown/basics\">Balises</a> 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 +1108,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:159 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Veuillez vérifier vos entrées et réessayer." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: 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 "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:294 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:365 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:369 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:379 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:412 #, 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:419 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:429 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 d38d893844134aef63a3b42370f0a3e979a2c59a..2fff0063c857b1c54a8cf4af21c91ec91367f609 100644 GIT binary patch delta 5675 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 OwC+_jW3Mi@9RC2;X+Bl} delta 4282 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 N@$TGVW=Qom?f(G$xYqyx diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index 8041742b..f5de4e85 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "שם משתמש" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "סיסמה" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "כתובת דוא״ל" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "רשומה עם חשופית זו כבר קיימת עבור משתמש זה." @@ -195,33 +217,41 @@ msgstr "אתה עורך מדיה של משתמש אחר. המשך בזהירות msgid "You added the attachment %s!" msgstr "הוספת את התצריף %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "אתה עורך דיוקן של משתמש. המשך בזהירות." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "סיסמה שגויה" -#: 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 "הגדרות חשבון נשמרו" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "כבר יש לך אוסף שקרוי בשם \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "אוסף עם חשופית זו כבר קיים עבור משתמש זה." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות." @@ -237,15 +267,31 @@ 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.<br/>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 :(" msgstr "צר לי, אינני תומך בטיפוס קובץ זה :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "הצגה אצל <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "זהות לקוח" @@ -308,10 +354,25 @@ 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/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:87 +msgid "Add" +msgstr "הוסף" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "ניתן קובץ שגוי עבור טיפוס מדיה." @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "החשבון של <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "אמת את הדוא״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "התנתקות" + +#: 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 "התחברות" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "החשבון של <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "הוספת מדיה" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "צור אוסף חדש" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "שנה הגדרות חשבון" + +#: 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 "לוח עיבוד מדיה" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "מופעל על ידי <a href=\"http://mediagoblin.org\">MediaGoblin</a>, פרויקט <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "משוחרר תחת הרשיון <a href=\"http://www.fsf.org/licensing/ 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "לחקור" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "שלום לך, ברוך בואך אל אתר MediaGoblin זה!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "אתר זה מריץ <a href=\"http://mediagoblin.org\">MediaGoblin</a>, חתיכת תוכנת אירוח מדיה יוצאת מן הכלל." -#: 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 "בכדי להוסיף את המדיה שלך, להשים תגובות, ועוד, ביכולתך להתחבר עם חשבון MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "אין ברשותך חשבון עדיין? זה קל!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">יצירת חשבון אצל אתר זה</a>\n או\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">להתקין את MediaGoblin על שרתך</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "המדיה האחרונה ביותר" @@ -540,6 +594,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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" @@ -609,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 "הורד" @@ -632,7 +711,7 @@ msgid "" msgstr "ביכולתך להשיג דפדפן רשת מודרני שכן \n\tמסוגל לנגן את אודיו זה אצל <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "קובץ מקורי" @@ -644,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" @@ -690,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 "צר לי, וידאו זה לא יעבוד מכיוון \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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "ביכולתך להשיג דפדפן רשת מודרני שכן \n\t מסוגל לנגן את וידאו זה אצל <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +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" @@ -734,12 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s מאת <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -763,6 +831,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "המדיה של %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "המדיה של <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ עיון במדיה מאת <a href=\"%(user_url)s\">%(username)s</a>" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "ביכולתך לעשות שימוש בתחביר <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> לעיצוב." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>הוסף בתאריך</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 לאוסף" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "הוסף אוסף חדש" @@ -886,27 +958,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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" msgstr "באוספים (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "הצגה אצל <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "כל הזכויות שמורות" @@ -972,45 +1041,60 @@ msgstr "מתויגת עם" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "צר לי דוד, אני לא יכול להתיר לך לעשות זאת!</p><p>ניסית לבצע פעולה שאינך מורשה לעשות. האם ניסית למחוק את כל החשבונות של המשתמשים שוב?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "לא נראה שקיים עמוד בכתובת זו. צר לי!</p><p>אם אתה בטוח שהכתובת הינה מדויקת, ייתכן שהעמוד שאתה מחפש כעת הועבר או נמחק." -#: 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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "ביכולתך לעשות שימוש בתחביר <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> לעיצוב." + +#: 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 +1102,69 @@ msgstr "הכללת פתק" msgid "commented on your post" msgstr "הגיב/ה על פרסומך" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "אופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "אנא בדוק את רשומותיך ונסה שוב." + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "עליך לבחור או להוסיף אוסף" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" כבר קיים באוסף \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "מחקת את מדיה זו." -#: 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 "המדיה לא נמחקה מכיוון שלא סימנת שאתה בטוח." -#: 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 "בחרת למחוק מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "מחקת את הפריט מן אוסף זה." -#: 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 "הפריט לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: 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 "בחרת למחוק פריט מן אוסף של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת את האוסף \"%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 "האוסף לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: 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 "בחרת למחוק אוסף של משתמש אחר. המשך בזהירות." diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo index 32ec1bc29025e7bb37d632f1b409fbf11a6ea737..16ef8c09fd6e871a4077bb6597de7864e7197032 100644 GIT binary patch delta 5567 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 delta 4191 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 diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index 34f97df5..286b1a9b 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nomine de usator" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Contrasigno" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adresse de e-posta" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -195,33 +217,41 @@ msgstr "" msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,15 +267,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,10 +354,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Initiar session" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -540,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 @@ -547,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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 "" @@ -609,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 "" @@ -632,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 "" @@ -644,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 "" @@ -690,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -734,12 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -763,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -886,27 +958,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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -972,45 +1041,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1102,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo index 23f9f1bf26fc8b10cd378a1603d50b0f27e7d794..c3f747abddf67c01feec26945c02c97795e8f110 100644 GIT binary patch delta 5679 zcmdVbdvH|M9l-Ik3j|o+0TL1jT!JB4^G--eB0>_71PFu#0tN-y?B1Ab_JMmh;Zb4Z zDAFnd!<7gE<7-Mq3nMPRu!x9a6|7o2cE;ihoLZ|=sa40ZQ~UkpZfj^e+WKEJ$$rkc zd+#~F^ZT81v*}Ss_p^@Z+lhU5D1JWXZybL&^q1bZKWBz2l}7h1oPb|r0gfG})C{b{ zRNRcC@MoBWzrX?bIy&$S4#v0f9DamFN=4Nx!<8!Gf^&pY`B;XT*oK>UavPS@A2ZS( zxDor%H;_kF0EgfPlmIp(F{*oUAU=%Acm(DCU&p^chi>Lqf2P5&8pqT9umDT36l*bn zbMY~hKpms)fu^ENP>X}G5hbt{n20U73p+3Yhmn?aOhO5$9J82THPDcO)}ae;Mt;>+ zKBOA^a6BHwb@(#6v6fL};4sRBYmvFsW|WoQ7ymwnBvBnfx$iXg#dk0&k-twvCioP` z;4nU<rdcT0XQI@y1tqoZC<ClRsc95t?`%efQ2SAyJC0JycTq|-AcZk83HensQpkTP zjb?hX(rqXM??ee~FUpGcqm<@Y{QC1)L;p3*!4#rhkF)W&_#C$2p0P@0<2N`3vx!nR z@k%Viu5sjl1C1xSuolbM>Wrx#LD}`E`H;QwN0b%)4J89<bS7aAN=+A{WXwca$QG1T zccWx(KT4?{iC=#bW!%$I8kAGLixSzFD78zbBQ?uH$w&oCs%M}KScfuk6UszuP{z3p zC6N1&tgE9asec3I`S(%w+69!1M!%*ZD|KjgswbdKP=fN{^mxAxr6f%#HT0l?x1yBj zFDMhbCMs2plTcFJin5@)Q37}vx8hMGBT+S<Wk|{wBeAF;%8gr4GO!zE-~;jNCs8JR z9VIg##yyWq>3@bl#d*|60=<AGn0kr5R~DjVXgwCn`QJ%n85dqcFJ@%eEBy)frN09i zL*0e*@M*jPU6a{xxDaLc--$syjB*MlvGpbJ%Wx4c#s&BQ=HQojFY~KQ2r~~)qK2QN z44A|rmvdemcR4b*+JuYo0Cu7CQv1z$6RxBm!y+8T*6)WkxB};+l=SD=2ajM>R`@iH z0eAu><)=|L)!Qg5xPThE2wPs!*(d{Fg%YR-<-QHrAMZqY{%(}h@(9WvJC1VyJ4lS` zuQ}wuiAH9w{i<D$GwGkispujtl~|3J;Z1l09>a||jcABXJ&RJJ^H_t41xjtlWvJsP zD0^#Bp`B3^<+SWAB>$949p*v>{tjg&N#u{F%14>NgNb-M%1Z7*N$Jxl1E&>J2D}_) z;7S~bOHnf7LCKgAHx&QABTD0Pz7TgiI2OpuN;R`(*^jCNC6K#t4xUEYy-B5ZpoPdQ zL(Rp(XduI=P8@`5@I2m(<!F*thENBPsZ{hF4XH(PnNs)jWHrvC|9kG1S{0EN7uMr2 zT!y3Zy0~39ihef^#fMOi^AVJV{3d?=Q)IuYZ!j6%)RT-vRTYi-T&Th8a0gzGY8poi z!Z-v^;0SyTCAH^JQu_%?X+FnYIDmA@%I`y2;X#~;XK@Ploo?S>jxIU>bu=V}OHl^w z#BsO*yKy&4<V7>=Q*t$?($`Tk(G~A^qty5iN}!M9aC|X-{Y{kd-$lvLA22CO!&zwu zkb+c0m7zSi3P<9Nn1DM_2Ht~X@gOGQODF-phrBw}pelQ!DOgK?8p>YUhzsyRl<~g8 zs6;F;Y}q^ssNqPI6i-2^`E<Mr7hoYih!&o~WCwwAW>?ey@hp1*@_HoOsthHtPGl~1 z4{pG-cq@8llYdF&$FuDf^{=s0ItgWk<tWFo3FUkTQEIpy<ygLe{qQrCJ@6IELI$&J zF$L3bGRi_`p`?Cs{CcpK{7bDjb3q>1kMc%*4CR5RP)czMC52~D?sv?wQ$HRh&=QnD z8&Jl%4ke(~I1q2e0eA=U?oxYEN_RR+Lnb<h^1x>}5EJIw4oCKhO2q&!!*u*5O6ER7 zs-O}$v&5$6plr(RC;>fyTk$x$u%XW0YgeNzDEcEBvch{%&ha6X2~MH}_94m}@+*{7 zYn)ZNe=@GbsrU@;M0v3^v%`o<ZAD%s>P?i=jjXp{;ZxC|Z=zSu|64R9vZ{slitA7& zT!L5P`nYeP44mI!uW%j8>Dh)kIK0u`{g>ks`mMMakD>&UxJap2a2`saWBIaJMrfd+ zabY96aUYiAtC)fPo9urgx!6tLLN>6vlv%>K3XAX@CScN1Ub~ovQlf5@>xbe#frIED z!!fdgQ#52#y^rJ3!Llc!hH~7hQBog4+0E-vO0*MYuRMjB_&g@!Cn)!+W_z6RD4VVl zS7Hd6O1+BFWi+z*kn?&I$~irby!2Eb4*e}yjT`Yrti<}O?V4^wAN|94Kc+0_9~K_P zR4iU$mvRA)q2GboxCJGEBP+<iMkDbWd!@xFwbxNrvKc4f-M9vip`^NOrF~4>@lyJ$ za0Ko~Ic5h?QvMi9=8mH5u@lHELj4L=dWM;<S!ahlX;lt&In3B?LvL{m_J;g^-5W7N zK~q@=^D|>ZhYxZ(eLibO;-)O0PdnSSCnGDM`wY)D5hLQ)-R9Y@y;>xsd9-gIjXjrG z<A_#=L#s`_*JV@9T+}$53!!#H*MgylwkoWfdN7iwEp9VRjo(1XjA(wNUH7lmB5k_H z_Z|L-7HaJozvsCYf5_XehqX{xGeZHs_qOFtYYFF1pYLhcHM1kEOE|0a+;G5%^bBI^ zk%$qz)|6rF$xW@5$0IVSFBI??!92?~s>_OwO6?a25Rlb9>V(xYy1^A#t9iWMP)9Hl zdua59zEdJ?o`|ONgkSUcd_-qzSzZsTWErLrF*@~$ZdpfIzt%7#dRX^q9xHidt+gxl zi;0~czv0uGOo9)30=lf=qM`DvJ!5N!8(xOeB{i))AN0oF8=LG%uIh-iX<olUaI7I1 zjMpgk#keL%xli}&5nbz$kux*0#A{>*x0$JVf`s7r6OrE&A)KDt<$FUt>x@;6zrztr z)0&+9U0TnNm74B$YFh06^k@2v_l0z`r%n+`?M1QbW}dZla)H)r=zbrAU*BPn4Q9Le zw!GMllMP3KBzm<$6fL^8Hq;T;e0r-#3hR%rHWbu4R{297pA;rw#y-eg?--|>IgCv3 zYq`H?g}utr;vVR<{*=AkdL?@T0bA|a(-PuK*qS}snx0dU8Vd3xTQy?O8Co4AtD#oI zug8Kp>CRj&sFM&j3khvC!hxR6(lZm=Up7lmsPXz+x8)TNsqa+=GxkK@?T(V-+=8Oq zf)cH;q@s{UX+eQ&VSR3+-f5VOk~@o}S7=2Ah5xv(sF3?&>k1xqScOAVICgnO>mAnN zVQJQ>eAmcKlVH9*fmgH!4Qt`D+}N4o%bc$26Z;|_t<yO1ur<4MpS$Y6K8_!izWo1o z93L-x$TjnynXo+NTK}2$p0&ElAGHccXIa-*EFUrJ-}c4J6{!hR=d@DGA9hk>A5;!; zOqvt?{=?d@x-GHpUr(zZ^H<MyjOo2mE;_G=X6|)VHeR%;f55Swcf|!qY*)=br!_A< zv-i;*WFLV}!>5O0hvr_}*WL4GwNL5y9OvZvvW#ALf5(|#Q2)daIMaO^K6a!vf9Ih- z-?+eOooZTPy^x*x9}jhc<z7;i-W=-Cyu50@<AAp<xzSl5_x(?2{DUjqi98h6de_g4 J4QpQG_&Z-uIAQ<* delta 4360 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 Y?y+@dUBfi%R6~GVXw0&nYh0`S2UQfSA^-pY diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index 04a1f7f6..accc1d6b 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Notandanafn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Lykilorð" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Netfang" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 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." @@ -194,33 +216,41 @@ msgstr "Þú ert að breyta efni annars notanda. Farðu mjög varlega." msgid "You added the attachment %s!" msgstr "Þú bættir við viðhenginu %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Aðgangsstillingar vistaðar" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Þú hefur nú þegar albúm sem kallast \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 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,15 +266,31 @@ 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.<br/>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 :(" msgstr "Ég styð því miður ekki þessa gerð af skrám :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Skoða á <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Auðkenni biðlara" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "Bæta við" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Notandaaðgangur <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "útskrá" + +#: 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 "Innskráning" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Notandaaðgangur <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Senda inn efni" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +msgid "Change account settings" +msgstr "Breyta stillingum notandaaðgangs" + +#: 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 "Margmiðlunarvinnsluskiki" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Keyrt af <a href=\"http://mediagoblin.org\">MediaGoblin</a>, sem er <a href=\"http://gnu.org/\">GNU</a> verkefni." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "Gefið út undir <a href=\"http://www.fsf.org/licensing/licenses/agpl-3. msgid "Image of goblin stressing out" msgstr "Mynd af durt í stresskasti" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Aðgerðir" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Búa til nýtt albúm" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Breyta stillingum notandaaðgangs" - -#: 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 "Margmiðlunarvinnsluskiki" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Skoða" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hæ! Gakktu í bæinn á þetta MediaGoblin vefsvæði!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Þetta vefsvæði keyrira á <a href=\"http://mediagoblin.org\">MediaGoblin</a> sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Búa til aðgang á þessari síðu</a>\n eða\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Settu upp þinn eigin margmiðlunarþjón</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Nýlegt efni" @@ -539,6 +593,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 +605,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +687,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 +710,7 @@ msgid "" msgstr "Þú getur náð í nýlegan vafra sem \n\tgetur spilað hljóðskrár á <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Upphaflega skráin" @@ -643,8 +722,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 +768,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Þú getur náð í nýlegan vafra sem \n\t getur spilað þetta myndband á <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +790,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 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s sem <a href=\"%(user_url)s\">%(username)s</a> 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 +821,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 +830,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "Efni sem %(username)s á" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Efni sem <a href=\"%(user_url)s\">%(username)s</a> á" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Skoða efnið sem <a href=\"%(user_url)s\">%(username)s</a> setti inn" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Þú getur notað <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til að stílgera textann" - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Bætt við:</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "Búa til nýtt albúm" @@ -885,27 +957,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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "Í albúmum (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Skoða á <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Öll réttindi áskilin" @@ -971,45 +1040,60 @@ msgstr "Merkt með" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Fyrirgefðu Davíð. Ég get ekki leyft þér að gera þetta!</p></p>Þú hefur reynt að framkvæma aðger sem þú hefur ekki leyfi til. Varstu að reyna að eyða öllum notendunum aftur?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Því miður! Það virðist ekki vera nein síða á þessari vefslóð.</p><p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Þú getur notað <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til að stílgera textann" + +#: 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 +1101,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:159 msgid "Oops, your comment was empty." msgstr "Obbosí! Athugasemdin þín var innihaldslaus." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Athugasemdin þín var skráð!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Vinsamlegast kíktu á innsendingarnar þínar og reyndu aftur." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: 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 "Efninu var ekki eytt þar sem þú merktir ekki við að þú værir viss." -#: 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 "Þú 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:365 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:369 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:379 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:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%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 "Þ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:429 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 dad0aec4162caae11ef5750cf10ddd6a3b3b53d5..f0b535e4d892db6d173583b2d46003a813af6b48 100644 GIT binary patch delta 5649 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 Vk^P{hIE9Bo+PUX;+(kauzW_ywE35zj delta 4319 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 P8s)5AG}t}4sKWXO+|7}^ diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index e91926a1..7633a33a 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nome utente" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Password" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Indirizzo email" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +179,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -197,33 +219,41 @@ msgstr "Stai modificando files multimediali di un altro utente. Procedi con atte msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Impostazioni del profilo salvate" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -239,15 +269,31 @@ 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.<br/>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 :(" msgstr "Mi dispiace, non supporto questo tipo di file :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Visualizza su <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -310,10 +356,25 @@ 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/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:87 +msgid "Add" +msgstr "Aggiungi" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." @@ -322,56 +383,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Accedi" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Aggiungi files multimediali" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Cambia le impostazioni dell'account" + +#: 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 "Pannello di elaborazione files multimediali" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Realizzato con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un progetto <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -383,52 +458,31 @@ msgstr "Rilasciato con licenza <a href=\"http://www.fsf.org/licensing/licenses/a 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 "Cambia le impostazioni dell'account" - -#: 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 "Pannello di elaborazione files multimediali" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Esplora" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Ciao, benvenuto in questo sito MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma per caricare e condividere files multimediali." -#: 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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -436,7 +490,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea un account in questo sito</a>\n oppure\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installa MediaGoblin sul tuo server</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Files multimediali più recenti" @@ -542,6 +596,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 +608,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +664,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 +690,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 +713,7 @@ msgid "" msgstr "Puoi scaricare un browser web moderno,\n\t in grado di leggere questo file audio, qui <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "File originario" @@ -646,8 +725,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 +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 "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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Puoi scaricare un browser web moderno,\n\t in grado di visualizzare questo video, qui <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +793,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 +809,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +824,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 +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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -782,51 +860,45 @@ msgstr "Files multimediali di %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Stai guardando i files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Puoi usare il <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> per la formattazione." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Aggiunto il</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -888,27 +960,31 @@ msgstr "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"% msgid "Here's a spot to tell others about yourself." msgstr "Ecco un posto dove raccontare agli altri di te." -#: mediagoblin/templates/mediagoblin/user_pages/user.html: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 "Modifica profilo" -#: 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 "Questo utente non ha (ancora) compilato il proprio profilo." -#: 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 "Visualizza tutti i files multimediali di %(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 "Qui è dove appariranno i tuoi files multimediali, ma sembra che tu non abbia ancora aggiunto niente." -#: 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..." @@ -924,22 +1000,15 @@ msgid "In collections (%(collected)s)" msgstr "" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" msgstr "feed icon" #: 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 "Posizione" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Visualizza su <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tutti i diritti riservati" @@ -974,45 +1043,60 @@ msgstr "Taggato con" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Puoi usare il <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 +1104,69 @@ msgstr "" msgid "commented on your post" msgstr "ha commentato il tuo post" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: 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 "Il file non è stato eliminato perchè non hai confermato di essere sicuro." -#: 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 "Stai eliminando un file multimediale di un altro utente. Procedi con attenzione." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo index 1ebdba168fba92cb639146252a8bf0dd3f5165b4..b9483c0e9ae7beb7b41b08347bdc0ef400c274f8 100644 GIT binary patch delta 1754 zcmXxkeN5X$7{Ku>gW^y&=w93yj%L2FiQQU|WwfKPf!kzbuPi3S7z&i7Noffn)5O^R z+5`j*WHiPZLfG6`rffn|1r!9-#EfY450_1iZt4ZcV$A+oj3zGnefC32`nkLQ?z!il zyY}-D%iR&n*gw`tuSKbA+mw1lDdl%5m4|V3;yEnCtGF6h7b=yHTkruqf=pMn_z*si z8Ux6`sxC6;M^Wa@VHXn?v4nn0v0BSZsrQPNO2<#piu1`+=@piUjb^o5sTEj<@=+K! zU<c-6|5ASx39G(DS?gb1gZUn%He)HS$0pp4QIsVoP;#He2k|SE`QLd|M5WPCJIxQQ zxR<UCpTb(~!Y;gyD@&EC$6M&dD&C&PZj_?V;10Zj9r!Snm4tdxihmI|;1{?Ne=Uoc zJGYb*oPjLdgm%oq3X~nZfN~m5C_4$GRPGgAg?%VRK8JbuF=pWpn2o<<D&9kxpR&u0 zw=zOQ7F>rC(1Q}_AW8y$%)}_l#9myE11OanM%md2%2CXtBzhBN-XhAz{zNIgb+>s` zHVn{@cxcGPVO)n(C?&j#vV+VDbK#BHN525&j!dDH@-vjPyn&LSwbI=2DwKGSql|k| z*4dA#=tDLVQB5@D%v<m|oWx<wddAFj9E<7S#0FfmN2wZo8SC(Cti^2vsmC6ao&JH6 z=->D#s(maDk0GH{3+`ckHBKX!fqNLjoM+9Qb))QH7?0r$9z<Ie$AmsSi-Wio%ZP5r z5K6p0+=7=-6268}EI2^2GLChuuYRN<B`U4vqG1)v*}aR)Z~{|t3gwQ>p<JqOm--7R ziT;K1waX?;SzsTg;Y%n9y^8YO07~2sFd~;@lEw<Wg7V;Xd=l^Cam+h(zk2FLte`)G z0ZcipR5=E*0WV`5vybr2z&Eh~ZAZ-`_F_N%PW0pYW7J>1E)nW0r5ZxH{qy(){*3&_ zsC4RAgu77!cA(t)cQAo-C~<1YHU-;J;+(|g*o*0S8l@s<mb`GB?aKp~7~nTWjVHg) zY~NJpa=KkEhjY8rnQ{1#<EXzQ&=v@X9F@LyzuR8ubQL+AE{AJ}-C5!;DlBmFmvO+? z*6yfj^@ZAkzV>jd+uq`94f;=nL-w8jx5`g6`vSqO4dLeGm@_xcx;XpELeH7xH^o<$ zSr@u{Zohp#F<3ITS;wO~c0tFJI(}Klr**trRfbQ7f?;2yy*b?I52{-e7jF-ACIjvU zOTLbu(y@<peAIkY$NCp$PwUtl+L+PCTiO`X#_M;chmyZ|_NREYk<hV(Hb%5@RvV)_ xYRHK3ezm_b;M*In4+cUy_MwiQ*YVf1F{xv`ciw+w@XoZ6$jIqS{^tE@?SE~=LWlqW delta 1623 zcmXZceMnSU7{~EvDs{7T%Qnr_8VcGrow{RA<*1GMT3e=>wryaWFP9n_9GbcI4ikt< zl86ma|M*8M1tC_;4HjZy1B=~2*zJ#spi<lDg=IG)|B7Yl`*24GKIb0qdCqx$_l~n; zu8A?%t^bl^!!D7>8$|L%<cL>fCHA3#*D!!j@GHzJ6!{tp@C$50mP-pR#2@f43?UzB z*yyb9L0vb2{Vez!i@A>aB$Ho}ai2&E-ov>#X%DAVx?;LVonIs!_u)J=F$X&_7yA;| zqexl#6?LzVxD<0rMAo7gv+)3KLJM`vG1Rl$xB%~>uA3~8m?SZHnfSw7tmS$Z3$V15 zW-y3P@B_BtgEEnPEZ8big!@rL9mFj-j>qsd>VaBFSi?V#Id~CQ;7@^=)A^rFe96QV zuEO`Y95c$D4m_wy`A|FAiW#^Qm*7FvkR!Mf&*37xj*IaQYO<54>mQ=ldl6%x8@@p; zn7Yj=l!tnNB22@2)P*fLA3IT#vrs!bg&OH))WSDV*Zqvz*nQOKAE7>~84O}9wZd6w z;W8!$P$L{g?cf>e#{b|De!^rNsC1$nMtv8?QSW<%+VM-&db5f7v?^zx<)}#*NFy=v zG0<lo!0)ghui_NyNqeh_9dBSezQQKlUL$e{NALjtk8Sup#kA93P!IY$uEsxbCw@dq zNMO524f{(kgIp#iu?yd!z9jp1I2~BHm+L{?jWfvmDaN-VS1^R@F`epeEJLk#5Wm6G zs0Y4^XYmtm(D_|7!2UAEK%-k&$0E!|eRd~sF81L(96)_XhEOB^F>!qxHR|6`zjo88 z8)R|XB&<a}P#x-hov3wtFs3g@KZA6<gnHvOT!$0bjQ=8`NL9T^B@SW`A7VL{G&qmu z4EAt6jc2f9kMlL1K~k5rMv)8Hj3&NqB!B(7>?U80stfgNbQ#y+P2_)!JjRW<m>l!5 z8uhI|ig6r5t+Sfb&cRC5IyE>STQCI=qb3qg*xgL~dc$cZ%COgdnr5wPH;Vn<EgoZ& zVWc+Hdm7DS!Dukt<*915OuxI(@D_Ub6dG=?&+jeDH~2~2)f%-tO_A2FXsFc+NBr*g z<7Qi%8F7~;2IU>yQR`%TDBRt#J{&o0j~ls3wmT!>vKMSVKPS1$44IZ0A1S^SugJ`c ePy2K1VSlYFelBao?k}Bi#iz3G*ja(+nV$jm3-Koa diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo index e7602e15301f853a511c844db0dbfee96e4adfac..c2722aa4ca3ea4316cb81600a0e97d2964850c01 100644 GIT binary patch delta 5635 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 delta 4407 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 LaHN?yuSWY1{j~4f diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po index 6a35c0e0..7f6c00b2 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "사용자 이름" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "비밀번호" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "email 주소" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "해당 유저에 대한 '슬러그'가 이미 존재합니다." @@ -194,33 +216,41 @@ msgstr "다른 사용자의 미디어를 수정하고 있습니다. 조심해서 msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "사용자의 계정 정보를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "잘못된 비밀번호" -#: 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 "계정 설정이 저장 되었습니다." + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "\"%s\" 모음집을 이미 가지고 있습니다!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 유저의 모음집을 수정 중 입니다. 주의하세요." @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "죄송합니다. 해당 타입의 파일은 지원하지 않아요 :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr " <a href=\"%(osm_url)s\">OpenStreetMap</a>으로 보기" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "사용자 ID" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "추가" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "알수없는 미디어 파일 입니다." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "메일을 확인하세요!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "로그인" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "미디어 추가" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "계정 설정 변경" + +#: 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 "미디어 작업 패널" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "Released under the <a href=\"http://www.fsf.org/licensing/licenses/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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "탐색" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "안녕하세요! 미디어 고블린 사이트에 온걸 환영 합니다!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "이사이트는 <a href=\"http://mediagoblin.org\">MediaGoblin</a>으로 작동 중입니다. 이는 특이한 미디어 호스팅 소프트웨어중 하나 입니다." -#: 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 "자신의 미디어를 추가하고, 댓글을 남기세요! 미디어 고블린 계정으로 내역을 확인 하실 수 있습니다!" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "아직 아무것도 없으시다구요? 매우 쉽습니다!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">사용자 계정 만들기</a>\n 또는\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">서버를 위한 MediaGoblin 설정하기</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "가장 최근에 등록된 미디어" @@ -539,6 +593,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 +605,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +687,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 +710,7 @@ msgid "" msgstr "사운드 파일을 재생 하시려면\n\t이곳에서 최신의 브라우져를 다운받으세요! <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "원본 파일" @@ -643,8 +722,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 +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 "죄송합니다. 사용하고 계신 브라우져가 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "최신의 브라우져를 사용하시면 비디오를 재생\n\t 하실수 있습니다! <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +790,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 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "<a href=\"%(user_url)s\">%(username)s</a>의 %(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 +821,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 +830,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "%(username)s의 미디어" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>의 미디어" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ <a href=\"%(user_url)s\">%(username)s</a>의 미디어를 보고 있습니다." -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "포멧팅을 위해 <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 을 사용할 수 있습니다.." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>부가 기능</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "새 모음집 추가" @@ -885,27 +957,31 @@ msgstr "정상적인 계정이나, 인증 메일을 잃어버리셨다면 <a hre 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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "(%(collected)s) 모음집" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr " <a href=\"%(osm_url)s\">OpenStreetMap</a>으로 보기" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "All rights reserved" @@ -971,45 +1040,60 @@ msgstr "태그 정보" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "포멧팅을 위해 <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 을 사용할 수 있습니다.." + +#: 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 +1101,69 @@ msgstr "노트 추가" msgid "commented on your post" msgstr "게시물에 덧글이 달렸습니다." -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "오우, 댓글이 비었습니다." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "댓글이 등록 되었습니다!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "확인을 하시고 다시 시도하세요." + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "모음집을 추가하거나 기존 모음집을 선택하세요." -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" 모음집이 이미 존재 합니다. \"%s\"" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "미디어를 삭제 했습니다." -#: 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 "확인 체크를 하지 않았습니다. 미디어는 삭제되지 않았습니다." -#: 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 "다른 사람의 미디어를 삭제하려고 합니다. 다시 한번 확인하세요." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "모음집에 있는 항목을 삭제 했습니다." -#: 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 "확인을 하지 않았습니다. 항목은 삭제하지 않았습니다." -#: 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 "다른 사용자의 모음집에 있는 항목을 삭제하였습니다. 주의하세요." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%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 "확인을 하지 않았습니다. 모음집은 삭제하지 않았습니다." -#: 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 "다른 사용자의 모음집을 삭제하려고 합니다. 주의하세요." diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo index afa8849cd7a07c9af8669877e19f9a5e7b253e7f..723456cec4998f421dd43cef56f20ad2c3ea8b76 100644 GIT binary patch delta 5671 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 delta 4367 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 F{{-rEpV|Nb diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index ba2907fb..f45ae6eb 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Gebruikersnaam" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Wachtwoord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "E-mail adres" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Er bestaat al een met die slug voor deze gebruiker." @@ -195,33 +217,41 @@ msgstr "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzicht msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Accountinstellingen opgeslagen" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,15 +267,31 @@ 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.<br/>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 :(" msgstr "Sorry, dat bestandstype wordt niet ondersteunt." -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Bekijken op <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,10 +354,25 @@ 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/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:87 +msgid "Add" +msgstr "Voeg toe" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Inloggen" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Voeg media toe" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Accountinstellingen aanpassen" + +#: 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 "Mediaverwerkingspaneel" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Hier draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een <a href=\"http://gnu.org/\">GNU</a> project." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "Uitgegeven onder de <a href=\"http://www.fsf.org/licensing/licenses/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 "Accountinstellingen aanpassen" - -#: 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 "Mediaverwerkingspaneel" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Verkennen" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hoi, welkom op deze MediaGoblin website!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Deze website draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een buitengewoon goed stuk software voor mediahosting." -#: mediagoblin/templates/mediagoblin/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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">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:40 msgid "Most recent media" msgstr "Nieuwste media" @@ -540,6 +594,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +662,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 +688,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 +711,7 @@ msgid "" msgstr "U kunt een moderne web-browser die \n\taudio kan afspelen vinden op <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "" @@ -644,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 "Afbeelding voor %(media_title)s" @@ -690,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 "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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Je kunt een moderne webbrowser die deze video af kan spelen krijgen op <a href=\"http://getfirefox.com\">http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +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 "Voeg toe" - #: mediagoblin/templates/mediagoblin/submit/start.html:23 #: mediagoblin/templates/mediagoblin/submit/start.html:30 msgid "Add your media" @@ -734,12 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +822,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 +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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "Media van %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Blader door media van <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Voor opmaak kun je <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> gebruiken." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Toegevoegd op</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -886,27 +958,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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Bekijken op <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle rechten voorbehouden" @@ -972,45 +1041,60 @@ msgstr "Getagged met" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 +1102,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: 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 "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:294 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:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo index 206c906c3c92c0646d2a49efe4c04f2824bcd9b2..d72aca91b331a86ee5f142c894c3168cb7bc09a2 100644 GIT binary patch delta 5722 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 VUI&}oO4E5Lq@Ddvc(^Uo@lOCNJ8%F1 delta 4279 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 Bb}9e> diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index 2cfe7f61..e39f51dd 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 <odin.omdal@gmail.com>\n" +"POT-Creation-Date: 2013-02-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Brukarnamn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Passord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Epost" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Eit innlegg med denne adressetittelen finst allereie." @@ -194,33 +216,41 @@ msgstr "Trå varsamt, du endrar nokon andre sine verk." msgid "You added the attachment %s!" msgstr "La til vedlegg %s." -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Lagra kontoinstellingar" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Du har allereie ei samling med namn «%s»." -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Du endrar ein annan brukar si samling. Trå varsamt." @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "Orsak, stør ikkje den filtypen :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Sjå på <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Klient-ID (client ID)" @@ -307,10 +353,25 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet <strong>krevst</stron msgid "This field is required for public clients" msgstr "Dette feltet krevst for opne (public) klientar" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klienten {0} er registrert." +#: 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:87 +msgid "Add" +msgstr "Legg til" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Ugyldig fil for medietypen." @@ -319,56 +380,70 @@ msgstr "Ugyldig 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å velja ei fil." -#: mediagoblin/submit/views.py:164 +#: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" msgstr "Johoo! Opplasta!" -#: mediagoblin/submit/views.py:215 +#: mediagoblin/submit/views.py:146 #, python-format msgid "Collection \"%s\" added!" msgstr "La til samlinga «%s»." -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Verifiser epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "Logg ut" + +#: 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 "Logg inn" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Legg til verk" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Lag ny samling" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Endra kontoinstellingar" + +#: 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 "Verkprosesseringspanel" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Drive av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a href=\"http://gnu.org/\">GNU</a>-prosjekt." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Image of goblin stressing out" msgstr "Bilete av stressa goblin" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Handlingar" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Lag ny samling" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Endra kontoinstellingar" - -#: 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 "Verkprosesseringspanel" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Utforsk" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Heihei, velkomen til denne MediaGoblin-sida." -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Denne sida køyrer <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit superbra program for å visa fram dine kreative verk." -#: mediagoblin/templates/mediagoblin/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 "Vil du leggja til eigne verk og innpel, so må du logga inn." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Opprett ein konto på denne sida</a> eller <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">set opp MediaGoblin på eigen tenar</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Nyaste verk" @@ -539,6 +593,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 +605,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +687,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 +710,7 @@ msgid "" msgstr "Du kan skaffa ein moderne netlesar som kan spela av dette lydklippet hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>." #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Opphavleg fil" @@ -643,8 +722,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 +768,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Du kan skaffa ein moderne netlesar som kan spela av denne videoen hjå <a href=\"http://opera.com/download\">http://opera.com/download</a>." +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +790,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 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s av <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +821,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 +830,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "Verka til %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Ser på <a href=\"%(user_url)s\">%(username)s</a> sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formatterring." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Lagt til</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "Legg til ei ny samling" @@ -885,27 +957,31 @@ msgstr "Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> 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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "I samlingar (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Sjå på <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle rettar reservert" @@ -971,45 +1040,60 @@ msgstr "Merka med" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Orsak Dave, eg kan ikkje la deg gjera det!<HAL2000></p>\n<p>Du prøvde å gjera noko du ikkje har løyve til. Prøvar du å sletta alle brukarkonti no igjen?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Ser ikkje ut til å finnast noko her. Orsak.</p>\n<p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Du kan bruka <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> til formatterring." + +#: 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 +1101,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:159 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Sjekk filene dine og prøv omatt." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Du sletta verket." -#: 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 "Sletta ikkje verket." -#: 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 "Du er i ferd med å sletta ein annan brukar sine verk. Trå varsamt." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 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:369 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:379 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:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: 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 "Sletta ikkje samlinga." -#: 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 "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 64a4d00fbfc2b5b932f7ff6009527a3f465fb993..6539b8b3933bb6a2e76bfce695be8bfebf68414a 100644 GIT binary patch delta 5660 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 delta 4372 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 diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index b516065d..9b7317af 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Użytkownik" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Hasło" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adres e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Adres z tym slugiem dla tego użytkownika już istnieje." @@ -194,33 +216,41 @@ msgstr "Edytujesz media innego użytkownika. Zachowaj ostrożność." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Zapisano ustawienia konta" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Kolekcja \"%s\" już istnieje!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Edytujesz kolekcję innego użytkownika. Zachowaj ostrożność." @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "NIestety, nie obsługujemy tego typu plików :-(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Zobacz na <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Client ID" @@ -307,10 +353,25 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n jest <strong>wyma msgid "This field is required for public clients" msgstr "To pole jest wymagane dla klientów publicznych" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klient {0} został zarejestrowany!" +#: 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:87 +msgid "Add" +msgstr "Dodaj" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Niewłaściwy plik dla tego rodzaju mediów." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Zaloguj się" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Dodaj media" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Zmień ustawienia konta" + +#: 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 przetwarzania mediów" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Obsługiwane przez <a href=\"http://mediagoblin.org\">MediaGoblin</a>, projekt <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "Opublikowane na licencji <a href=\"http://www.fsf.org/licensing/licenses 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 "Zmień ustawienia konta" - -#: 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 "Panel przetwarzania mediów" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Odkrywaj" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Cześć, witaj na stronie MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ten serwis działa w oparciu o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, świetne oprogramowanie do publikowania mediów." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Utwórz konto w tym serwisie</a>\n lub\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">załóż własny serwis MediaGoblin</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Najnowsze media" @@ -539,6 +593,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 +605,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +687,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 +710,7 @@ msgid "" msgstr "Proszę pobrać przeglądarkę, która obsługuje \n\tdźwięk w HTML5, pod adresem <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Oryginalny plik" @@ -643,8 +722,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 +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 "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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Możesz pobrać współczesną przeglądarkę, która obsługuje \n\t takie filmy, pod adresem <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +790,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 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s użytkownika <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +821,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 +830,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "Media użytkownika %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "media użytkownika <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Przeglądanie mediów użytkownika <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Możesz formatować przy pomocy składni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Dodane</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "Dodaj %(title)s do kolekcji" +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: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 "Dodaj nową kolekcję" @@ -885,27 +957,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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "W kolekcjach (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Zobacz na <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Wszystkie prawa zastrzeżone" @@ -971,45 +1040,60 @@ msgstr "Znaczniki:" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Możesz formatować przy pomocy składni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." + +#: 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 +1101,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:159 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:165 msgid "Your comment has been posted!" msgstr "Twój komentarz został opublikowany!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Sprawdź swoje wpisy i spróbuj ponownie." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Media zostały usunięte." -#: 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 "Media nie zostały usunięte ponieważ nie potwierdziłeś, że jesteś pewien." -#: 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 "Za chwilę usuniesz media innego użytkownika. Zachowaj ostrożność." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 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:369 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:379 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:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Usunięto kolekcję \"%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 "Ta kolekcja nie została usunięta, ponieważ nie zaznaczono, że jesteś pewien." -#: 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 "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 2cad018a45822ed7b63261bd77fff7c728d58f61..9f1b35ac0e4a96498e9725ce321a446c4153ff5a 100644 GIT binary patch delta 6836 zcmb7|e{5aVeZY@dAk-zlC?Pa~<k-Z-A&!4wNP=;kIJQX~{40)=ZXhkazVFz+<h^%a z?hh|Yf4osN!MdV!yX)3YEh1$Kr8HBeh%JR`9lTB3q)kJt%hYxM6fvo+Yx@V9s%lfa z&-a}B?B@^-iXuMu-gka{&-eH7m9I5j{YKL_|M#Zq51N#^+ND&BQtC>NQX2jn?1ujX z55SK5l)3{J;U@Sy@MicG$aHlP-U7b{zXxB2OjYN5m3jca2JeACgHJJG>-|dY=l$XX zs;XLfc$-nH;p#m~eF(0D8h#YYhJ8>3n1*-4({LSp8m@<5gm=Lg;b!=^@HY4sl<_}< zBJgc{l|nXk7wm^qd#g$f^Y9EG`rw;T7GAT@333;_iT54(dnc5I_CXPR5N?G9C?|aq zu7TfzRuH(0_qX8h!?h18bp$>KZ-nnud5{zQ6pF+m#agft%EsH_Cb$dAgdzB0I10DG z6L2#;12@9YK{3f!q0IkNC<l5ee}5H<fUiT*SoIAa?%?4ka2s6xkWy`M2fP)I!x8v# zC?~!M8LIvsiY8W}M={+RDC0N6kHB^)0`x=Ka0niT$DnBHOYkiFtAFC*`+PWpN1TS+ z2iP2b9^xnJ3fu{Q3^AkHghzfBPQZ`C??E}qyHGT_;h-}~E0p&^C>ofC_rh7I;WO}N z_E&$#gGl%nP$d2vD60GiC?|Rgw!r^}+u^1`w{Sm{la9kx(1Xoz4oWnffugZbLowk6 zxEX#6$~xbL>)BuZoClfEe8@T7CMXNGKw01(C?_3-qH-U~$%;^X;!{w3;z`&J&%-jj z0`G=9hFlap0>yL-P&D#9tja={c{mUM8j1#HhMg}w2D^Cw1e9?vK{@faVJmzCis0`; z(U>^ODsVeo4Y$C<@NRelo`&CsuR$^8ryoZDIKF!MVYkswVF&Nqm?gF!gO9@}-~#+F zDEZ;U5yw+dY#%`Wsi*iKXHaiI_E5KtI@Lc4MI#a127i#V=_vYtln*UOmHHU`B*Y)p zci~^b4UZ_*3*Us>;Z0*smAjy1xFb+bb`Cxb-+<llH^zw=_*u9b{s?{&z6-^tDicmq zPge7Xr=h6$87Q`X7D_(20=K|_gd)H@uoJGGbhh6Q<wQeJ#`#b-tim<$DR>L~LjL<# z;ZENF68@%)`ymf<g2PiTCw~QslYAd?7<KzGR|9<bIo_X#zYDvkoglA3WK!?I65Mwj z$AlN*R``(_=PUO?iGmZb8<rp@s;XyskQ2NOWx^_?xf9+EWub$x4PJsbz<<tvzY4|c z--Y6Izl1l!RVN*r;fHu%56M+(GgPf@ajW(U1yj&TsQs{b`6p{mwa)c)_x1Gb?%vbg z-8?n9d)h1paS)bw4||E})Ax1v^zQEN*?r$0-Lt2!ci*mV{%aod;$-(s<dx&1mxNKD z9`edzC5?6eVo(nJAdTbF!6@`ko229g#ZEsgUH)eGElqp)Ei8M5P}iOl0Zi?M+Vi0n z!JKrD*Dh!iC;Y$cEf2_k+;iuap{3ykqubik*hFQoWOl|oRd%fJwqMf)ldYTCxo^C7 zsStR)tr)Z;R#PUL3ySi?ieFT_SMlb(DErRZ2_1NmPD`?NIq`HEQH+j*#PoN01I=OD zoDHrU?H>xubHRKXF?QUr*Wqxs7?ias>DZ*Y64fqOq9EiYS_}$dBy$yWSkQ{NHT!z+ zhqLeW?%%Ma4O8mxTId~UzTCC`i%r#|qJ*=7?CoT!>j^cAc8vC-Gik6G>WUY6?n@e{ zwF~UpsRm<RN()}O_JS8XEy~VwVdNp7S6uXBHHg|@Hn89%h?bvFO*ILUB6?k6qlOVH zWLohZwUta6>mkUBA5dku*kI6xAHA|U+c>yX%gTFJS98I1$yu|}T^c4^Wn6#LIQ8<$ zY9=g%vF2YPh)j_15E(HJerUa-6eK~Uj-_5~upWjATe3IzY~SChPM~jbVAL0AQ(g?j zb;SxnIZmR~snJ;>!QF8P*)}%i1uq-e`<ZPrKZ-&f`e78AR1GG~oinDO2Ibh<f9%~? z9miO)IGppTe9c1cgKDst7y^xb|DRFUdb=7O*31|x2AIR(e02|!NFxR0j_0+giJcOF za=c0y$F)m~rl^Z1(rlOe81WL6ym?c~zP#@b2PfV;+>|9+BpSTpd|G?4WHn?>Q^p@e zwz_xfFwGu&u;o?>vy~o^oqzDogM6)+sDw)(wRn<I6Nb=K!zT8lz$S~vXO@of?WIJL z{qVv2??2=PXPM%_IZ9!{6hk#q2ogR!$Ts8x_l9n>slMYItdemK>ybE%$^N`=`^dO) zhL^mMJHwgO4NW<8%u;b2Lg$8FL>k~<DZmGaMC-nBcEdy4tHZ%OnPk~R*eD6+J?B37 z-6F?7ld_#VlSFOpMH$|yM$T4>1Tb;xjG`V6Q4>iV-PS*i#7y={Kua!oKs_8;C5~bm zefdid{d-e&vPg1i%$^<1ydt}(`;?a^3t>d)yTgR3BoJAzl9J+l&sspYFHcCLA_-Uy z+}18J;gx-J%BAIIC3|(~SyS3gRS*Xbb@re87Y@06s{{0=W{4F+%0!7d=h@?P3L*wI zhKu;2btBYP(l#P;KhC}|@Go5xR_XQ&$;?SrEE+#C1t|)nWxtpPE}fUd#LNEpK>yy_ zpA?gzgpqr?tyy_OK91;<$R!<&1-_Bgsm2KBVsOqKIs3(d<F}6_0kS3R>fFxRHk&>8 zz$V;WO-P2bp|7SW0cQ!C>>CGn&T~M?n5Z}MIK!M*TnJMFFaMq=IE26jeDNhUh_=X> z5@`!k3fxRQ%?)6cxJB{;6-c6da`thPgxS4=+veg9TY{YRY#O%SgkX!_IVld4IDT$L zyS{`Q*{|TK$q4r>d&Rno>9GFcxTG_wo^b``28&+y#9jBU#RJR6M`r{;G0c8+Pj52; zf{0d_b%$Ept}R6}(pKQcT9i#4YSlK>mrUN)UXrSMs$PZ&#Lpk<yh9p?NS~M<Rb#fe zv2z^GYA?IA)o&ZBT`mOklE_FJQgF%jaV0F<goYrl!aq7Ru%VvCCH>favkOBVn<=TW zHcJLZfqJoaDVk4<*>l@=tQsTlXEzVOP$e5+d_OH#j2`wDO@}j+<W31j$vk>7^lM+o z&gXDn@$r`auF61vW#FX!o?uSmiUM!^l#FCc{9KC9iM?a|fFMNox#xB2sgUUPJ=QmI zHSw_JlIU6%v$=>Ahi69gby7@hVDO80>Qe5F57^WxqUTaGo7jufN=WpPA#AKALB*z( zdiw8cZ<v-nJ<@tZ?Lzj_$g@?+$!;+_uXZ6V(DYcZ3L@LV<OgJVNo&pe^;e}oDx<b} z^hpJf6NhsqB5gH@k*_4<kIamZJ<!=80P$hOG6hp@+$-YP)DF8*^Xso_8wKyXkzFT@ z?Sy=%r5IPsPm|hrbyR<%`%|`5MrJ;!(g1J@0&%(ixD!b+wJDAu&d=^#!k)L}MLzZy zjU-Yd>bZ~D)HcuAQOj!(HBNumtWmxGB7^mg>6&GJRZ(2!CNt+ppB$t#sF?*rm`WSv zXK&wK$Sxky)k&SyE+uI(w?~C?tLLZ{1cKxo^h1}5e-W?sfjpXW0lU{;5MPVqh8o_f z50j#bE+sUaxx$_S1EsfhaYb0O^z{3$?NaOqUpV{i(F4^fDmiW`cCxCJOe}f4QoA5| zQYxein5C0+>Uv1jBmOwPng=~iQA3Th5wkQ=)?szqBPL;oPUzAPnsY>CeKV0l<~+_P ziU5gU>Z!ypB}Z~F#gZgWdxbhB6BNAc)X~SrN93}wypQy0(w|9B8Y}yw@0Eym`V5je zhHy2*UMq6TQ+8^vNbwJ|UmpGS^>&inh_u9<wuyh(CH{GC7$lLiJ`#|HU0<^hQZ=wx zhn~mYWnVf!Bgzw}2#O25=5_SyBVQJ!drR%9Yo_z-RK1z+sJ9}KEW$okVsf{pPp8Ru zJ((ZkDilMfee048l@?XZCJl|K!fU*~;Z4OVt+o`IY1#$XYz|Sy)eI?-^6pyM6Zu7J z=|e+r>-s}=(nP_W^a?f&*$YIATmb23Vo7<}%cY*Y8ITD!b7zC&TW{pK9A;*`t1s{D z^vBHXxNhHbe|M!rpPbs)bux@*13H|QzxxE9uibCi-;K9bPg>W@n|(Zk223s;x{dC^ z{U*0<X{}b==(N9p9kFdIcZK>$oR6`@APz-+S*q1o{yoi^EjlGlg5plJRDLLAI9)6a zuh_s(@z(+!iIe2o_3QOa2G{Q{Qp-x#!XIeW>|ZAqvs))OcK&K>WH(Q4%buUyHRc4f zz7x*k7_#|tNs(JcR1R(J@X7Y)<kXQNIt%GJx=vA4-O5~@)=#yrlDd?g-?cFt=(y>~ z2V0#Ic)i65SXXV`$~Q7>dFkDQ^IR3K<N9fAvxa!Ty?eQ9>d&W+t#1&9K~Zy7JT}lZ z?nS2y;ct~~H)S&deH)h!7a4WKS^dbQ?DVmLkAJW^*0?xiqhZ9^a$l(b9KP4JvfrED zocndbEJ}RQ@4LoO)~o+HW2Hmq%hn4>o(T98P00i}s6ATj&C&^T8?bMLE;l%|MJ}LJ z$zK5Kfj~2Qb^6|>^bd~z(aGb6zj)PNd7m4FmnfI1knlRUDOI~fE}~@0Uj<?>h_WZT WwyZu$(k82Cul4He7wgtHss95JxnaZr delta 2532 zcmXZc4{TM{9l-JP_*dIfhm^MZ+SlGzTU*-N_b7$-wUqt`D)b+JmTm#OeZ7=t+IQ`H z@7BT09%>eK1cv)*voR)Nn;p)X&2$bWV_>S=LKYZ8)NF2`m@qM8Y)de6OW5~k+cf!{ zd*40h{QjJK-~E~I_2a%@{BKd}uRdemtuZEGjCn0&Oc7qhApRTI;(aTOS%$-yhkNi2 zd={B*4&!1xf>-e+<lh{qHKq>F;Qe?DpJGDcN@E(ho~kn`lgr==Po?2!I3I6gKF(id z%n~fZEDWLs(u{ZF=DFX8Py<WMUGJa!{Rn1r|7Bc=r;(h@+qfP-Ta_}VgF(w`W5W1N z)D6#II$pp`{PW!PHPp=ii6!_s=3$`Tm~yN`owoyXaW@uX3ZKOnP%9H8eGMp*VxSvF zF$edeW_Ab{;Za<QQ@8-%Kn>_Os0*J(KYoHbe*sx&OZ=#T7ND+Iin`uP)JisD0j4%E zxSPQ))ZV91dvz3b<KLlX_9xVg=QkQd^-LM+2HR0vw+l6}7;4G)qGosyb;IXy9sUsM zuDOn1V>@FtQC@C*4~NiO!{Ycpa!$-`)BsjC8$<QXcKjAj;yqZ*3Dv{fh+4@()XF@J zn)x&MCHyWf$K&Y7i<rj#<^}`J<Q8g)ZljiRQOj%v3b2^#8Z5$o)Q!ebGkpTJHIt}s z!S_+uJC0hhS5Yf@33cOZbIxm}GAV8Z80f@G)WcJcx?md?<2uxUqNod}P)qtWYKbRN zOMe8lQpYih7f|Olw$1jsAGLxp)QbEBQ@Zg92H(cFP%E&deKymtqMn7Xqh|ag)Qo?L zdS-r)I{!n|jc%X@zMy0FOr)ds{4U&zgZLu;95v9boz!0=`bH<^#S>VC*HC-Etjn0M z;07GRAERcP#;RJWY`hl(_#n0-Q_TV7QF9UXl>66{HLgZ&;S_2Dzg<uLH#4}*jUKGs zU<~KbJb}mXG}fZs%~uegM_uqFR^WT6nfcg#AAT8w_&z>_=^JM&@i6Y-I*!`93pgJy zrx+|?a22)0f5W@*Kd4{2%uTbATBrdupjK)JF2sYV0X>JB(W{t-XE6)k!Nqt5^|`;} za?BuG4LnuHfaJ}7<V`b|kXPL-?d7Y8n{X{2#3%6_K86E*99TS$Ofmn(?_hVoF%JF( zwbbncvz3aVekl)N8NP@<egFT!Kp#AZ`X1jvjdU@68N~|J-zRY%{tETe`UYm=A5k;@ z0JS0?&v_lwxxR^-*ym_UN)siPJv{6TTS?c7xTDiIvUZlFf(_wNeRXhEFqqNTTRq@R zL=#arR^4GIov^hc7+O)y|B9d$stbo!RtEXY*k~t`)m!3rEHP>)-FVoFJn9S$IdQ9L zZqPF9C6aq0qpmmnfEyoaW=3qpvqzljEsi}Fw))(7(i`!dgk#D1;7$2B>r`H!6W<jb zwT2zbDlPXCPCRChITeZN6L$uE@@8$*bYRKud704&!P#+ZY~~etX6ZHwtPV*|cDEc@ zy-%)WFPBh#t<)`hTt2GLmg0t#gmUWS(}q0Rmy??vbu4epw(M~)T5MV$u}AE<yqwc5 zkA|zIEw?~UhjZkS+<^Qm+#qk|mP$|KQn{5|AybX_N<-e7pdB}@aVAf=rYkz?SY2*> z%ubrl#JJ}~9M4L4wv}*VyY026EAGaU(``*3`Q)*CB66rXT@E*oXMC}z6-^{u+362U z&)Q3}Grw7eS}NsCewDo4G9aM>OPX5C#4G5RldXRFprArB+6oKpD%SRB+n5te&K!%n zmXk=@6Sg&B?~S_B9H?2iS@#w%a8i2P1G2ubUZ&cY$@7IrWqU_sdfahh6H$BEm6tlI z<WNzQ<abWVxOHA$>#FkEa<%IPxmkSnj?QG1e3JI`sgnIZ`EY|J58d}`xzxQzJ}vc2 zr1WWd=fOc~EL$ggH*S;n${v@&O^4+l_fIV8AvW#b)`T~6EKX2k<#)@eo+TpXe!1RL zD(A`*@>FlWL@KVy5Bl~<T4j-3t|*a6f6H`xWwlQ}8R(sUy{g@pz0Hlx{FJpuouuno w_80BWdZ5Z@$<-~jlDBno(V*+atx<V1-!I#0{FyVaMBJET?Q)!9*;BLq|0oOYDF6Tf diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo index dc64a04b2a3f56b636ae496c46b7b0cfdfd01337..01d1916a61cf68d4dfb0a6c93c3184982bbc07d2 100644 GIT binary patch delta 5673 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 delta 4429 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 GX6xV9tiSmH diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index 4929de7a..34c8fb3c 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -20,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Nume de utilizator" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Parolă" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adresa de e-mail" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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 "" + +#: 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-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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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 "" + +#: 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 "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:67 msgid "An entry with that slug already exists for this user." msgstr "Există deja un entry cu același identificator pentru acest utilizator." @@ -195,33 +217,41 @@ msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență." msgid "You added the attachment %s!" msgstr "Ai anexat %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Setările pentru acest cont au fost salvate" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Ai deja o colecție numită \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Lucrezi pe colecția unui alt utilizator. Se recomandă prudență." @@ -237,15 +267,31 @@ 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.<br/>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 :(" msgstr "Scuze, nu recunosc acest tip de fișier :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Vezi pe <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID client" @@ -308,10 +354,25 @@ 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/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:87 +msgid "Add" +msgstr "Adaugă" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Formatul fișierului nu corespunde cu tipul de media selectat." @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Contul lui <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "Ieșire" + +#: 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 "Autentificare" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Contul lui <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Trimite fișier" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Creează colecție nouă" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Modifică setările contului" + +#: 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 "Panou de procesare media" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proiect <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "Publicat sub licența <a href=\"http://www.fsf.org/licensing/licenses/ag msgid "Image of goblin stressing out" msgstr "Imagine cu un goblin stresat" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Acțiuni" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Creează colecție nouă" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Modifică setările contului" - -#: 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 "Panou de procesare media" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Explorează" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Salut, bine ai venit pe acest site MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Acest site folosește <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un software excepțional pentru găzduirea fișierelor media." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creează un cont pe acest site</a>\n sau\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instalează MediaGoblin pe serverul tău</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Cele mai recente fișiere" @@ -540,6 +594,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 +606,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 "" + +#: 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 "Șterge definitiv" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format @@ -587,13 +662,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 "" + #: 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 +688,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 +711,7 @@ msgid "" msgstr "Poți lua un browser modern \n\tcapabil să redea această înregistrare de la <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Fișierul original" @@ -644,8 +723,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 +769,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 "" + #: 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<span class=\"whitespace other\" title=\"Tab\">»</span> 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Poți lua un browser modern\n<span class=\"whitespace other\" title=\"Tab\">»</span> capabil să redea această înregistrare de la <a href=\"http://getfirefox.com\">\n<span class=\"whitespace other\" title=\"Tab\">»</span> http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +msgstr "" -#: 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 +791,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 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +822,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 +831,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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "Fișierele lui %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "<p>❖ Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a></p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Poți folosi <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pentru formatare." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Adăugat la</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" -#: 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 "Creează o nouă colecție" @@ -886,27 +958,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 "" + +#: 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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" msgstr "În colecțiile (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Vezi pe <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Toate drepturile rezervate" @@ -972,45 +1041,60 @@ msgstr "Etichete" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Îmi pare rău, Dave, nu te pot lăsa să faci asta!</p><p>Ai încercat să faci o operație nepermisă. Ai încercat iar să ștergi toate conturile utilizatorilor?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Nu există nicio pagină la această adresă.</p><p>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 "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Poți folosi <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pentru formatare." + +#: 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 "" + +#: 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 +1102,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:159 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Verifică datele și încearcă din nou." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Ai șters acest fișier" -#: 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 "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:294 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:365 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:369 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:379 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:412 #, 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:419 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:429 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 5cb985ec96e466d119b0efcfded22e3ad5149776..8278bfb192503db924057198fc4d88aadd25bb43 100644 GIT binary patch delta 5657 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 MwmDfbcOdBe2e-XabN~PV delta 4565 zcmbW)c~n%_9l-HBGa#Tr1E}E2a}<Hdt`ZSZR9qs88ke|L)=|)55hfZ;bU;ney8BEM zO^nAXJ*Uy+AkPI9(Ylm0ZF=6cr!}b>HCmS@J*G|5ET&DrKi+ity9j*lz3;ud{O<3* z!Cen*yKdUNABP9Ls`$FjPk(;C>ms%Peq9e$Y5>(67>$oH1^abZY8+0-p12Kr;~@;j z7PR5d@Cm$xchJN%Jkdj`WTm|7K808sBA-;MfhWdc2KA0Gt3zA3QbE+C(19BE!y(A6 zDjS)TnvF7%d}Ive!4TYtk+>b@{zm`xQy9Vc>I#KGE_{UPcoU~$?+B%)VLpz;w^2H{ zh0^g~up2%`nOG2`OYpj(6T?vk9*J={1Le8ZD3PkefsC(Sqp%iFVH&3PvN|e3=Au?2 z-)cR-WCD9p25LmPehdTfJj#SF<3Kbq3Ljx#3}#emAB?g^6VNN6%B3J3EJE3<e3V>p zqpV;H%7cecw(0^($RD7r?C;nIqq#X9Gf=jy3Z>r{P$sqxnTy(j67hqP#9uBn(l7;& zV*-AI>u@O3zluk&2w!59VR#cqU^kW}NtunKumEduAIgLxNEAulL}Zs#F3LjkQ5L?w zAMq#u)OH$V&ki8ZstYJ9xP}s{J18Ol3?<}Wpmf-UFtK>m7iA);C|fie$zN535&;iN zWNT6Sdj(~@on8vkVKYicS5PK!9VNtHp*$GKG9-DzQ9{=rWo1r&Nl3F%I-Za6T)w|v zjuPS3C|k7w%kU`5bKYLWLy}||N(ggMR<I6b;2pRV-$04LFqSEyO+#7nbbiTwZj=?* zqV%`b-+lyTpyMc!=<xe1WXrwEN8vdx^wG!zT!k{z$U)Yz%f<xit5G6z7*nww7vbk9 zxsgjeWu@<;40Hwu<9W=*J2(lGX`GDDV}CjSZ4@eK_z1~6HFb!!f&!dFy%zKE1C)vM zkKrWXGnj;*qK18kTBjxx<EbyexwrxA@GA1gQww5ARNRb#jISP2Sc;EO_AZa*J8%gG zU;zfB3nj!AC^=Jy5^5baJccsB2N;O|K+;D!n2p@0VGw4ZJU<>g&;MKsa$_+*g>^U& zkK$Cc(Kr#O;nTPSv+?Jci9wvnjW`is!VctH<q)nZScQAA1znh%XywlFMB>jF%147_ z|6?RdDxA2E#tf91dr&&ujwG&XMTyu|Bz;sm%eLculztXs2v(u2cr8jqHu&A_zrG`x z_-Aq9bs9dgDfN3yr`}42(YN{>XJT}k6_HAm9Jzw>0=j{`wN?0V>(ee4WdiY-PJh{$ zLwyZ5=VBX5@&=EzKI}$&DQu_VBBPGOS;SY4-!8w0Fok+Ek{;@g-)^I<&x+wF6Iq75 zlhhl?8q{f&=kB8<ZBz!Im^cX~5-YF-y;T%yDf|vE<4oc%d)bqXmC(M9gRli-@DCV{ zYK(R6BX9*(4P^makz3R+QMMq6@Up8a45#BbOd&GckcE5Ixv|!}IG3k+$EZapGp@z{ z_!I1omrx?`8w|j2Q6lv{%KcAfTam~@nQ*ngz8B^BU-<nH<+=M9FX#Vj3bH58@m5E3 zk*KM9oP%fl?cFC>NtcO}Xy1>o;VqO7U*L!Y;}-0OdvGwmg%a|M{`z~^K>afu%lOKZ zWBvJM;Hx(Fp5B{iA3DW)!(GL-)YCYNlAQ105AZI2i4&f&j_s&v*0C(cKC~af7;HyL z(z{rX-=Hk`MKaRMwySq2bcO_bQ2!dcVlW%_6h<J4tj3~*x*Fr~AV%SPsNrptt+CIr zPDv03Q;)_{j6*r@yHS$#><r@12~wZZ5Q+oyteGcZKkAcFLRW;6<)xT_2T&&bKFUh3 z;S=~Jc0)U7RwmdTYw>B6=Z~Y@e-G!PnnnC0ao#MegL3Skz7{3RC(KsrWx0;e;Wd<y z4u954#)T*ot;a!l0F&`NN+cd(8vYGeV=M_J6M739G0Mv{CR1p~!x+eWcLn|w35x1D z-+J*B;h(6t;4M7NY-EczEwJ2)gQ@SwP1ufmapFSjmHZ*fX_~jl`mn1;(n@)6Q%I)} zzt~E;0z61PY>D-*K8}Z|N0M=g*ou?zK1vcL@*b8w%}0sQ7QBkLk*-v0zV&I>tH9c_ z)%bw+24u^<s;bcXv|Eo7vJEIJYd|@Edysro_b>y~imVX3aXj@mF%UmS4ew$s1{Pb% zmxxa4=_p&b5VO#W)8zc0qp**L;1X-Ee~d3tk8>%t92@aP3|&U%;}*=Y@joTJOg){{ zCK&25Zp4LUgdcC<ZhVvdl*lEmv=*=g2T=bJ<}toHL7^5MZtFv59ZD#Vp(Im4If;ZL zZ~_jgus-dUV>a~_7>P%55MIJw_(y;HW9&mcqSE?HDG`-3rpBoimgsl8pEgeQSZy<k z!h-EXi#=tP6*X#nNs0VuF>#(UkJ}Yrqj@T|;!3yM)p>*Nj%Y9j^qgeVd-V3|`+E1# zn|fae(JHGoS9xKXTd#_oZTvR!VSt`F;ET}W%Iaz!)5<EUp7-c82TnEK9@x`nT#cS% zGs*}3&^A%4T&8(SUD~oTx2r~5Q|2k9T2`aEDm>M-T8+z9E~6K@wDPi=nzD-JNt%}9 za=SbfwZe+pHHEcF#$TO_><+DKh(0qW(H3H?kGbH`OXG(a&GE%HW9qQAHse-8kX?5r zk8y-(njW2;qu)zfs=uF{VDwFivg;*jNk(H@gDo^IF*PkQEk#So7@ayw&lu6~KP{;v zN2iW33P<GHjgIuMY+cPGW|P@!p7m|j$B*l4L}eKE(357Xuim%8Y&KhbJN1st0WmGU z4Zdyv6GyXIGtZdq=2`xoG|%{6;m#d;XjY{0D08~aaAp14uHVZ3r~Yt!k`X;&y)Dx` zV4l>>bDd+I;E{7?yHr~`doif^>NQ4eqTXV*Y4WS{u9Ie)%uCN-78byGZF<vKr+#JP z7Na1iD#VzXciNU>?qQ-Q%@e-ebV$F}K#X?YZ1=rP{gi*`&R$v2_pbi>(q$v`xLID~ z%&b_u@$Iv>ZN|WPaSkuDlo>ITc3+)uD-ZfM{X0IIv}?ZYa?xzn%+p*r&${c)7Fh}d zwwuQ(H1Xs{8Pq)I+sZDRdkE%k%~!|$%`!oa%O|Lu_3h-Qwj^clmp(tK+hyb}_|Bo{ zFYc#rTI>xX{M>g^@46)0cz4OYKvE&va1{U9W(;<PIE-nfmmL{h$JA66R%pfU!kU^a z=bF+okBf$4msUwGRy(!M#LsfhEi7`5y?Ay^vfMpZ<4X^7_e^bON%iJ=rq<3_r<q<m zBU+nnEmV^vkXe}R3G9*XO?IaLe?yY31N4rSSM>1mrFL_V-Y|8j(N;dpq4!y}pbLB0 Q<lC%=jfpf4t*W&D3v%di)c^nh diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index f7ae7d29..1929ccef 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,82 +19,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Логин" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Пароль" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Адрес электронной почты" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса." @@ -194,33 +216,41 @@ msgstr "Вы редактируете файлы другого пользова msgid "You added the attachment %s!" msgstr "Вы добавили сопутствующий файл %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "Вы редактируете профиль пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "Неправильный пароль" -#: 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 "Настройки учётной записи записаны" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "У вас уже есть коллекция с названием «%s»!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "У этого пользователя уже есть коллекция с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "Вы редактируете коллекцию другого пользователя. Будьте осторожны." @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "Увы, я не поддерживаю этот тип файлов :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Посмотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "Добавить" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Неправильный формат файла." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Учётная запись <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Подтвердите ваш адрес электронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "завершение сеанса" + +#: 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 "Войти" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Учётная запись <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Добавить файлы" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Создать новую коллекцию" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Изменить настройки учётной записи" + +#: 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 "Панель обработки файлов" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, проекте <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "Он опубликован на условиях <a href=\"http://www.f 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Смотреть" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Привет! Добро пожаловать на наш MediaGoblin’овый сайт!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Этот сайт работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, необыкновенно замечательном ПО для хостинга мультимедийных файлов." -#: 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 "Для добавления собственных файлов, комментирования и т. п. вы можете представиться с помощью вашей MediaGoblin’овой учётной записи." -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "У вас её ещё нет? Не проблема!" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Создайте учётную запись на этом сайте</a>\n или\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">установите MediaGoblin на собственный сервер</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Самые новые файлы" @@ -539,6 +593,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 +605,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +687,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 +710,7 @@ msgid "" msgstr "Вы можете скачать современный браузер, \n\tспособный проиграть это аудио, с <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Исходный файл" @@ -643,8 +722,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 +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 "Сожалеем, этот ролик не проиграется, ⏎\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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Вы можете скачать современный браузер,\n<span class=\"whitespace other\" title=\"Tab\">»</span> способный воспроизводить это видео, с <a href=\"http://getfirefox.com\">\n<span class=\"whitespace other\" title=\"Tab\">»</span> http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +790,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 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s пользователя <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +821,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 +830,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 "" + +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 +#, python-format +msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "Файлы %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Файлы пользователя <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a>" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Для разметки можете использовать язык <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Добавлено</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 в коллекцию" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "Добавление новой коллекции" @@ -885,27 +957,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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "В %(collected)s коллекциях" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Посмотреть на <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Все права сохранены" @@ -971,45 +1040,60 @@ msgstr "Метки" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Для разметки можете использовать язык <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." + +#: 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 +1101,69 @@ msgstr "Примечание" msgid "commented on your post" msgstr "оставил комментарий к вашему файлу" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуст." -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "Необходимо выбрать или добавить коллекцию" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» — уже в коллекции «%s»" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "Вы удалили файл." -#: 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 "Файл не удалён, так как вы не подтвердили свою уверенность галочкой." -#: 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 "Вы на пороге удаления файла другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "Вы исключили файл из коллекции." -#: 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 "Файл не исключён из коллекции, так как вы не подтвердили своё намерение отметкой." -#: 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 "Вы на пороге исключения файла из коллекции другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Вы удалили коллекцию «%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 "Коллекция не удалена, так как вы не подтвердили своё намерение отметкой." -#: 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 "Вы на пороге удаления коллекции другого пользователя. Будьте осторожны." diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo index d84b09c4ef6747d877aa3862fc5617333511db0e..e014501541cc9e248ab8f39662e34474369849e4 100644 GIT binary patch delta 5675 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 EPa=pjG5`Po delta 4496 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 QtF<+x-c6+5O{=W`0+;vF%K!iX diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index b866501e..9bfe5af4 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +180,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Položku s rovnakou unikátnou časťou adresy už niekde máš." @@ -198,33 +220,41 @@ msgstr "Du er ved at ændre en anden brugers' medier. Pas på." msgid "You added the attachment %s!" msgstr "Príloha %s pridaná!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Kontoindstillinger gemt" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Du har allerede en samling ved navn \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 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,15 +270,31 @@ 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.<br/>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 :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Zobraziť na <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Klientské ID" @@ -311,10 +357,25 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nj <strong>požadované</str 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/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:87 +msgid "Add" +msgstr "Pridať" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." @@ -323,56 +384,70 @@ 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 "Kolekcia \"%s\" pridaná!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin logo" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Účet používateľa <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "odhlásiť sa" + +#: 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 "Log ind" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Účet používateľa <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Pridať výtvor" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Vytvoriť novú zbierku" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Zmeniť nastavenia účtu" + +#: 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 "Sekcia spracovania výtvorov" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Poháňa nás <a href=\"http://mediagoblin.org\">MediaGoblin</a>, súčasť projektu <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -384,52 +459,31 @@ msgstr "Vydané pod <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.htm msgid "Image of goblin stressing out" msgstr "Obrázok hysterického goblina" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Úkony" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Vytvoriť novú zbierku" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Zmeniť nastavenia účtu" - -#: 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 "Sekcia spracovania výtvorov" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Udforsk" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hey, velkommen til denne MediaGoblin side!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin</a>, výnimočne skvelý kus softvéru na hostovanie médií." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -437,7 +491,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Vytvoriť účet na tejto stránke</a>\n alebo\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Založiť MediaGoblin na vlastnom serveri</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Najčerstvejšie výtvory" @@ -543,6 +597,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 +609,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +665,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 +691,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 +714,7 @@ msgid "" msgstr "Môžeš získať moderný prehliadač, ktorý\n\ttento zvuk hravo prehrá <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Originálny súbor" @@ -647,8 +726,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 +772,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<span class=\"whitespace other\" title=\"Tab\">»</span> tvoj webový prehliadač nepodporuje HTML5 \n<span class=\"whitespace other\" title=\"Tab\">»</span> 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Môžeš získať moderný prehliadač, ktorý \n<span class=\"whitespace other\" title=\"Tab\">»</span> vie prehrať toto video na <a href=\"http://getfirefox.com\">\n<span class=\"whitespace other\" title=\"Tab\">»</span> http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +794,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 +810,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s od <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +825,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 +834,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -783,51 +861,45 @@ msgstr "Výtvory, ktoré vlastní %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Výtvory, ktoré vlastní <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Prezeranie výtvorov podľa <a href=\"%(user_url)s\">%(username)s</a>" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Môžeš využiť <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pre formátovanie." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Pridané</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "Pridať novú kolekciu" @@ -889,27 +961,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..." @@ -925,22 +1001,15 @@ msgid "In collections (%(collected)s)" msgstr "V kolekciách (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Zobraziť na <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Všetky práva vyhradené" @@ -975,45 +1044,60 @@ msgstr "Označené ako" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Prepáč Hocikto, toto nesmieš!</p><p>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!</p><p>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áč!</p><p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Môžeš využiť <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pre formátovanie." + +#: 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 +1105,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:159 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:165 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol zaslaný!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Prosím skontroluj svoje položky a skús znova." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: 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 "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie." -#: 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 "Chystáš sa odstrániť výtvory niekoho iného. Dbaj na to." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 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:369 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:379 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:412 #, 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:419 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:429 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 1599b039f01bbcf88dc4a8d2141227fba91442ee..e50892891800946072e038407cc5d2b8ebc6d273 100644 GIT binary patch delta 5616 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 Mi-#mC7N+|C0n4f+Y5)KL delta 4196 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 diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index aa482e0c..081c3608 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Uporabniško ime" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Geslo" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "E-poštni naslov" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Vnos s to oznako za tega uporabnika že obstaja." @@ -194,33 +216,41 @@ msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napačna datoteka." @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Prijava" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Dodaj vsebino" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "Podokno obdelovanja vsebine" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "" 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 "Podokno obdelovanja vsebine" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -539,6 +593,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +661,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 +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 "" @@ -631,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 "" @@ -643,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 "" @@ -689,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -733,12 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -762,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -885,27 +957,31 @@ msgstr "Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko <a hr msgid "Here's a spot to tell others about yourself." msgstr "Na tem mestu lahko drugim poveste nekaj o sebi." -#: mediagoblin/templates/mediagoblin/user_pages/user.html: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 "Uredi 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 "Ta uporabnik še ni izpolnil svojega profila." -#: 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 "Prikaži vso vsebino uporabnika %(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 bo prikazana vaša vsebina, a trenutno še niste dodali nič." -#: 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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" msgstr "" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" msgstr "Ikona vira" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" msgstr "Ikona 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -971,45 +1040,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1101,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo index 64880aedb5fdc5af76057999b9d94212969c54ee..2f7501a6521aeb7b1ebe4d5cac7d7df5a14401a4 100644 GIT binary patch delta 5686 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 KW1HJr9sd9ln?AY# delta 4359 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 Tz2%u{5!QFlO|lDD))@Z-+V7f0 diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 2911f34e..6679e49f 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -20,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Emër përdoruesi" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Fjalëkalim" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Adresë email" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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:67 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." @@ -195,33 +217,41 @@ msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë." msgid "You added the attachment %s!" msgstr "Shtuat bashkangjitjen %s!" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "Rregullimet e llogarisë u ruajtën" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "Keni tashmë një koleksion të quajtur \"%s\"!" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 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:344 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,15 +267,31 @@ 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.<br/>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 :(" msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Shiheni te <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID klienti" @@ -308,10 +354,25 @@ msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është <strong>e msgid "This field is required for public clients" msgstr "Kjo fushë është e domosdoshme për klientë publikë" -#: mediagoblin/plugins/oauth/views.py:60 +#: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" msgstr "Klienti {0} u regjistrua!" +#: 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:87 +msgid "Add" +msgstr "Shtoni" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Llogaria e <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "dilni" + +#: 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 "Hyni" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Llogaria e <a href=\"%(user_url)s\">%(user_name)s</a>" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Shtoni media" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Krijoni koleksion të ri" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "Ndryshoni rregullime llogarie" + +#: 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 "Paneli i Përpunimit të Medias" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "Bazuar në <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një projekt <a href=\"http://gnu.org/\">GNU</a>." -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "Hedhur në qarkullim sipas <a href=\"http://www.fsf.org/licensing/licens msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Veprime" - -#: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Krijoni koleksion të ri" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Ndryshoni rregullime llogarie" - -#: 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 "Paneli i Përpunimit të Medias" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Eksploroni" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ky site përdor <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një program jashtëzakonisht i shkëlqyer për strehim mediash." -#: mediagoblin/templates/mediagoblin/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 "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:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Krijoni një llogarin te ky site</a>\n ose\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instaloni dhe rregulloni MediaGoblin-in te shërbyesi juaj</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Mediat më të reja" @@ -540,6 +594,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 +606,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +662,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 +688,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 +711,7 @@ msgid "" msgstr "Një shfletues web modern që mund të luajë \n\taudion mund ta merrni te <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Kartela origjinale" @@ -644,8 +723,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 +769,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Një shfletues web modern që \n\t mund ta luajë këtë video mund ta merrni te <a href=\"http://getfirefox.com\">\n\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +791,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 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s nga <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +822,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 +831,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "Media nga %(username)s" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Media nga <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Po shfletoni media nga <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Për formatime mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Shtuar më</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "Shtoni një koleksion të ri" @@ -886,27 +958,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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" msgstr "Te koleksionet (%(collected)s)" #: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Shiheni te <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Tërë të drejtat të rezervuara" @@ -972,45 +1041,60 @@ msgstr "Etiketuar me" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Më ndjeni or trim, nuk ju lë dot ta bëni këtë!</p><p>Provuat të kryeni një funksion që nuk lejohet. Keni provuar prapë të fshini krejt llogaritë e përdoruesve?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Nuk duket se ka ndonjë faqe në këtë adresë. Na ndjeni!</p><p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Për formatime mund të përdorni <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>." + +#: 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 +1102,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:159 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:165 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "Ju lutemi, kontrolloni zërat tuaj dhe riprovoni." + +#: mediagoblin/user_pages/views.py:229 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:241 #, 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:258 #, 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:279 msgid "You deleted the media." msgstr "E fshitë median." -#: 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 "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:294 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:365 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:369 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:379 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:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%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 "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:429 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 dd67d3419a60622ddc37bc935fe2b45a0b6ff274..4af77439dd682ab09048e873ddd85607165e3208 100644 GIT binary patch delta 5561 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 delta 4177 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 Z|7j^Mt12!HwUw4d{6A{{6SWlAzX1-XOqu`y diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 32e7d3d9..0c8eca57 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:11+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +175,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -193,33 +215,41 @@ msgstr "" msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -235,15 +265,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -306,10 +352,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -318,56 +379,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -379,52 +454,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -432,7 +486,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -538,6 +592,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 +604,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +660,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 +686,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 +709,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 +721,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 +767,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +789,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 +805,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +820,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 +829,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -778,51 +856,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -884,27 +956,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..." @@ -920,22 +996,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -970,45 +1039,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1100,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo index e4586d5013705b43f62cee210d8c28ed5cf095b4..683ffa33b320af202615452d69e7c08e643fb46e 100644 GIT binary patch delta 5607 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 Zn|{zyEOBqHExqt8x=)q#cVDeN_fLM!8z2Ax delta 4198 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 Cep845 diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index d288feac..ed8bfdd8 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:11+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "Användarnamn" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "Lösenord" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "E-postadress" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +177,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "Ett inlägg med det sökvägsnamnet existerar redan." @@ -195,33 +217,41 @@ msgstr "Var försiktig, du redigerar någon annans inlägg." msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 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:205 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:242 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:253 +msgid "Account settings saved" +msgstr "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -237,15 +267,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -308,10 +354,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." @@ -320,56 +381,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "Logga in" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Lägg till media" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "Mediabehandlingspanel" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -381,52 +456,31 @@ msgstr "" 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 "Mediabehandlingspanel" - -#: mediagoblin/templates/mediagoblin/root.html:51 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "Utforska" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hej, välkommen till den här MediaGoblin-sidan!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 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:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "Senast medier" @@ -540,6 +594,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 +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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +662,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 +688,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 +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 "" @@ -644,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 "" @@ -690,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -734,12 +807,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +822,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 +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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -780,51 +858,45 @@ msgstr "%(username)ss media" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -886,27 +958,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..." @@ -922,22 +998,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -972,45 +1041,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 +1102,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "Du tänker radera en annan användares media. Var försiktig." -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo index 5009e3713dee849049073baa884f94d27b985809..f021546bf3f5c607bf5c28fea227ecd06264b22e 100644 GIT binary patch delta 5564 zcmeIzdvH|c8OQN=1Cfv*mk2=uA%`F&F?S#VA_@V8R00G-K(Hd4-4k<~z1Te)(?nru zt%5BTbVaZQ6|GgYDs>rJ?@%j_igm0rI#Vs;Wz?#rr5AB3wf+9~Y)ARS{?k9|A9W(1 z_nbZFeV_Mvo_F`;J-+Am`w~a;2W~U`_Ywb(<NvD$>FV?UULR^q5tqNiV*C_qaqKW- zW@8H$;$|F)cVhuQhB^2$`tWref=BRe{1B%YlQ1t1H>RE&StE?8!5LVJUAU1qx8h8$ z&pgAMco`1h+Cg45VLTnzqXO8B#AtToVBCwN@e$PXzsY?5HkPx#`7;Cl%sAf8##(H^ z25iPKUWofqf%-;y6HP}g(2RMw3>DZK%*PJA1$*!`97bA7umBa%Oe|x4vy_1*>c?FC zF7ju#@Q<qT6C95ZU_ZWq<=D(DnmC49un$?wY)0+$j?CvNB#Gt`)N_Y%AijYKMg9&0 zE$}Bi6NmASYFdW6KMz&Q4peHpQ4{o|YMMax&Sqo^vj_FwK~yP^qDquAhB>hS`7^V} zkpBh-tGLomx1uKAfeLIFYDarerFk-Q|7l#n^-EZZV~BPg&c|2rSJ;6&#~M?C|HNrn zL6mCZwKxMej3fW+89dC5KAb_TGpBh7)%Az@N4@a@YDb@;GEl_DM65*Bv=x;x7qyY= zQK`NemAO5rQazNp|1fIa!wCkI(;P)bb^=wq(OjrzWvGlaqEbB@HDL>C;dazQ-$Kpv zeN-TKAXzt$qf-A0>iu_6y>=Xx(Zr_=v{RqurMeikKt1Zk^D@^hsFJj!YUoD?zlSQ( zUr`I@PB3OJPDG`+6Sbk+Pyy`4E%-Q+k%U>qHk9(^NGv9TdhmKw27ZK^`2NiOL#PE` zMrG#r8IR#guK$8};X>-8K#yZR7M|txN-HWu>#$Dee+Prr+;|QHIBAl%)9Y{`*V~Xe z%nxxPK7kit?qnJcTT$J=9V568bqXfZ`U?CUY{TWa81KPKJb}Ae-<(C5)p!Uk{2OY* z0uH&(`P7V;AZweAxE$}t4VZPd_sw}VuH`y~Q*b1$pN$J}4K6~J^rtugAHjrn_ymI- zd<vEF!>Fb@g4)4xv@n;j^%Y%#n)qT=pnlYI>v0fnN4<X=>a;wB>al~U=ifkLG$$*` ze>;QHD(|ay9nRzW5KhNj(lQ6<;yHLVUWHHMH8_iCh|T;GRib0K0P|~&xe-^RjekJ( zR$HByQ5SVucGZ!8%4PO(qY+<2?WBPGF*G%(1^k$gKS1r|c2r8AKuugUl``PDsEOy` zU|fmHh#!?PCu218c~64DxqKjZ_&64*1y<0qnmCRGZ*Icb_%y0}vm3l$I}5d7J*tE) z$TX%Mhu}(l8-qx!rkS)dg}D+{%EZqY(1_+u)X(kU8Q#zB4KuxopGP&zTR0rwMK#e0 z9EsVaZ73F^c3h65aVqNhg_+O4j`XYP#xrmml97bj!+_w-gV>Dk;)Pg4!4+vgYNEZU z1rA~!K936QRm{iN@D@CVV{y|g?;G;RsDPe94wiWXHBSy{&(-<QXHdY6B2=xWA>YDg z7WU)CsK{Tz)6ksfEjS2Aaao88uom@s6OO=URA8%7r!0&LJci?OJ)X(>W*38LxIgp3 zhp1ZSQgEgA4AcZAsG64IIGl#s*-{*j4yu%!kON}&VtU6ohU=U;UZzV>8(oFz^Y3S% z$U1Q`#!%gQ5Ox0<T!1elN7syP@_ufc@l~!5VF%ti*E=n~dESPqu$cQDNL!ij;Cg%% z`>^qR@~_DDo$q!1uTjnM5o$;Jo>c~laUxb@2`<Az>_P2hD=O7HP?@_ARf>H`JD5jN z^PWJJI&Z!gSjqf^SG&2~P|ezKAlj%@e*-mPFKXcpsD<uCO|%~s$P1|NjrUQf!$-RG z{xDRtjl*o5j73<9>YWP{479*n)Qb*kqFz+$x1wse6CHdS^<qu4_uK_Y*3BAJig%-$ z@wcb|KEy5f37&?VzUKA97F1~xdl;zso<(KgGgJV>IfI&@9JOErDl;t^m*PsUSKwXv z0G8qMh2F7Uhm~BXP#HRkb@(Z+#;TU|uWiC?Vvxs;k5CJIf~xgDkY~+=Mc&VC7|E_l zp}PO?7{SqWtWLqTsK9T<HvBpAXY!VKfvm>eTyMl`EN|718uh=3fhO$3a=ba?0i4A3 z2dJOh;Y+DM+E|0{;#w?N=6$vHqB3<auE7I%Iu;Yn0IWi7unyHr4LE}J%_;`@*p1r3 zdbDsmYN21Cn&*8~pvO?p<q_2&JPY-HB@V^es3u#CdOn0_<8|1M`;c}pxm+aXF=%5j z9k=5gd=YhQhOh8`Zd>pguAjvUTteYhqAQVpG`Hc6_#WEWf05T*M^PCytGv^4HcsZU z2^+C%75Udr?&OA=<1y3%$51;eq*Jt$DpX1rqPq58%);kT$M6LljPIZ_atxKRk29Xk ze4cf&_iH-@P01v;#7f5N9!|~~n(K2@MN_Wz4GBa;Av+Lvq7m05AE+r!-99xhD=QdG zzEr=lEEu%j+OTs{S=bIb{!8OdJY<)<Z*ACR#iN$r`ux?@iiQQg#N1f4*R{WJ+copr zmd)ozwA-<*NHlI;9<yCL60f$FcR8-bUpVT<t&r1ghx)8|mu>NRPbh9hJJa*0-|GlP z1KoDaipDHA8s_srSM{upSj~Bh{N1+Y_QY(3bGcm=3p?@jB(5EgJCVy=P2(-@TAjQe z*P_8_*zZKDler@|BoiYGv%_HmN}fC8spR09OLN10mOl`P_C(^T`$iofI4$1gk6Six zge-qBNOZ1M7Vxu6w&6N)=L&m5x%LsWFLT_u9kYX$Ke?x&IeAOr#}lsbhn%3*?h<^& zAGWoFQ>Lm;?i|}Z+zBw1t<-e#ek723bL?o}=%$`{mlX&(1jimCkxY$}jZMADaM6*O zK|5r}ZL3F<mrg2^muiu6x76}Sh$0jssE|KSMCtO?1fuD!rkcjz<VzJ<?O6kIEh~9^ zepQxbrHU6E7%)B<wcT`?;>zqPq1tYBa^>V&tJASVK_>oYk3%w8>D0%nQ{SHK_-d8s zUWW)eY^yKY6SIPLr(bmqWi}g)SUs1AqW+-j5_VJXm9F!Rv)xK&Ch$I<Pw(yv)yP>q zI4k+bic69&RumI(azyJavADG~*-}|q7>)22T^je+i}prHXtdJ_*{MinNmi8=u}K7d zLM}U<SUBA$=~d`_^+`I+OzD$#ZBtKQ@`VbxsWolmeaTm9qV-d&YNu4y)?0P;jdctf zYHM>_msBmYuW(#usyd&9H(FC_>;C=RlscYE_1C6+|37t{x}DRv{l`<6yl>PcsRw7~ oWdBc2-pSc>zVzg!8k=n2e|79Ce8~gzZuqJly+F&|U;U%^FOCukG5`Po delta 4180 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 YW|6%!*8e$ktyb_v<Dm6lWNfPS4<Z>+^8f$< diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po index 44a7bf44..010d8a8f 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "వాడుకరి పేరు" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "సంకేతపదం" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "ఈమెయిలు చిరునామా" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +176,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -194,33 +216,41 @@ msgstr "" msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -236,15 +266,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -307,10 +353,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -319,56 +380,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -380,52 +455,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -433,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -539,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 @@ -546,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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 "" @@ -608,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 "" @@ -631,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 "" @@ -643,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 "" @@ -689,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +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" @@ -733,12 +806,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +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?" @@ -762,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -779,51 +857,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -885,27 +957,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..." @@ -921,22 +997,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -971,45 +1040,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1101,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo index 7b1c154cbe52adac095f44a17c8283ccab9e787a..8f8a49bb866642172350de6a0789371affcc150e 100644 GIT binary patch delta 5557 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 delta 4165 zcmeIzi&K=>8OQOnAOc0S!5|0-Z&fY|2yB6HQx`!+K?M||3<Gl6#5LUNuG+OBi#iib zQncfmG>yrmlrV{j>5SQ$n9Ec<iM2C{(<GgiajG>9ow1pAw5hF0N0avZ^WACxi89N6 z&U@bX+@ABCcSlY;UVG6I_(Q^sCk=m>`A_5j&P-kX@9%QFF$=i7f*E)l3o&)JF)OhF z@5S%qJRHXuJcADW1<t~EaT-5FC;n`XF$Km1%ry$xR3v@Vm{D4+#B#1L++%m>NH8Xv z>tu{X3sZ41@~Ckkb23e+iF6`k7$3&sK}^Ci)bo?!`>*3%#y96FL~-L1mf}^c!+CR! zS&yAqf-j>w_ypDQ=NN~#Q4@=1bOkRC7h(cx;1bNi4XAc|P>~wJbjCM7q_7WPM<*5~ z+8y;Gb1@GgAM*%bn!qvCK$EEZCvgUzMNQ~EOveu~8E;?;#xSbt7ooOj6$TWldJ5{G z4YgODs9fknt>7_K!*SGBokNBE�B%!ugoN!=+e`+Oi>3zu!eoY#5n~c?=ct=aY!P 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 L|9FMtmF)NrR>VXh diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index 5a47ef7c..acb727ce 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -18,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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +175,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "" @@ -193,33 +215,41 @@ msgstr "" msgid "You added the attachment %s!" msgstr "" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "" -#: 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 "" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -235,15 +265,31 @@ 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.<br/>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 :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "" @@ -306,10 +352,25 @@ 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/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:87 +msgid "Add" +msgstr "" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "" @@ -318,56 +379,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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:59 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "" + +#: 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 "" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "" + +#: 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 "" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -379,52 +454,31 @@ msgstr "" 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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: 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 "" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -432,7 +486,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "" @@ -538,6 +592,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 +604,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +660,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 +686,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 +709,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 +721,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 +767,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 +789,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 +805,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 +820,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 +829,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -778,51 +856,45 @@ msgstr "" msgid "<a href=\"%(user_url)s\">%(username)s</a>'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 <a href=\"%(user_url)s\">%(username)s</a>" 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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 "" - -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 -msgid "+" +msgid "Add “%(media_title)s” to a collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +msgid "+" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 msgid "Add a new collection" msgstr "" @@ -884,27 +956,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..." @@ -920,22 +996,15 @@ msgid "In collections (%(collected)s)" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "" @@ -970,45 +1039,60 @@ msgstr "" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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 +1100,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "" -#: 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 "" -#: 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 "" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: 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 "" -#: 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 "" diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo index 13346b7ce50ce101b598eaa15b84800c42b0280c..54864829c16d95a264ca23bc6a30ad43e5afdf86 100644 GIT binary patch delta 5673 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 F{S7PCD763p delta 4253 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 diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index 4a722732..00ff84ff 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-05 15:12-0600\n" +"PO-Revision-Date: 2013-02-05 21:12+0000\n" "Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\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:29 +msgid "Invalid User name or email address." +msgstr "" + +#: mediagoblin/auth/forms.py:30 +msgid "This field does not take email addresses." +msgstr "" + +#: mediagoblin/auth/forms.py:31 +msgid "This field requires an email address." +msgstr "" + +#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" msgstr "使用者名稱" -#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45 +#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 msgid "Password" msgstr "密碼" -#: mediagoblin/auth/forms.py:34 +#: mediagoblin/auth/forms.py:61 msgid "Email address" msgstr "Email 位址" -#: mediagoblin/auth/forms.py:51 +#: mediagoblin/auth/forms.py:79 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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,26 +178,34 @@ 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:67 msgid "An entry with that slug already exists for this user." msgstr "這個簡稱已經被其他人用了" @@ -196,33 +218,41 @@ msgstr "您正在修改別人的媒體，請小心操作。" msgid "You added the attachment %s!" msgstr "您加上了附件「%s」！" -#: mediagoblin/edit/views.py:181 +#: mediagoblin/edit/views.py:183 +msgid "You can only edit your own profile." +msgstr "" + +#: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." msgstr "您正在修改別人的個人檔案，請小心操作。" -#: mediagoblin/edit/views.py:197 +#: mediagoblin/edit/views.py:205 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:242 msgid "Wrong password" msgstr "密碼錯誤" -#: 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 "帳號設定已儲存" + +#: mediagoblin/edit/views.py:287 +msgid "You need to confirm the deletion of your account." +msgstr "" + +#: 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 "您已經有一個稱做「%s」的蒐藏了！" -#: mediagoblin/edit/views.py:291 +#: mediagoblin/edit/views.py:327 msgid "A collection with that slug already exists for this user." msgstr "這個使用者已經有使用該簡稱的蒐藏了。" -#: mediagoblin/edit/views.py:308 +#: mediagoblin/edit/views.py:344 msgid "You are editing another user's collection. Proceed with caution." msgstr "您正在修改別人的蒐藏，請小心操作。" @@ -238,15 +268,31 @@ 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.<br/>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 :(" msgstr "抱歉，我不支援這樣的檔案格式 :(" -#: mediagoblin/media_types/video/processing.py:35 +#: mediagoblin/media_types/video/processing.py:36 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上觀看" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "客戶 ID" @@ -309,10 +355,25 @@ 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/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:87 +msgid "Add" +msgstr "增加" + #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別！" @@ -321,56 +382,70 @@ 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的帳號" - -#: mediagoblin/templates/mediagoblin/base.html: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:59 msgid "Verify your email!" msgstr "確認您的電子郵件" -#: mediagoblin/templates/mediagoblin/base.html:73 +#: mediagoblin/templates/mediagoblin/base.html:60 +#: mediagoblin/templates/mediagoblin/base.html:79 +msgid "log out" +msgstr "登出" + +#: 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 "登入" -#: mediagoblin/templates/mediagoblin/base.html:87 +#: mediagoblin/templates/mediagoblin/base.html:73 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的帳號" + +#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "新增媒體" + +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "新增新的蒐藏" + +#: mediagoblin/templates/mediagoblin/base.html:89 +msgid "Change account settings" +msgstr "更改帳號設定" + +#: 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 "媒體處理面板" + +#: mediagoblin/templates/mediagoblin/base.html:117 msgid "" "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " "href=\"http://gnu.org/\">GNU</a> project." msgstr "基於 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 一項 <a href=\"http://gnu.org/\">GNU</a> 專案。" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:120 #, python-format msgid "" "Released under the <a " @@ -382,52 +457,31 @@ msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">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 +#: mediagoblin/templates/mediagoblin/root.html:24 msgid "Explore" msgstr "探索" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:26 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "嘿！歡迎來到 MediaGoblin 站台！ " -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:28 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 與眾不同的媒體分享網站。" -#: 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 "您可以登入您的 MediaGoblin 帳號以進行上傳媒體、張貼評論等等。" -#: mediagoblin/templates/mediagoblin/root.html:58 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Don't have one yet? It's easy!" msgstr "沒有帳號嗎？開帳號很簡單！" -#: mediagoblin/templates/mediagoblin/root.html:59 +#: mediagoblin/templates/mediagoblin/root.html:32 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">在這個網站上建立帳號</a>\n 或是\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">在自己的伺服器上建立 MediaGoblin</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:40 msgid "Most recent media" msgstr "最新的媒體" @@ -541,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 @@ -548,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:161 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 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:182 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:86 #: 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 +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 的個人檔案" @@ -610,7 +689,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 +712,7 @@ msgid "" msgstr "您可以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> 取得可以播放此聲音的瀏覽器！" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "原始檔案" @@ -645,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 的照片" @@ -691,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 "抱歉，此影片無法使用，因為您的瀏覽器不支援 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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "您可以在 <a href=\"http://getfirefox.com\">http://getfirefox.com</a> 取得可以播放此影片的瀏覽器！" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +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 +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" @@ -735,12 +808,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" #: 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 +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?" @@ -764,6 +832,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -781,51 +859,45 @@ msgstr "%(username)s的媒體" msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ 瀏覽 <a href=\"%(user_url)s\">%(username)s</a> 的媒體" -#: 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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "您可以用 <a href=\"http://markdown.tw\">Markdown</a> 來排版。" - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>加入日期</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 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: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 "新增新的蒐藏" @@ -887,27 +959,31 @@ msgstr "如果您就是本人但是掉了認證信，您可以 <a href=\"%(login 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..." @@ -923,22 +999,15 @@ msgid "In collections (%(collected)s)" msgstr "在蒐藏 (%(collected)s)" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 +#: mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" msgstr "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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "在 <a href=\"%(osm_url)s\">OpenStreetMap</a> 上觀看" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "版權所有" @@ -973,45 +1042,60 @@ msgstr "標籤" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Dave 對不起，我不能讓你這樣做！</p><p>您正在試著操作不允許您使用的功能。您打算刪除所有使用者的帳號嗎？" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "不好意思，看起來這個網址上沒有網頁。</p><p>如果您確定這個網址是正確的，您在尋找的頁面可能已經移動或是被刪除了。" -#: 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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "您可以用 <a href=\"http://markdown.tw\">Markdown</a> 來排版。" + +#: 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 +1103,69 @@ msgstr "加註" msgid "commented on your post" msgstr "在您的內容張貼評論" -#: mediagoblin/user_pages/views.py:156 +#: mediagoblin/user_pages/views.py:159 msgid "Oops, your comment was empty." msgstr "啊，您的留言是空的。" -#: mediagoblin/user_pages/views.py:162 +#: mediagoblin/user_pages/views.py:165 msgid "Your comment has been posted!" msgstr "您的留言已經張貼完成！" -#: mediagoblin/user_pages/views.py:230 +#: mediagoblin/user_pages/views.py:190 +msgid "Please check your entries and try again." +msgstr "請檢查項目並重試。" + +#: mediagoblin/user_pages/views.py:229 msgid "You have to select or add a collection" msgstr "您需要選擇或是新增一個蒐藏" -#: mediagoblin/user_pages/views.py:238 +#: mediagoblin/user_pages/views.py:241 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "「%s」已經在「%s」蒐藏" -#: mediagoblin/user_pages/views.py:253 +#: mediagoblin/user_pages/views.py:258 #, 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:279 msgid "You deleted the media." msgstr "您已經刪除此媒體。" -#: 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 "由於您沒有勾選確認，該媒體沒有被移除。" -#: 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 "您正在刪除別人的媒體，請小心操作。" -#: mediagoblin/user_pages/views.py:370 +#: mediagoblin/user_pages/views.py:365 msgid "You deleted the item from the collection." msgstr "您已經從該蒐藏中刪除該項目。" -#: 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 "由於您沒有勾選確認，該項目沒有被移除。" -#: 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 "您正在從別人的蒐藏中刪除項目，請小心操作。" -#: mediagoblin/user_pages/views.py:417 +#: mediagoblin/user_pages/views.py:412 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%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 "由於您沒有勾選確認，該蒐藏沒有被移除。" -#: 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 "您正在刪除別人的蒐藏，請小心操作。" From 657a4637999cdf247bf71b5074e41af59b8bd8a2 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Thu, 7 Feb 2013 00:31:37 +0100 Subject: [PATCH 052/130] Use system wide EXIF package, if available. Created and tested by Simon Fondrie-Teitler. Thanks! --- mediagoblin/tools/exif.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 4a1afb0f..ab3f77f0 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 <http://www.gnu.org/licenses/>. -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 _ From 9d7c69fb74283d15589d8ed970d5b3bd1cfee2f0 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Thu, 7 Feb 2013 22:35:42 +0100 Subject: [PATCH 053/130] Use logging.config.fileConfig() Instead of the monster I had built before. --- mediagoblin/init/celery/from_celery.py | 43 ++------------------------ 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 41fffa45..29037d10 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 @@ -40,45 +39,7 @@ def setup_logging_from_paste_ini(loglevel, **kw): 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) From 93b14fc300618e8b2c4ebfd54b9c59369ce0f417 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Wed, 23 Jan 2013 19:44:28 +0100 Subject: [PATCH 054/130] Implement ProcessingState class and use for images The idea is to have a class that has the knowledge of the currently being processed media and also has tools for that. The long term idea is to make reprocessing easier by for example hiding the way the original comes into the processing code. --- mediagoblin/media_types/image/processing.py | 16 +++++------ mediagoblin/processing/__init__.py | 31 +++++++++++++++++++++ mediagoblin/processing/task.py | 9 ++++-- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 99be848f..541e5109 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, \ @@ -95,21 +94,21 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_image(entry, workbench=None): +def process_image(entry): """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. """ + proc_state = entry.proc_state + 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 @@ -147,8 +146,7 @@ def process_image(entry, workbench=None): mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) # 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', {}) diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index e2bc1a13..738378b8 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -74,6 +74,37 @@ class FilenameBuilder(object): ext=self.ext) +class ProcessingState(object): + def __init__(self, entry): + self.entry = entry + self.workbench = None + self.queued_filename = None + + # Monkey patch us onto the entry + entry.proc_state = self + + 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 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..8614c673 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'](entry) # 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 ;) From e38279263704bb99d17f20e66cd4b5ab06a1c459 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Thu, 24 Jan 2013 10:23:38 +0100 Subject: [PATCH 055/130] ProcessingState: Document monkey patching. --- mediagoblin/processing/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 738378b8..1760d0b9 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -81,6 +81,16 @@ class ProcessingState(object): self.queued_filename = None # Monkey patch us onto the entry + # This is needed to keep the current calling convention + # for processors: + # def process_FOO(entry): + # proc_state = entry.proc_state + # workbench = proc_state.workbench + # When all processors use the new stuff, they should be + # rewritten: + # def process_FOO(proc_state): + # entry = proc_state.entry + # workbench = proc_state.workbench entry.proc_state = self def set_workbench(self, wb): From bfd68cce8593f44ad34d9a731269041f44a9c790 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sat, 26 Jan 2013 14:54:17 +0100 Subject: [PATCH 056/130] Use ProcessingState for video. Rewrite video to use the new ProcessingState. Thanks to Joar Wandborg for testing! --- mediagoblin/media_types/video/processing.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index 4c9f0131..8b966636 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 _ @@ -52,8 +51,8 @@ def sniff_handler(media_file, **kw): return False -@get_workbench -def process_video(entry, workbench=None): + +def process_video(entry): """ Process a video entry, transcode the queued media files (originals) and create a thumbnail for the entry. @@ -61,12 +60,12 @@ def process_video(entry, workbench=None): A Workbench() represents a local tempory dir. It is automatically cleaned up when this function exits. """ + proc_state = entry.proc_state + 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( @@ -121,4 +120,5 @@ def process_video(entry, workbench=None): mgg.public_store.copy_local_to_storage(queued_filename, original_filepath) entry.media_files['original'] = original_filepath - mgg.queue_store.delete_file(queued_filepath) + # Remove queued media file from storage and database + proc_state.delete_queue_file() From 715ea495466a0dcebd1425dfd322775ff147aacd Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sat, 26 Jan 2013 15:08:12 +0100 Subject: [PATCH 057/130] Also refactor "copy original into public storage". This makes the processing code easier to read/write and alos will help the reprocessing once we get to it. Thanks to Joar Wandborg for testing! --- mediagoblin/media_types/image/processing.py | 5 +---- mediagoblin/media_types/video/processing.py | 4 +--- mediagoblin/processing/__init__.py | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py index 541e5109..8afcf90b 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -141,9 +141,7 @@ def process_image(entry): 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 proc_state.delete_queue_file() @@ -151,7 +149,6 @@ def process_image(entry): # 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/video/processing.py b/mediagoblin/media_types/video/processing.py index 8b966636..9040b736 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -116,9 +116,7 @@ def process_video(entry): 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]) # Remove queued media file from storage and database proc_state.delete_queue_file() diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 1760d0b9..28256107 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -109,6 +109,12 @@ class ProcessingState(object): 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) From fb46fa663dbd80a66a3a5995dfda730dd3fd52a4 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sat, 26 Jan 2013 15:28:24 +0100 Subject: [PATCH 058/130] Kill monkeypatching of ProcessingState. And change the process_foo() API to accept a processingstate now. image and video are tested, the others are UNTESTED. --- mediagoblin/media_types/ascii/processing.py | 6 +++--- mediagoblin/media_types/audio/processing.py | 6 +++--- mediagoblin/media_types/image/processing.py | 4 ++-- mediagoblin/media_types/stl/processing.py | 7 ++++--- mediagoblin/media_types/video/processing.py | 4 ++-- mediagoblin/processing/__init__.py | 13 ------------- mediagoblin/processing/task.py | 2 +- 7 files changed, 15 insertions(+), 27 deletions(-) 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/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/processing.py b/mediagoblin/media_types/image/processing.py index 8afcf90b..ca88d3f4 100644 --- a/mediagoblin/media_types/image/processing.py +++ b/mediagoblin/media_types/image/processing.py @@ -94,13 +94,13 @@ def sniff_handler(media_file, **kw): return False -def process_image(entry): +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. """ - proc_state = entry.proc_state + entry = proc_state.entry workbench = proc_state.workbench # Conversions subdirectory to avoid collisions 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/processing.py b/mediagoblin/media_types/video/processing.py index 9040b736..5b9be242 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -52,7 +52,7 @@ def sniff_handler(media_file, **kw): return False -def process_video(entry): +def process_video(proc_state): """ Process a video entry, transcode the queued media files (originals) and create a thumbnail for the entry. @@ -60,7 +60,7 @@ def process_video(entry): A Workbench() represents a local tempory dir. It is automatically cleaned up when this function exits. """ - proc_state = entry.proc_state + entry = proc_state.entry workbench = proc_state.workbench video_config = mgg.global_config['media_type:mediagoblin.media_types.video'] diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index 28256107..f9445e28 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -80,19 +80,6 @@ class ProcessingState(object): self.workbench = None self.queued_filename = None - # Monkey patch us onto the entry - # This is needed to keep the current calling convention - # for processors: - # def process_FOO(entry): - # proc_state = entry.proc_state - # workbench = proc_state.workbench - # When all processors use the new stuff, they should be - # rewritten: - # def process_FOO(proc_state): - # entry = proc_state.entry - # workbench = proc_state.workbench - entry.proc_state = self - def set_workbench(self, wb): self.workbench = wb diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 8614c673..aec50aab 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -89,7 +89,7 @@ class ProcessMedia(task.Task): with mgg.workbench_manager.create() as workbench: proc_state.set_workbench(workbench) # run the processing code - entry.media_manager['processor'](entry) + 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 ;) From 252de2b8577a33563807cc349f17844caf2191ad Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Fri, 8 Feb 2013 22:08:17 +0100 Subject: [PATCH 059/130] Remove the collection counter because it's not needed --- mediagoblin/templates/mediagoblin/utils/collections.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index 6cb5a342..0afd9ed8 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -17,7 +17,7 @@ #} {% block collections_content -%} - <h3>{% trans collected=media.collected %}In collections ({{ collected }}){% endtrans %}</h3> + <h3>{% trans collected=media.collected %}Collected in{% endtrans %}</h3> <p> {% for collection in media.collections %} {% if loop.last %} From 44004c17e341019cf05050692a7058f72e377b45 Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Fri, 8 Feb 2013 22:54:16 +0100 Subject: [PATCH 060/130] Fix "Add to collection" button: remove icon, add text, add to collections.html --- mediagoblin/static/images/icon_collect.png | Bin 588 -> 0 bytes .../mediagoblin/user_pages/media.html | 17 +------ .../mediagoblin/utils/collections.html | 43 ++++++++++++------ 3 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 mediagoblin/static/images/icon_collect.png diff --git a/mediagoblin/static/images/icon_collect.png b/mediagoblin/static/images/icon_collect.png deleted file mode 100644 index 2911af2401d64d623150234805b8ecdedd810e97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV2500001b5ch_0Itp) z=>Px#0%A)?L;wJ)jUzGu000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyn|02UkP z0CDsH00GcRL_t(I%jK0jXcSQthW}L%EF{|5N36`)&34-QAc_bU31Xv#MAS+xgh3G8 zLK56U><kGQNeI#SKo;Dfh%;`Hodh*tnjpl8Vpc^_W+vye$Qo9~&D~D$@6O?VoX0)q zUg`hSTGxZ?@>`C6_^$cZLv-{5kT4!<XN&AO2{T+_frN6{5_&quO30HoY+u00<(<)X z?=zSeEL#_W<AF<y{4q|Iuaj~u`spiywHF-VM^VZ{;5qV_Jv}jY2M6>(fX(p+tSi`; zlcY9p5p0`7(tZ`ALP9T+{G04AUnONQa)?_DGpeM#L!NX$N+|&|D+M&s9xve|ufUGP z((VA8XAbOyOP_C%Q6XalN&Zue3MoaGRvnA6S>BV-=}DKuB_>H(q|IBM^=cST$S8)= zLGNq5fS%YPZZ8R!foYVNhUx{}bxFB9z-HMvfsG*@n!;Z2sbM^uY69$RAU!6tNw6iV zzl>+IB`9F`kfdE5qkLhS^VT??O?5JWfyRB^`Wme3uPLwj{Y_fmU=I&$R$uPM1-IqR zr@Te=``j^w)mAJAjf5#L89j3@xE*0wXWYu0<M)9XVANO*&Hd@xTj>9`NkcmPK+pcw aAL9p&ia{)DnPl7m0000<MNUMnLSTYz1pKD} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 1cc2a763..7550c6c1 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -149,9 +149,7 @@ {% 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" %} @@ -183,19 +181,6 @@ </p> {% endif %} - {% if request.user %} - <p> - <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', - user=media.get_uploader.username, - media=media.id) }}" - class="button_action" - title="{% trans %}Add media to collection{% endtrans %}"> - <img src="{{ request.staticdirect('/images/icon_collect.png') }}" - /> - </a> - </p> - {% endif %} - {% template_hook("media_sideinfo") %} {% block mediagoblin_sidebar %} diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index 0afd9ed8..d9e4c8e4 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -17,20 +17,33 @@ #} {% block collections_content -%} - <h3>{% trans collected=media.collected %}Collected in{% endtrans %}</h3> - <p> - {% 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 %} + <h3>{% trans collected=media.collected %}Collected in{% endtrans %}</h3> + <p> + {% 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 %} + · + {% endif %} + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> + {% elif loop.revindex == 2 %} + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> + {% else %} + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> · {% endif %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> - {% elif loop.revindex == 2 %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> - {% else %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> · - {% endif %} - {% endfor %} - </p> + {% endfor %} + </p> + {% endif %} + {% if request.user %} + <p> + <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', + user=media.get_uploader.username, + media=media.id) }}" + class="button_action" + title="{% trans %}Add media to collection{% endtrans %}"> + Add to a collection + </a> + </p> + {% endif %} {% endblock %} From b78843a8402c52b0a6fae1cf31fff44cc1006578 Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Fri, 8 Feb 2013 23:28:13 +0100 Subject: [PATCH 061/130] Remove unused translation variable --- mediagoblin/templates/mediagoblin/utils/collections.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index d9e4c8e4..2084b9c5 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -18,7 +18,7 @@ {% block collections_content -%} {% if media.collections %} - <h3>{% trans collected=media.collected %}Collected in{% endtrans %}</h3> + <h3>{% trans %}Collected in{% endtrans %}</h3> <p> {% for collection in media.collections %} {% if loop.last %} From 867f9acdc308721ee8c767588be62f3f63effae5 Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Fri, 8 Feb 2013 23:30:32 +0100 Subject: [PATCH 062/130] Add translation tags; remove unnecessary title attribute from link --- mediagoblin/templates/mediagoblin/utils/collections.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index 2084b9c5..db23625b 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -40,9 +40,8 @@ <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', user=media.get_uploader.username, media=media.id) }}" - class="button_action" - title="{% trans %}Add media to collection{% endtrans %}"> - Add to a collection + class="button_action"> + {% trans %}Add to a collection{% endtrans %} </a> </p> {% endif %} From 742bfa7a776c7c18d2308aae7f820e7ec2895b2e Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sat, 9 Feb 2013 11:34:57 +0100 Subject: [PATCH 063/130] Add type="text/javascript" for <script>. Our jquery <script> tag did not have a proper type attribute. --- mediagoblin/templates/mediagoblin/base.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 98b32f4a..34986fdb 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -27,7 +27,8 @@ href="{{ request.staticdirect('/css/base.css') }}"/> <link rel="shortcut icon" href="{{ request.staticdirect('/images/goblin.ico') }}" /> - <script src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script> + <script type="text/javascript" + src="{{ request.staticdirect('/js/extlib/jquery.js') }}"></script> <script type="text/javascript" src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script> From cd3058373c67423bb504638fc3011f45783e0206 Mon Sep 17 00:00:00 2001 From: Aleksej <deletesoftware@yandex.ru> Date: Sun, 10 Feb 2013 14:13:46 +0400 Subject: [PATCH 064/130] correct typo in a comment in config_spec.ini --- mediagoblin/config_spec.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 13840564..91bca8df 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -103,7 +103,7 @@ vorbis_quality = float(default=0.3) [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) From 2a0aed84a6484ca3bdf10eb0b7f9e398d6795385 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Sun, 10 Feb 2013 12:01:24 +0100 Subject: [PATCH 065/130] Fix bug 537 --- mediagoblin/templates/mediagoblin/base.html | 2 +- mediagoblin/tools/template.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 34986fdb..5fe1ba1b 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -116,7 +116,7 @@ {% block mediagoblin_footer %} <footer> {% trans -%} - Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. + Powered by <a href="http://mediagoblin.org" title='{{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. {%- endtrans %} {% trans source_link=app_config['source_link'] -%} Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index a58dd2ca..74d811eb 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -25,6 +25,7 @@ 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 @@ -68,6 +69,7 @@ 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 From 6f6471aa5e8e1bcbd6365dc3dd12781743105929 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Sun, 10 Feb 2013 15:08:15 +0100 Subject: [PATCH 066/130] Fix bug 629 --- mediagoblin/config_spec.ini | 3 +++ mediagoblin/templates/mediagoblin/media_displays/video.html | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 13840564..f99719c4 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -100,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) + [media_type:mediagoblin.media_types.audio] keep_original = boolean(default=True) 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 %} - <video controls autoplay preload="auto" class="video-js vjs-mg-skin" + <video controls + {% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %} + preload="auto" class="video-js vjs-mg-skin" data-setup='{"height": {{ media.media_data.height }}, "width": {{ media.media_data.width }} }'> <source src="{{ request.app.public_store.file_url( From 34c35c8cec6b70cd0dad0fa3d91962a2fa97c093 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Sun, 10 Feb 2013 11:43:18 +0100 Subject: [PATCH 067/130] Fixed issue #511. --- mediagoblin/media_types/video/transcoders.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index 152de288..7a8166c4 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,9 +570,17 @@ pending: {2}'.format( return False - def on_thumbnail_error(self): + def on_thumbnail_error(self, message): _log.error('Thumbnailing failed.') self.disconnect() + if 'Error calculating the output scaled size - integer overflow' in message.parse_error()[1]: + _log.error('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 @@ -1007,4 +1015,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) From 8d355df617abd9050b573daab08882067c1517d4 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Sun, 10 Feb 2013 20:19:13 +0100 Subject: [PATCH 068/130] Tuned logging and added comments to 511 fix --- mediagoblin/media_types/video/transcoders.py | 25 +++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index 7a8166c4..3a6a1c4d 100644 --- a/mediagoblin/media_types/video/transcoders.py +++ b/mediagoblin/media_types/video/transcoders.py @@ -571,15 +571,34 @@ pending: {2}'.format( return False def on_thumbnail_error(self, message): - _log.error('Thumbnailing failed.') + 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 'Error calculating the output scaled size - integer overflow' in message.parse_error()[1]: - _log.error('Retrying with manually set sizes...') + + 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): From 140f703fc41d949a6158e30a6faf124b60ac30ec Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 10 Feb 2013 13:47:44 -0600 Subject: [PATCH 069/130] Updating MANIFEST.in for more files... trying to make this work on pypi :) --- MANIFEST.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index b3ae7b75..e5b41f92 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,10 @@ 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 extlib licenses +include COPYING AUTHORS +include lazyserver.sh lazystarter.sh lazycelery.sh From fc6616ed26496f112246f5945d8f37ef1d854da3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 10 Feb 2013 13:49:35 -0600 Subject: [PATCH 070/130] Fixing MANIFEST.in: graft expects one directory per line --- MANIFEST.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index e5b41f92..0a39ce84 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,7 @@ 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 licenses +graft extlib +graft licenses include COPYING AUTHORS include lazyserver.sh lazystarter.sh lazycelery.sh From 1bd9ee4112ad493b775dfaf68b7f1b55e4352075 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Mon, 11 Feb 2013 16:57:33 +0100 Subject: [PATCH 071/130] Added "version" before the version --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 5fe1ba1b..48ab750f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -116,7 +116,7 @@ {% block mediagoblin_footer %} <footer> {% trans -%} - Powered by <a href="http://mediagoblin.org" title='{{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. + Powered by <a href="http://mediagoblin.org" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. {%- endtrans %} {% trans source_link=app_config['source_link'] -%} Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. From b4ea20fa98d2ef9a25be6b964e2b9509c32d60d0 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Wed, 13 Feb 2013 00:02:56 +0100 Subject: [PATCH 072/130] Add markdown notice to collection description. Use wtforms_util.render_field_div on the collection description, so that the markdown notice in the wtform is actually rendered to html. --- .../mediagoblin/user_pages/media_collect.html | 11 ++--------- mediagoblin/templates/mediagoblin/utils/wtforms.html | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 8cdb64fe..8b19e8c0 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -57,8 +57,7 @@ </div> <div id="new_collection" class="subform"> - - <h3>{% trans %}Add a new collection{% endtrans %}</h3> + <h3>{% trans %}Add a new collection{% endtrans %}</h3> <p class="form_field_label"> <label for="{{ (form.collection_title.name) }}">{{ _(form.collection_title.label.text) }}</label> @@ -66,13 +65,7 @@ <div class="form_field_input"> {{ form.collection_title }} </div> - <p class="form_field_label"> - <label for="{{ (form.collection_description.name) }}">{{ _(form.collection_description.label.text) }}</label> - </p> - <div class="form_field_input"> - {{ form.collection_description }} - </div> - + {{- wtforms_util.render_field_div(form.collection_description) }} </div> <p class="form_field_label"> <label for="{{ (form.note.name) }}">{{ _(form.note.label.text) }}</label> diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index 58ecb8e0..df2354ed 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -28,7 +28,7 @@ <p class="form_field_error">{{ _(error) }}</p> {% endfor %} {%- endif %} - {% if field.description -%} + {%- if field.description %} <p class="form_field_description">{{ _(field.description)|safe }}</p> {%- endif %} </div> From dc000b70ffe6b891544d6e330078ff6f80e013d3 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Wed, 13 Feb 2013 16:56:24 +0100 Subject: [PATCH 073/130] Mention mediagoblin/config_spec.ini --- mediagoblin.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mediagoblin.ini b/mediagoblin.ini index 6325c8e0..66c9c77c 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -1,3 +1,7 @@ +# 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. :) + # If you want to make changes to this file, first copy it to # mediagoblin_local.ini, then make the changes there. From 19ad2e0cd0ff2e03cdf1243a9cedaecd4a187592 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Sat, 2 Feb 2013 23:25:04 +0100 Subject: [PATCH 074/130] Address concerns in Issue #543 - Fixed PEP-008 issues. - Removed .user-{user} from the tag URI and put it before the domain, such as {user}@{host} instead. - Use year from collection.created instead of current year. --- mediagoblin/user_pages/views.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index dea47fbf..8602c583 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -539,14 +539,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:{user}@{host},{year}:collection.slug-{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 From ab9b0b4175f3d00885866a454c9fbb93a06ee155 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Wed, 13 Feb 2013 23:12:55 +0100 Subject: [PATCH 075/130] Change from email format in tag URI to domain format Also fixed a bug (thanks pyflakes) --- mediagoblin/user_pages/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 8602c583..811d3578 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -205,7 +205,7 @@ def media_collect(request, media): if existing_collection: messages.add_message(request, messages.ERROR, _('You already have a collection called "%s"!' - % collection.title)) + % existing_collection.title)) return redirect(request, "mediagoblin.user_pages.media_home", user=request.user.username, media=media.id) @@ -542,7 +542,7 @@ def collection_atom_feed(request): "MediaGoblin: Feed for %s's collection %s" % (request.matchdict['user'], collection.title), feed_url=request.url, - id=u'tag:{user}@{host},{year}:collection.slug-{slug}'\ + id=u'tag:{host},{year}:gnu-mediagoblin.{user}.collection.{slug}'\ .format( host=request.host, year=collection.created.strftime('%Y'), From 61e39d90e58b8cea5c837d6da5731ab42127c642 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Mon, 18 Feb 2013 14:41:34 +0100 Subject: [PATCH 076/130] Fix errors in collection views When a collection does not exist, render the 404 page. --- mediagoblin/user_pages/views.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 811d3578..0225b6d7 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -309,6 +309,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 +518,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) \ From df5b142ab9bfc590f17768079104f6cfa2cd7bba Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Mon, 18 Feb 2013 14:46:28 +0100 Subject: [PATCH 077/130] Fix deleting media with attachments. If one deletes a media with attachments, there have been various problems: 1) If the file in the storage did not exist any more (maybe because due to a previous deletion attempt?), the error propagation failed, because the wrong thing was gathered. 2) The attachment database entries were not deleted. Using cascade for this, for now. Also add a simple unit test, that tests both by having a broken attachment on a media. --- mediagoblin/db/models.py | 1 + mediagoblin/tests/test_misc.py | 15 +++++++++++++++ mediagoblin/tools/files.py | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 10e0c33f..2f58503f 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -145,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", diff --git a/mediagoblin/tests/test_misc.py b/mediagoblin/tests/test_misc.py index b48b8762..776affc6 100644 --- a/mediagoblin/tests/test_misc.py +++ b/mediagoblin/tests/test_misc.py @@ -78,3 +78,18 @@ def test_user_deletes_other_comments(): 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/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)) From 155438cdc1da0e00996eebca97cb6581f06811e3 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Tue, 19 Feb 2013 17:14:13 +0100 Subject: [PATCH 078/130] Fix some small bits in base.html. 1. Add a trailing slash to the mediagoblin.org URL. (The string changed anyway, so translations are not affected more than already.) 2. Order was wrong for those two at the end (old version): {% endblock mediagoblin_body %} </div> 3. Fix some little indenting issues. 4. Remove some useless space from the output. --- mediagoblin/templates/mediagoblin/base.html | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 48ab750f..5db8bf0f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -48,7 +48,7 @@ {%- include "mediagoblin/bits/logo.html" -%} {% block mediagoblin_header_title %}{% endblock %} <div class="header_right"> - {% if request.user %} + {%- if request.user %} {% if request.user and request.user.status == 'active' %} <div class="button_action header_dropdown_down">▼</div> <div class="button_action header_dropdown_up">▲</div> @@ -60,11 +60,12 @@ {% trans %}Verify your email!{% endtrans %}</a> or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a> {% endif %} - {% else %} + {%- else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{ request.base_url|urlencode }}"> - {% trans %}Log in{% endtrans %}</a> - {% endif %} + {%- trans %}Log in{% endtrans -%} + </a> + {%- endif %} </div> <div class="clear"></div> {% if request.user and request.user.status == 'active' %} @@ -107,23 +108,23 @@ {% endif %} </header> {% endblock %} - <div class="container"> - <div class="mediagoblin_content"> + <div class="container"> + <div class="mediagoblin_content"> {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} - </div> - {% block mediagoblin_footer %} + </div> + {%- block mediagoblin_footer %} <footer> {% trans -%} - Powered by <a href="http://mediagoblin.org" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. + Powered by <a href="http://mediagoblin.org/" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. {%- endtrans %} {% trans source_link=app_config['source_link'] -%} Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. {%- endtrans %} </footer> - {% endblock mediagoblin_footer %} - {% endblock mediagoblin_body %} - </div> + {%- endblock mediagoblin_footer %} + </div> + {%- endblock mediagoblin_body %} </body> </html> From 9b2cd962af78ce8fbe2bce88d7b9d3a9d01e4aa9 Mon Sep 17 00:00:00 2001 From: Runar Petursson <runar@betur.com> Date: Fri, 15 Feb 2013 10:17:24 +0800 Subject: [PATCH 079/130] plugins/api: fix for cross origin requests The response headers were never getting set because of a bug in the 7c552c0 commit. This expands the loop into a more readable form and results in the headers getting set. --- mediagoblin/plugins/api/tools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 38905733e89b446c7c932578c722361717f092fe Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Thu, 21 Feb 2013 16:13:56 -0600 Subject: [PATCH 080/130] Fixing user gallery tags filter to be on slug rather than name. This commit sponsored by Kat Walsh. Thanks, Kat! --- mediagoblin/user_pages/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 4056ba97..601eef17 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -90,7 +90,7 @@ def user_gallery(request, page, url_user=None): if tag: cursor = cursor.filter( MediaEntry.tags_helper.any( - MediaTag.name == request.matchdict['tag'])) + MediaTag.slug == request.matchdict['tag'])) # Paginate gallery pagination = Pagination(page, cursor) From 631784a2d793119c17d0cb5f656db1eb515add56 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Thu, 21 Feb 2013 16:19:43 -0600 Subject: [PATCH 081/130] Making the tags on media pages point to the user's tag listing specifically. This commit sponsored by Torsten Meissner. Thanks, Torsten! --- .../templates/mediagoblin/utils/tags.html | 16 ++++++++++------ mediagoblin/user_pages/routing.py | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) 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 %} <a href="{{ request.urlgen( - 'mediagoblin.listings.tags_listing', - tag=tag['slug']) }}">{{ tag['name'] }}</a> + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }}</a> {% elif loop.revindex == 2 %} <a href="{{ request.urlgen( - 'mediagoblin.listings.tags_listing', - tag=tag['slug']) }}">{{ tag['name'] }}</a> + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }}</a> {% else %} <a href="{{ request.urlgen( - 'mediagoblin.listings.tags_listing', - tag=tag['slug']) }}">{{ tag['name'] }}</a> · + 'mediagoblin.user_pages.user_tag_gallery', + tag=tag['slug'], + user=media.get_uploader.username) }}">{{ tag['name'] }}</a> + · {% endif %} {% endfor %} </p> diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index a8a2eba7..6ea3c3e2 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -41,7 +41,7 @@ add_route('mediagoblin.user_pages.media_home.view_comment', 'mediagoblin.user_pages.views:media_home') # User's tags gallery -add_route('mediagoblin.user_pages.user_gallery', +add_route('mediagoblin.user_pages.user_tag_gallery', '/u/<string:user>/tag/<string:tag>/', 'mediagoblin.user_pages.views:user_gallery') From b9d1d13743ce58d293b1670b8884f86f64aae3b7 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Thu, 21 Feb 2013 16:29:16 -0600 Subject: [PATCH 082/130] Remove "translation legos" and linkify the tag to more generic tag listing By "translation legos" I mean having multiple strings to be translated appended together. This isn't a good idea because you can't assume that syntax will work together in the same way in another language, so you may be making things hard or impossible for translators. Between this and the last commit, this means that tags now link to user tagged media specifically, and if people want a more general tag listing, they can click on the tag link to get to a more general listing. I feel this is a good and intuitive route to handling this. This sponsored commit brought to you by Debarshi Ray! Thank you! --- .../mediagoblin/user_pages/gallery.html | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 097cec54..f23bb156 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -34,13 +34,24 @@ {% block mediagoblin_content -%} <h1> - {%- trans username=user.username, - user_url=request.urlgen( - 'mediagoblin.user_pages.user_home', - user=user.username) -%} - <a href="{{ user_url }}">{{ username }}</a>'s media - {%- endtrans %}{% if tag %}{% trans %} with tag '{{tag}}'{% endtrans %} - {%- endif %} + {% 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) -%} + <a href="{{ user_url }}">{{ username }}</a>'s media with tag <a href="{{ tag_url }}">{{ tag }}</a> + {%- endtrans %} + {% else %} + {%- trans username=user.username, + user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=user.username) -%} + <a href="{{ user_url }}">{{ username }}</a>'s media + {%- endtrans %} + {% endif %} </h1> {{ object_gallery(request, media_entries, pagination) }} From d647b62699cd8f3a2548626a8ee309ac9af4db43 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Mon, 4 Feb 2013 21:25:01 +0100 Subject: [PATCH 083/130] Use wtforms_util.render_field_div more in media_collect.html If we have to render fields individually, we still can use wtforms_util.render_field_div for each field. Makes things much smaller and readable. --- .../mediagoblin/user_pages/media_collect.html | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 8b19e8c0..159eeeb4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -47,7 +47,7 @@ </div> <br /> - + <p class="form_field_label"> <label for="{{ (form.collection.name) }}">{{ _(form.collection.label.text) }}</label> </p> @@ -59,20 +59,10 @@ <div id="new_collection" class="subform"> <h3>{% trans %}Add a new collection{% endtrans %}</h3> - <p class="form_field_label"> - <label for="{{ (form.collection_title.name) }}">{{ _(form.collection_title.label.text) }}</label> - </p> - <div class="form_field_input"> - {{ form.collection_title }} - </div> + {{- wtforms_util.render_field_div(form.collection_title) }} {{- wtforms_util.render_field_div(form.collection_description) }} </div> - <p class="form_field_label"> - <label for="{{ (form.note.name) }}">{{ _(form.note.label.text) }}</label> - </p> - <div class="form_field_input"> - {{ form.note }} - </div> + {{- wtforms_util.render_field_div(form.note) }} <div class="form_submit_buttons"> {# TODO: This isn't a button really... might do unexpected things :) #} From cde7a07d5ef576f50d86ba91a152f6fd434bd95d Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Fri, 22 Feb 2013 14:19:19 +0100 Subject: [PATCH 084/130] Create wtforms_util.render_label(_p) and use it around. - This makes many places more readable. - Gives us translation in two places. - Allows easier changing of labels in a central place. --- .../mediagoblin/edit/edit_account.html | 4 ++-- .../user_pages/collection_confirm_delete.html | 2 +- .../collection_item_confirm_remove.html | 2 +- .../mediagoblin/user_pages/media_collect.html | 4 +--- .../user_pages/media_confirm_delete.html | 2 +- .../templates/mediagoblin/utils/wtforms.html | 20 ++++++++++++++++--- 6 files changed, 23 insertions(+), 11 deletions(-) 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) }} <div class="form_field_input"> <p>{{ form.wants_comment_notification }} - {{ form.wants_comment_notification.label }}</p> + {{ wtforms_util.render_label(form.wants_comment_notification) }}</p> </div> <div class="form_field_input"> <p>{{ form.license_preference }} - {{ form.license_preference.label }}</p> + {{ wtforms_util.render_label(form.license_preference) }}</p> </div> <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html index 7499c0cf..2b790584 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html @@ -36,7 +36,7 @@ <p class="delete_checkbox_box"> {{ form.confirm }} - <label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label> + {{ wtforms_util.render_label(form.confirm) }} </p> <div class="form_submit_buttons"> 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 @@ <p class="delete_checkbox_box"> {{ form.confirm }} - <label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label> + {{ wtforms_util.render_label(form.confirm) }} </p> <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 159eeeb4..0fa0a9f4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -48,9 +48,7 @@ <br /> - <p class="form_field_label"> - <label for="{{ (form.collection.name) }}">{{ _(form.collection.label.text) }}</label> - </p> + {{- wtforms_util.render_label_p(form.collection) }} <div class="form_field_input"> {{ form.collection }} <a class="button_action" id="button_addcollection">{% trans %}+{% endtrans %}</a> 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 @@ <p class="delete_checkbox_box"> {{ form.confirm }} - <label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label> + {{ wtforms_util.render_label(form.confirm) }} </p> <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index df2354ed..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 <http://www.gnu.org/licenses/>. #} +{# Render the label for a field #} +{% macro render_label(field) %} + {%- if field.label.text -%} + <label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label> + {%- endif -%} +{%- endmacro %} + +{# Render the label in a <p> for a field #} +{% macro render_label_p(field) %} + {%- if field.label.text %} + <p class="form_field_label"> + {{- render_label(field) -}} + </p> + {%- endif %} +{%- endmacro %} + {# Generically render a field #} {% macro render_field_div(field) %} - {% if field.label.text -%} - <p class="form_field_label"><label for="{{ field.label.field_id }}">{{ _(field.label.text) }}</label></p> - {%- endif %} + {{- render_label_p(field) }} <div class="form_field_input"> {{ field }} {%- if field.errors -%} From b624ca0f8befe7315c9079402b1f598e3f07dd21 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth <Sebastian@SSpaeth.de> Date: Tue, 27 Mar 2012 15:58:58 -0500 Subject: [PATCH 085/130] Adding an Atom RSS feed for all media on the server Go to /atom/ in your browser to see it. --- mediagoblin/listings/routing.py | 5 +++++ mediagoblin/listings/views.py | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py index e5683168..f762c6be 100644 --- a/mediagoblin/listings/routing.py +++ b/mediagoblin/listings/routing.py @@ -19,5 +19,10 @@ from mediagoblin.tools.routing import add_route add_route('mediagoblin.listings.tags_listing', "/tag/<string:tag>/", "mediagoblin.listings.views:tag_listing") + +# Atom feeds: add_route('mediagoblin.listings.tag_atom_feed', "/tag/<string:tag>/atom/", "mediagoblin.listings.views:tag_atom_feed") +# The all new entries feed +add_route('mediagoblin.listings.atom_feed', '/atom/', + "mediagoblin.listings.views:tag_atom_feed") diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index d37161fc..a09aa24d 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -68,22 +68,26 @@ def tag_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: From 251db013fda4a61dae7d8a8ef6f53d48f1a54f89 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth <Sebastian@SSpaeth.de> Date: Tue, 13 Nov 2012 11:35:28 +0100 Subject: [PATCH 086/130] Integrate all atom feed in template Embed the atom feed link in the root template (most recent media page) for easier discovery. Delete the (listings/all.html) template as contributed in commit 195e79098b5 as it was unused and the feed is essentially showing the most recent media anyway. --- mediagoblin/templates/mediagoblin/root.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 5c6eb52f..529d89ef 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -19,6 +19,13 @@ {% from "mediagoblin/utils/object_gallery.html" import object_gallery %} +{% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') %} + +{% block mediagoblin_head -%} + {% set feed_url = request.urlgen('mediagoblin.listings.atom_feed') -%} + <link rel="alternate" type="application/atom+xml" href="{{ feed_url }}"> +{%- endblock mediagoblin_head %} + {% block mediagoblin_content %} {% if request.user %} <h1>{% trans %}Explore{% endtrans %}</h1> @@ -39,4 +46,8 @@ {% endif %} <h2>{% trans %}Most recent media{% endtrans %}</h2> {{ object_gallery(request, media_entries, pagination) }} + + {#- Need to set feed_url within this block so template can use it. -#} + {%- set feed_url = feed_url -%} + {%- include "mediagoblin/utils/feed_link.html" -%} {% endblock %} From ec3f1012b197128b36f8fc5dcde14768379011ab Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Fri, 22 Feb 2013 15:04:06 -0600 Subject: [PATCH 087/130] Changing name for atom feed view to be more generic than tags. This commit sponsored by Ben Hutchings. Thanks, Ben! --- mediagoblin/listings/routing.py | 5 +++-- mediagoblin/listings/views.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py index f762c6be..ee8f5020 100644 --- a/mediagoblin/listings/routing.py +++ b/mediagoblin/listings/routing.py @@ -22,7 +22,8 @@ add_route('mediagoblin.listings.tags_listing', # Atom feeds: add_route('mediagoblin.listings.tag_atom_feed', "/tag/<string: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:tag_atom_feed") + "mediagoblin.listings.views:atom_feed") diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index a09aa24d..f92c0705 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -64,7 +64,7 @@ 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 """ From e5e2c5e7aa2c882ea02ca5eaa63a1e53d15946e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 10:48:18 +0100 Subject: [PATCH 088/130] removed unused import NotFound --- mediagoblin/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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__ From 92fae6d8cd7901e74befcda219d509ca8558bd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 10:48:52 +0100 Subject: [PATCH 089/130] removed unnecessary collection lookup --- mediagoblin/decorators.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 09235614..42406b7d 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -187,10 +187,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'] }) From bedc215b449ab6c2b120330d158831b2dde5ff10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 10:51:13 +0100 Subject: [PATCH 090/130] removed unused import re --- mediagoblin/auth/forms.py | 1 - 1 file changed, 1 deletion(-) 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 <http://www.gnu.org/licenses/>. import wtforms -import re from mediagoblin.tools.mail import normalize_email from mediagoblin.tools.translate import fake_ugettext_passthrough as _ From 596b3410dbeaa43be499be0aef0546b2f5dac87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 10:58:30 +0100 Subject: [PATCH 091/130] removed unused import cgi.FieldStorage --- mediagoblin/edit/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 25a617fd..ceab52d0 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 <http://www.gnu.org/licenses/>. -from cgi import FieldStorage from datetime import datetime from werkzeug.exceptions import Forbidden From dd51c03985db3d278538ac38305d577761838cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:15:14 +0100 Subject: [PATCH 092/130] use key in dict instead of key in dict.keys() --- mediagoblin/tools/exif.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index ab3f77f0..5e6e0d3e 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -62,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]) From 64376dc0bc10cdeb2597bcbc9130e83996a46692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:28:55 +0100 Subject: [PATCH 093/130] typofix in comment --- mediagoblin/tools/exif.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 5e6e0d3e..b8b4d9e6 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -50,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 From 9aff782ba7ae00644bf3cb95c4140f2a84bd1001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:29:24 +0100 Subject: [PATCH 094/130] close file properly and remove unneeded variable --- mediagoblin/tools/exif.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index b8b4d9e6..b1da1833 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -73,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): ''' From 5e746bfdd3f7771601fe2ca02786ad70ae05c0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:30:23 +0100 Subject: [PATCH 095/130] simplified clean_exif --- mediagoblin/tools/exif.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index b1da1833..ac111694 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -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): From 6dc508d27f4a914e3d2ca66ac78fc2edabe669e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:31:08 +0100 Subject: [PATCH 096/130] use list expression instead of 3-deep for --- mediagoblin/tools/exif.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index ac111694..2c0a1143 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -114,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 From f2da5bef9a9031c8bacd63bf598ad13aa650208f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:31:25 +0100 Subject: [PATCH 097/130] use dict.iteritems() instead of dict.items() --- mediagoblin/tools/exif.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 2c0a1143..20227aa8 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -153,7 +153,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) \ From 0037706a5792e6175a409e9ed69533259108abb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= <vsza@vsza.hu> Date: Thu, 21 Feb 2013 11:32:01 +0100 Subject: [PATCH 098/130] simplified get_useful --- mediagoblin/tools/exif.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 20227aa8..15dffa79 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -131,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): From b33b360858da31d7326f4f2ae9f525010f7f21db Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Fri, 22 Feb 2013 22:20:06 +0100 Subject: [PATCH 099/130] Added some empty templates - Make it possible for site owners to hook into base.html without tainting the repository. --- mediagoblin/templates/mediagoblin/base.html | 3 +++ .../mediagoblin/bits/above-content.html | 17 +++++++++++++++++ .../templates/mediagoblin/bits/body-end.html | 17 +++++++++++++++++ .../templates/mediagoblin/bits/body-start.html | 17 +++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 mediagoblin/templates/mediagoblin/bits/above-content.html create mode 100644 mediagoblin/templates/mediagoblin/bits/body-end.html create mode 100644 mediagoblin/templates/mediagoblin/bits/body-start.html diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 5db8bf0f..3c8a26bc 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -42,6 +42,7 @@ {% endblock mediagoblin_head %} </head> <body> + {% include 'mediagoblin/bits/body-start.html' %} {% block mediagoblin_body %} {% block mediagoblin_header %} <header> @@ -109,6 +110,7 @@ </header> {% endblock %} <div class="container"> + {% include 'mediagoblin/bits/above-content.html' %} <div class="mediagoblin_content"> {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} @@ -126,5 +128,6 @@ {%- endblock mediagoblin_footer %} </div> {%- endblock mediagoblin_body %} + {% include 'mediagoblin/bits/body-end.html' %} </body> </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 <http://www.gnu.org/licenses/>. +-#} 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 <http://www.gnu.org/licenses/>. +-#} 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 <http://www.gnu.org/licenses/>. +-#} From 6e2e5b3600d24b27ef07e81657c09697364ffdd3 Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Fri, 22 Feb 2013 22:36:00 +0100 Subject: [PATCH 100/130] Fix stray comma in listings.views.atom_feed --- mediagoblin/listings/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index f92c0705..35af7148 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -74,7 +74,7 @@ def atom_feed(request): 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, + 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) From f722b49f8fd3fcbd3e8511221d8c6a6ab57aa978 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sat, 23 Feb 2013 10:46:56 -0600 Subject: [PATCH 101/130] Committing present MediaGoblin translations before pushing extracted messages --- .../i18n/es/LC_MESSAGES/mediagoblin.po | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index 00f765ad..ae9d9994 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -10,6 +10,7 @@ # <juangsub@gmail.com>, 2011. # <juanma@kde.org.ar>, 2011, 2012. # <larjona99@gmail.com>, 2012. +# Laura Arjona Reina <larjona99@gmail.com>, 2013. # Mario Rodriguez <msrodriguez00@gmail.com>, 2011. # <mu@member.fsf.org>, 2011. # <shackra@riseup.net>, 2012. @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" "POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:11+0000\n" -"Last-Translator: cwebber <cwebber@dustycloud.org>\n" +"PO-Revision-Date: 2013-02-22 09:39+0000\n" +"Last-Translator: larjona <larjona99@gmail.com>\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" @@ -31,15 +32,15 @@ msgstr "" #: mediagoblin/auth/forms.py:29 msgid "Invalid User name or email address." -msgstr "" +msgstr "Nombre de usuario o correo electrónico inválido." #: mediagoblin/auth/forms.py:30 msgid "This field does not take email addresses." -msgstr "" +msgstr "Este campo no acepta direcciones de correo." #: mediagoblin/auth/forms.py:31 msgid "This field requires an email address." -msgstr "" +msgstr "Este campo requiere una dirección de correo." #: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 msgid "Username" @@ -95,11 +96,11 @@ msgstr "Se reenvió tu correo electrónico de verificación." msgid "" "If that email address (case sensitive!) is registered an email has been sent" " with instructions on how to change your password." -msgstr "" +msgstr "Si 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 "" +msgstr "No se ha podido encontrar a nadie con ese nombre de usuario." #: mediagoblin/auth/views.py:264 msgid "" @@ -188,11 +189,11 @@ msgstr "Nueva contraseña" #: mediagoblin/edit/forms.py:74 msgid "License preference" -msgstr "" +msgstr "Preferencias de licencia" #: mediagoblin/edit/forms.py:80 msgid "This will be your default license on upload forms." -msgstr "" +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" @@ -228,7 +229,7 @@ msgstr "¡Has añadido el adjunto %s!" #: mediagoblin/edit/views.py:183 msgid "You can only edit your own profile." -msgstr "" +msgstr "Sólo puedes editar tu propio perfil." #: mediagoblin/edit/views.py:189 msgid "You are editing a user's profile. Proceed with caution." @@ -248,7 +249,7 @@ msgstr "las configuraciones de cuenta fueron salvadas" #: mediagoblin/edit/views.py:287 msgid "You need to confirm the deletion of your account." -msgstr "" +msgstr "Necesitas confirmar el borrado de tu cuenta." #: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 #: mediagoblin/user_pages/views.py:207 @@ -281,7 +282,7 @@ msgid "" "CSRF cookie not present. This is most likely the result of a cookie blocker " "or somesuch.<br/>Make sure to permit the settings of cookies for this " "domain." -msgstr "" +msgstr "No se encuentra la cookie CSRF. Esto suele ser debido a un bloqueador de cookies o similar.<br/> Por favor asegúrate de permitir las cookies para este dominio." #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 @@ -369,11 +370,11 @@ msgstr "¡El cliente {0} ha sido registrado!" #: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 msgid "OAuth client connections" -msgstr "" +msgstr "Conexiones de cliente OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +msgstr "Tus clientes OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29 #: mediagoblin/templates/mediagoblin/submit/collection.html:30 @@ -396,7 +397,7 @@ msgstr "Debes proporcionar un archivo." #: mediagoblin/submit/views.py:97 msgid "Woohoo! Submitted!" -msgstr "¡Yujú! ¡Enviado!" +msgstr "¡Yuju! ¡Enviado!" #: mediagoblin/submit/views.py:146 #, python-format @@ -647,11 +648,11 @@ 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 "" +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 "" +msgstr "Sí, borrar mi cuenta" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 @@ -673,7 +674,7 @@ msgstr "Cambio de %(username)s la configuración de la cuenta " #: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 msgid "Delete my account" -msgstr "" +msgstr "Borrar mi cuenta" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -783,14 +784,14 @@ msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +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 "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" -msgstr "" +msgstr "¡Puedes conseguir un navegador moderno \n que pueda reproducir este vídeo en <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" @@ -843,12 +844,12 @@ msgstr "Quitar" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Colecciones de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "Colecciones de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -899,7 +900,7 @@ msgstr "Añadir contenido a la colección" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" -msgstr "" +msgstr "Añadir “%(media_title)s” a una colección" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "+" @@ -978,7 +979,7 @@ msgstr "Este usuario (todavía) no ha completado su perfil." #: mediagoblin/templates/mediagoblin/user_pages/user.html:124 msgid "Browse collections" -msgstr "" +msgstr "Explorar colecciones" #: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format @@ -1078,7 +1079,7 @@ msgstr "Parece que no hay ninguna página en esta dirección. ¡Lo siento!</p><p #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Comentario" #: mediagoblin/user_pages/forms.py:25 msgid "" @@ -1097,7 +1098,7 @@ msgstr "Estoy seguro/a de que quiero quitar este ítem de la colección" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Colección" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" From ac7c91809607a6dfa3b3109a12f45295235e8d20 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sat, 23 Feb 2013 10:47:51 -0600 Subject: [PATCH 102/130] Committing extracted and compiled translations --- .../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 24306 -> 24518 bytes .../i18n/ar/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 24006 -> 24209 bytes .../i18n/ca/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 23139 -> 23351 bytes .../i18n/da/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 22730 -> 24617 bytes .../i18n/de/LC_MESSAGES/mediagoblin.po | 526 ++++++++++------- .../i18n/en/LC_MESSAGES/mediagoblin.po | 158 ++--- .../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 23889 -> 24079 bytes .../i18n/eo/LC_MESSAGES/mediagoblin.po | 172 +++--- .../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 24554 -> 24694 bytes .../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 23952 -> 24164 bytes .../i18n/fa/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 24889 -> 25238 bytes .../i18n/fr/LC_MESSAGES/mediagoblin.po | 189 +++--- .../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 25760 -> 25952 bytes .../i18n/he/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 23128 -> 23340 bytes .../i18n/ia/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 24854 -> 25063 bytes .../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 24095 -> 24301 bytes .../i18n/it/LC_MESSAGES/mediagoblin.po | 161 ++--- .../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 22004 -> 23961 bytes .../i18n/ja/LC_MESSAGES/mediagoblin.po | 518 +++++++++------- .../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 25011 -> 25228 bytes .../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 23603 -> 23812 bytes .../i18n/nl/LC_MESSAGES/mediagoblin.po | 161 ++--- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 22707 -> 22919 bytes .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 23892 -> 24100 bytes .../i18n/pl/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 22102 -> 24179 bytes .../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 551 ++++++++++-------- .../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 24388 -> 24839 bytes .../i18n/ro/LC_MESSAGES/mediagoblin.po | 213 +++---- .../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 29712 -> 30050 bytes .../i18n/ru/LC_MESSAGES/mediagoblin.po | 176 +++--- .../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 23799 -> 23996 bytes .../i18n/sk/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 23308 -> 23520 bytes .../i18n/sl/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 24458 -> 24668 bytes .../i18n/sq/LC_MESSAGES/mediagoblin.po | 163 +++--- .../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 23224 -> 23436 bytes .../i18n/sr/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 23454 -> 23666 bytes .../i18n/sv/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 23370 -> 23582 bytes .../i18n/te/LC_MESSAGES/mediagoblin.po | 159 ++--- .../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 23168 -> 23380 bytes .../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 159 ++--- .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 22496 -> 22710 bytes .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 163 +++--- 56 files changed, 3081 insertions(+), 2642 deletions(-) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo index fce799a51b5c16fe7eb0d24679fc98740f78a570..574cb80773f2c5dcace9dff197fbf8ce7592d785 100644 GIT binary patch delta 4168 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 delta 4091 zcma*pdrX(t9mnx67Zs=lxfDe%{uC)!6%Z6bMd%a+RH{%~rbceg-zFGEm)4+<S?jDV zRySHIZLOo#TIN^`Khw0{s9j5wM!R%&mt<CJtS(zGQ@f^FtnJ>PJx{XzwT!^;b<T4+ z=X<{A`#e8JhJ$XM4stHVgg#^Ze8yiAe_dnL`_IqCNV8<RAK@gtjk%Z@WmbwcI1#%s z4v%0wp29G^fI)Z>$KoZtil1V>nPa~lXI998;ApcMScK`g4tH_qKAb~;LaaORatxvG zM{c!tyc@Tp0_a9!w0;c7V>lj9psxR&cm677GQZuT!LKE8_bAN8SvU(Tu^p@MHB_KM z_qYSiMomzOcj0nWV5>0(o3RhK;Ao5@EmJTa70?{aV1B!wh6dV-5%?JLYkT?7ZoGmi z_-ovX=P?s28AStcLQVJxGM9CuR{D~6K7b_APN1$khoN{G9Yy{L4NY(ZCtwsG+S3fw z@%vDF*^El<k5B__MeV7Bs-13R2pd4%cNVpkAEUM?EP*jG9{IJ>1oA(N#zXY9(tW6b z_oD(kfLhT2YHNnQ<L_Vv{SPn)6Nq*jF2X<J+t`dRB${R8cUXYgM5!WPgGIO_iTrP; z@dgJT!6HhXF>MG{_2>9dZTt<jqHj?dNT!pDIjB9YMP;lLwUDP!sqRH(ZUD7aL*DT> zP~)C+Xt163F)FgJQF}L@j`l1Am62jps!LG=)}SV?M@{rFYMdugfxLud-A<!Y{|D6l zpP*{(CMu)OZ5mo>kk3u^B-8|js2k^d{TkGk)T8#W3H|s4YK#7XnlNIrSvjVnQoI(m zpo6FYj^SQBjby~JB`iZJuR~(74%CHDp)&A1YT!Zd_y}sk3#iQe)$<E%p#LQv#%lIQ zf!@SIoH*63m0DDWwqc&0|NS%?Iq)8~U|O2H(%l$J{~2Tqdk(Ad3@*fodnq`qMOFW^ z*n!7UPeCfBufR)i1=itGd=+!>YwTx!n@X6|aRhz%6>7kE9&$bBGd))!bK5Sg!$I7E z!CCH`^HE$wKY;ldN9m8k3S5m#P+R&d48arVXoY8JgyC;cDL;oQs!OO9+(aKn5Vl^? z*{FfPj|#L2b=`IxgU_PwKZtr-hEO$j7Ipn)Bu4uthy2&mNT24uYPaEi^ha<uMv#^T zSdJz5D0bm6?!>u7Lu~dIYKy+W3XI7$`#CmZ8-9+etrdB0MmteY%Yi)d&vw~y4iw{` zQ7efje>80dYJw(=!9A#z`~sEIGpK=+XR-}A4>j-t495mkMw(C=^LuXa&TnyO%;SXo zG>FFnHNgNStAXD|g15h5DNdN>R_}utN52z&_&90{2asWG2*=`ayozU$SnV)rWhna- zs_#S=x$o#Q)Yq*a=WyaCAMuz?T2w6MI1U$~il_k<KpRHlR*c5osOo<nb$!4)|29&u zb^&AY4w4baqS;ubay(YzkFf!Vu|~(|x&yVMQo052LI<_NCou;1V;>$xWnv*|<yBxy zQ2}kl4BU+xX9y$o{GXzsmA;GGt4o-I*KrU>&37XYpa%X3b^Ud`2k&4q#<D-7F%OlA zB2-{isHbcdD)44Z!46DtXzZbphDW>;=TQ@VhDz;Mr~yJ3xGM_BB>Fix5f@`NwqiQ& zL!K~u9kt?XNVYAq%>Bn^F>0YZ(21b&I1NSCgBtiCs#;HZ$KS#V`tPG2&-ik)L)eHp zL43VpGyR<Jxq<A(0{SPB-LM--S=qFO?zin)?5BTiA^F$4f7c>6h5e}14Wm-@0V)GG zP|x>wI0aLQMk`;0T1gWs)qYgwx^Oh^L=|Z_DntD^70=@&yj9`26US7#MUso5oTx+< z*AfiFM%2VDsEK}xdMx`;fxL$k@EYpr_!f2l*u`$KC3vQyYGoR#cB&m3VKkahH~tWn zfrn9B@&smJFZyv9bz^3gn~_o^`__U=@hhmu?lLNX8@Lzmpfa+j+AZd%aXNkH42?t@ zpQ9!YuW?tBh#H^(HDMVlGY#JHmAHw%9}nY2RG>du;=W*xBHL_NkfAMoDPLsRiH&#! zTlD+~FLPJA7RPd86Kby=)QvBr2Kqa){Z?4(7HJoD(C@?P7<RuK_-tH3zZRLp4j~Va zeTgc%nakZ`{ypmZ$C9~PRbPdf_yf<MVH*9D_#j@v9avoFzOql^8v6gld~B?Di**mK zrvCzJOK)QchCkqD@NU!#DF&mN-?C`L;9OJ@EyHwNhcj>=j>0!lfsUZAyNZ+X8}E1u zugysMC8#2+LS4TOvv4O8iycGi(?+u@XDy9oH2AgG_*j5Z51FmRTI|9>+=*FiTs9s< zZP7&}i~J+te%-FXHoDhw64o$?GP)k)u@~>fK`h1(SCW4{=TWQNuiNRU3D%%8(v8V@ z5TC}=sDYQ0-(cK?8h8taV>gb$UR1_j^gQI9|0T}j_;Iu;X`NGifm@Ngf&)==DuR0w z<07ZFx3&74e497;S~jd--`29(zoEm*T3daa*ZDg+*52OMvAL(aq%LqEu0FV@Z+>~8 zZ2ZhIN&j_ur!ONd!@Ik!HM27_urXzSaL=n*ae?B={@AeGLSJ5CabAAU(E^`3`FV5# z7YeR~1U`%=iU&&K|F0-s?k))l^vxd^{y!)0*_hHBm|NNU?*Mv=Czl6es{?WW0(i{? AWdHyG diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po index a29958e8..ca35e27c 100644 --- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,31 +21,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "اسم المستخدم" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "كلمة السر" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "عنوان البريد الإلكتروني" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -205,54 +205,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -280,7 +280,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -370,11 +370,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -395,43 +395,43 @@ msgstr "يا سلام! نُشرَت!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "أضف وسائط" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +439,14 @@ msgstr "" msgid "Media processing panel" msgstr "لوحة معالجة الوسائط" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +458,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -489,7 +490,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "أحدث الوسائط" @@ -607,13 +608,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -623,7 +624,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "ألغِ" @@ -854,7 +855,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "وسائط <a href=\"%(user_url)s\">%(username)s</a>" @@ -883,21 +891,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -993,9 +997,12 @@ 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 @@ -1038,7 +1045,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1103,69 +1110,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 062dafb90dc60449b606ccb50f031a4cc283677d..6dac0a744754f02120e0b5ac068b1209b51b7c26 100644 GIT binary patch delta 4188 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 R=YIs>f5@uwHO+60`xmrC8s-21 delta 4100 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 WgmrsU<E<Rb+j*rVDVRFX7xQn=J_fA- diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index e6233854..4ea2a74f 100644 --- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,31 +21,31 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nom d'usuari" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Contrasenya" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adreça electrònica" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nom d'usuari o correu" @@ -205,54 +205,54 @@ msgid "" "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:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Els canvis al perfil s'han guardat" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Contrasenya errònia" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Els detalls del compte s'han guardat" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: 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." @@ -280,7 +280,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Ho sento, no puc manegar aquest tipus d'arxiu :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "La transformació del vídeo ha fallat" @@ -370,11 +370,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Afegir" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Aquest tipus de fitxer no és vàlid." @@ -395,43 +395,43 @@ msgstr "Visca! S'ha enviat!" msgid "Collection \"%s\" added!" msgstr "S'ha afegit la col.leccio \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Modificar els ajustaments del compte" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +439,14 @@ msgstr "Modificar els ajustaments del compte" msgid "Media processing panel" msgstr "Quadre de processament de fitxers" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Alimentat per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un projecte <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +458,31 @@ msgstr "Alliberat segons la <a href=\"http://www.fsf.org/licensing/licenses/agpl msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Explorar" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hola, una benvinguda al MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "El lloc esta usant <a href=\"http://mediagoblin.org\">MediaGoblin</a>, una gran i extraordinària peça de software per allotjar mitjans." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -489,7 +490,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crear un compte a aquest lloc</a> \no\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Preparar MediaGoblin al teu propi servidor</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mitjans més recents" @@ -607,13 +608,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -623,7 +624,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancel·la" @@ -854,7 +855,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media" @@ -883,21 +891,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Afegit el</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Afegir una nova col.lecció" @@ -993,10 +997,13 @@ 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 @@ -1038,7 +1045,7 @@ 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" @@ -1103,69 +1110,69 @@ msgstr "Incluir una nota" msgid "commented on your post" msgstr "comentat al teu post" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Has esborrat el mitjà" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: 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:419 +#: 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:429 +#: 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 2ee634c353bd8d36b75e0b4a3cddd8ab4e796022..a12d23c673a669b1030e9fe082c310b54d17880b 100644 GIT binary patch delta 4176 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 delta 4060 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 YHU9seO?M~d_*ajt`Fme~yeA>%FY6KS5C8xG diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index bc010dd0..9362aade 100644 --- a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,31 +21,31 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brugernavn eller email" @@ -205,54 +205,54 @@ msgid "" "change this." msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Kontoindstillinger gemt" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: 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å." @@ -280,7 +280,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -370,11 +370,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." @@ -395,43 +395,43 @@ msgstr "Juhuu! Delt!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +439,14 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +458,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Udforsk" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hey, velkommen til denne MediaGoblin side!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -489,7 +490,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -607,13 +608,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -623,7 +624,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Afbryd" @@ -854,7 +855,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -883,21 +891,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -993,9 +997,12 @@ 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 @@ -1038,7 +1045,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1103,69 +1110,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 d6876a021908b16280b34bb4a06b041861ebc20e..be8d97968ff35a33df0325af118042149993475d 100644 GIT binary patch delta 6069 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 delta 4539 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 diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index 37893a09..ac3282cb 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/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: @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 10:11-0600\n" -"PO-Revision-Date: 2013-02-05 12:39+0000\n" -"Last-Translator: Elrond <elrond+mediagoblin.org@samba-tng.org>\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: German (http://www.transifex.com/projects/p/mediagoblin/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,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" @@ -116,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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" @@ -132,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" @@ -175,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«!" -#: 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." @@ -249,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.<br/>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 :(" @@ -258,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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "In <a href=\"%(osm_url)s\">OpenStreetMap</a> öffnen" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "Client-ID" @@ -320,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." @@ -332,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!" -#: mediagoblin/templates/mediagoblin/base.html:48 -msgid "MediaGoblin logo" -msgstr "MediaGoblin Logo" - -#: mediagoblin/templates/mediagoblin/base.html:54 -#, python-format -msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>s Konto" - -#: mediagoblin/templates/mediagoblin/base.html: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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Diese Seite setzt das <a href=\"http://gnu.org/\">GNU</a>-Projekt <a href=\"http://mediagoblin.org/\">MediaGoblin</a> ein." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "<a href=\"%(user_url)s\">%(user_name)s</a>s Konto" -#: mediagoblin/templates/mediagoblin/base.html: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 <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -393,52 +469,31 @@ msgstr "Veröffentlicht unter der <a href=\"http://www.fsf.org/licensing/license msgid "Image of goblin stressing out" msgstr "Bild eines gestressten Goblins" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Aktionen" - #: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr " Neues Album erstellen" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Kontoeinstellungen ändern" - -#: 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 "Medienverarbeitung" - -#: mediagoblin/templates/mediagoblin/root.html:51 msgid "Explore" msgstr "Entdecken" -#: mediagoblin/templates/mediagoblin/root.html:53 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!" -#: mediagoblin/templates/mediagoblin/root.html:55 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Diese Webseite setzt <a href=\"http://mediagoblin.org\">MediaGoblin</a> ein, eine großartige Software für Medienhosting." -#: mediagoblin/templates/mediagoblin/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 "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -446,7 +501,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Registriere dich auf dieser Seite</a> oder <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installiere MediaGoblin auf deinem eigenen Server</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Neuste Medien" @@ -552,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 @@ -559,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 @@ -599,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" @@ -621,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" @@ -644,7 +724,7 @@ msgid "" msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> einen modernen Webbrowser, der dieses Audiostück abspielen kann!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Originaldatei" @@ -656,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" @@ -688,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" @@ -696,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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" msgstr "Hol dir auf <a href=\"http://getfirefox.com\">http://getfirefox.com</a> einen modernen Webbrowser, der dieses Video abspielen kann!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "WebM-Datei (640p; VP8/Vorbis)" @@ -724,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" @@ -738,7 +812,7 @@ msgstr "Deine Medien" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (ein Album von %(username)s)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format @@ -746,12 +820,12 @@ msgid "%(collection_title)s by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s von <a href=\"%(user_url)s\">%(username)s</a>" #: 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" @@ -761,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?" @@ -775,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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "Alben von <a href=\"%(user_url)s\">%(username)s</a>" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -787,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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Medien von <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Die Texte lassen sich durch <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> formatieren." - -#: 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Veröffentlicht am</h3>\n <p>%(date)s</p>" -#: 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" @@ -898,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..." @@ -928,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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "In <a href=\"%(osm_url)s\">OpenStreetMap</a> öffnen" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" msgstr "Alle Rechte vorbehalten" @@ -980,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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "So nicht!</p><p>Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Tut uns Leid, aber unter der angegebenen Adresse gibt es keine Seite!</p><p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Die Texte lassen sich durch <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> formatieren." + +#: 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" @@ -1030,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 +#: 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: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:238 +#: 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:253 +#: 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:261 -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:297 +#: 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" -#: 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 617d998d..35baf93b 100644 --- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-02-05 15:12-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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -201,54 +201,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -276,7 +276,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -370,11 +370,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -395,43 +395,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +439,15 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> " +"project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +459,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, " "an extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an " @@ -492,7 +494,7 @@ msgid "" "your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -609,13 +611,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -625,7 +627,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "" @@ -857,7 +859,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -886,21 +895,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -994,9 +999,12 @@ 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 @@ -1039,7 +1047,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1104,70 +1112,70 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 59ac47baac06bf00c49e68d3884d5b239e920156..d34a2c1ec758f619a3b3bcdebaf5bd3a71548122 100644 GIT binary patch delta 4274 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 delta 4141 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 RwxDWeR&`<M(>XcLe*>+&6t(~W diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index edef9c22..5787d250 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# <deletesoftware@yandex.ru>, 2013. # <deletesoftware@yandex.ru>, 2011-2012. # Fernando Inocencio <faigos@gmail.com>, 2011. # <john_w1954@fastmail.fm>, 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: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,31 +22,31 @@ msgstr "" "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Uzantnomo" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Pasvorto" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Retpoŝtadreso" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Salutnomo aŭ retpoŝtadreso" @@ -205,54 +206,54 @@ msgid "" "change this." msgstr "La distingiga adresparto de ĉi tiu kolekto. Ordinare ne necesas ĝin ŝanĝi." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilŝanĝoj estis konservitaj" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Malĝusta pasvorto" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Kontagordoj estis konservitaj" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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." @@ -280,7 +281,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Malsukcesis transkodado de filmo" @@ -370,11 +371,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Aldoni" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "La provizita dosiero ne konformas al la informtipo." @@ -395,43 +396,43 @@ msgstr "Hura! Alŝutitas!" msgid "Collection \"%s\" added!" msgstr "Kolekto «%s» aldonitas!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoŝtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: mediagoblin/templates/mediagoblin/base.html:89 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" -msgstr "" +msgstr "Krei novan kolekton" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Ŝanĝi kontagordojn" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +440,14 @@ msgstr "Ŝanĝi kontagordojn" msgid "Media processing panel" msgstr "Kontrolejo pri dosierpreparado." -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, unu el la <a href=\"http://gnu.org/\">projektoj de GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +459,31 @@ msgstr "Disponigita laŭ la permesilo <a href=\"http://www.fsf.org/licensing/lic msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Ĉirkaŭrigardi" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Saluton, kaj bonvenon al ĉi tiu MediaGoblina retpaĝaro!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ĉi tiu retpaĝaro funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eksterordinare bonega programaro por gastigado de aŭd‐vid‐dosieroj." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -489,7 +491,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Kreu konton en ĉi tiu retejo</a>\n aŭ\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">ekfunkciigu MediaGoblin’on en via propra servilo</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Laste aldonitaj dosieroj" @@ -607,13 +609,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Aldoni kundosieron" @@ -623,7 +625,7 @@ msgstr "Aldoni kundosieron" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Nuligi" @@ -835,12 +837,12 @@ msgstr "Forigi" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Kolektoj de %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "Kolektoj de <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -854,7 +856,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>" @@ -883,21 +892,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Aldonita je</h3>\n <p>la %(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" -msgstr "" +msgstr "Aldoni «%(media_title)s» al kolekto" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Aldoni novan kolekton" @@ -993,10 +998,13 @@ msgstr "Ĉi tie ŝajne estas ankoraŭ neniuj dosieroj…" msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "En %(collected)s kolekto(j)" +#: 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 @@ -1038,7 +1046,7 @@ 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" @@ -1103,69 +1111,69 @@ msgstr "Rimarko" msgid "commented on your post" msgstr "komentis je via afiŝo" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Via komento estis afiŝita!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: 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:419 +#: 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:429 +#: 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 8b7b729097d3c44864026f63c66c9b5ebea8a25d..e4286d7d25fd538ee33e7484d9d00f4a7088c40b 100644 GIT binary patch delta 3177 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 ayy$QQgA-jV#-s(JKJv<q^u38AvHt_Ig}=D~ delta 2229 zcmXZcSxl5y6u|K_BLXgfAc~;CfIu7pkwsiUKoA6RL8}FITyXeA8f5AW#L^I_K4>2x zYI-%=YK)rH*3_25*F<f!Xib`?@xewPnphJPyT#P5(ZmO}|I=?0<L{n3-0hruzh^gG zkH=h}55$D;xJ0g(ie!t(;RTK(IG^|)*5LSZku+?G*pAbQ2QU^5GL4+ZDR>5d#$hbM z;|oQYO1?$9<R#9<1&bssK}POaBvL`g-Nhn>n6Si|cqvXNZop}{6=z`x6YwY|;#thX zQPjV?hspRDz4!{#(aR#b;T5PGYN-f|_-GuWV;ep~-C=E|GeJL2AU=#b@Fb4IbC`r5 z;`?|d^85Ow&Ox?d9{nd!=lcrd@hMKks49_}m=LBBLn9w^u@uK}6Y9=Wt4TlBp)S~j znh_uB$wL^82P5$i&LBR6I`3tijANLIw=ore#}o`l*EluLKt1U))EYLUPVB=t^kX{i zMV;UX>YcfW1$Y~^1kZ5=&Rizah<;p!mryhK9Cc&v+W!v}mWebp73ru8E=Juz4er8q zNY>;E4&XC<grPc-PHbH+QiNl;8UMsQTv;!|A!RS_#}ORF`3)i&cn!0-e{!FOruGG9 z;}o{98z{xuxEytX-KYakqMqb3>bM)InY)Wx+XtxQenY*4lSzZdS(u0QI2F4wjrHXn z8qs(PwWjA$Q~m|&Gx-|R@CoV$W1AfFQER;hbzEn}e$>l0h&t~Fn1$z1Ykmu3@jiz2 zq(9M^gij;7Ryxlk4twaY!(1FiJ;4u17339C1*vUzp4}nTjhse<pP_D`mJ6WIx(Um0 zAL{eHw2J&|imuU-iQl8X-@kDd#;kTOOAd}FF2Jo=f*0{97UPmNB30Op8h?Ube1Lj) zV%BmIu|DEOoJ1VgLjEVvNNo|x!P&^Br4cEg978?nkEoY4a~&57D^Tykr|7}k*osfE z3+vZ&S{%m9_#BII<Ta<Hk5I?Qhc`GoEyPkfT2WIyh&tg2evA_~I=_$NcH&>K1RGv= zGSrVD;sY3uPf=4J#UxQU2@`P&>hsOUWDHl*(A&8Vb>Tjoho?|e{vB#*?x2?BFVu|1 zwK=yq1*a3|qkbQ1BksUC#QTwd@)7@0RlaN@BtuqXHS5b+8d{@=s436j5f9=nJc$3G zX6CIe&PFdGWtBT<Fw^IJCv4ObrEx*@K;@W%o3RLk$PhV?n);VmtnWX4oAU)*i%I-2 zfcngi;65Bh56&g;ZfwRGxCSR;Cu+)rk@!Hwp-BG;)K_u=B|A5i?P>4musS@w0gpdm zKZ)<ojh(;1Q&PO7xY)FprDXc|Svz-HK~H6*QPa^E>h1S;2l_hZ1%jRSv9e*88A_OG zZ!hn38Fym2{bHeeocVXE*DkCWaG9OcY-24Qj_$Vny<Gv5R+SaC$Li@dwN<~G#*}&H zjq3Wu<yN=VYkBtcd)oc}KwnR<Jyx9@ZLZD=+rfrpmnq1|F;`c#C9Uf6TRkDm^JdW6 zWd*Gszh!$HS>t+Us(rKRq|40Cs<Z9p&M1?c+hM=m;)yb)-nr(R4Q1wCZ=OA8<8hZs z&M&jawVrpmZ+&SlwB?wa1sV3kw)fnovgnYB@s*iBigN6B-)grhDk(Adw-qLB3iJg% VYnS!)?)Lb*yV!fkPTTHt{RfyjU3CBe diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo index 5b66a5a7312d235d87c9856028c4e4db77426d86..85d24b3edc70ce2c003f4d4af274c16c27664ea7 100644 GIT binary patch delta 4180 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 delta 4084 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 diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po index 257992df..678cec13 100644 --- a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ msgstr "" "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "نام کاربری" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "گذرواٰژه" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "آدرس ایمیل" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "شما در حال ویرایش نمایه کاربر دیگری هستید.با احتیاط عمل کنید." -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "فایلی نا معتبر برای نوع رسانه داده شده." @@ -393,43 +393,43 @@ msgstr "هورا!ثبت شد!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "" msgid "Media processing panel" msgstr "پنل رسیدگی به رسانه ها" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -605,13 +606,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -621,7 +622,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "انصراف" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s رسانه های" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -991,9 +995,12 @@ 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 @@ -1036,7 +1043,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1101,69 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 ef38b9c96c5bbf0018b8a45788ce652a66d46d83..e9f28893306cab1d2092e9606a0286af88bf0782 100644 GIT binary patch delta 4932 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 a=e-0cZ(d)QmQAvFAn0Dh9evNYUh@yRtwVeO delta 4240 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 QtJnXO<*%;`rY>9aFLhT)H~;_u diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index cd691e10..20ab17dd 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -6,7 +6,9 @@ # <a5565930@nepwk.com>, 2011. # <alexispay@gmail.com>, 2012. # <chesuidayeur@yahoo.fr>, 2011. +# <crash_bibit@hotmail.com>, 2013. # <joehillen@gmail.com>, 2011. +# Laurent Pointecouteau <hell_pe@no-log.org>, 2013. # <marktraceur@gmail.com>, 2011. # <maxineb@members.fsf.org>, 2011. # <transifex@wandborg.se>, 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: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -26,31 +28,31 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." -msgstr "" +msgstr "Nom d'utilisateur ou adresse de courriel invalide." -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nom d'utilisateur" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Mot de passe" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresse e-mail" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nom d'utilisateur ou email" @@ -96,7 +98,7 @@ msgstr "" #: mediagoblin/auth/views.py:261 msgid "Couldn't find someone with that username." -msgstr "" +msgstr "Nom d'utilisateur introuvable." #: mediagoblin/auth/views.py:264 msgid "" @@ -210,54 +212,54 @@ msgid "" "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:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." -msgstr "" +msgstr "Vous ne pouvez modifier que votre propre profil." -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: 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:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Mauvais mot de passe" -#: mediagoblin/edit/views.py:253 +#: 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:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." -msgstr "" +msgstr "Vous devez confirmer la suppression de votre compte." -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: 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." @@ -285,7 +287,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Désolé, mais je ne prends pas en charge cette extension de fichier :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "L'encodage de la vidéo à échoué" @@ -375,11 +377,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Ajouter" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Le fichier envoyé ne correspond pas au type de média." @@ -400,43 +402,43 @@ msgstr "Youhou, c'est envoyé !" msgid "Collection \"%s\" added!" msgstr "Collection \"%s\" ajoutée !" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" -msgstr "" +msgstr "Déconnexion" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: mediagoblin/templates/mediagoblin/base.html:89 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 msgid "Create new collection" -msgstr "" +msgstr "Créer une nouvelle collection" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Changer les paramètres du compte" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -444,13 +446,14 @@ msgstr "Changer les paramètres du compte" msgid "Media processing panel" msgstr "Panneau pour le traitement des médias" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Conçu avec <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un projet <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -462,31 +465,31 @@ msgstr "Disponible sous la licence <a href=\"http://www.fsf.org/licensing/licens msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Explorer" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "Bonjour, et bienvenu sur ce site MediaGoblin !" +msgstr "Bonjour, et bienvenue sur ce site MediaGoblin !" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ce site fait tourner <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un logiciel d'hébergement de média extraordinairement génial." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -494,7 +497,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Créez un compte sur ce site</a>\n ou\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Déployez MediaGoblin sur votre propre serveur</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Tout derniers media" @@ -612,13 +615,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Ajouter une pièce jointe" @@ -628,7 +631,7 @@ msgstr "Ajouter une pièce jointe" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annuler" @@ -859,7 +862,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>" @@ -888,21 +898,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Ajouté le</h3>\n<p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Ajouter une nouvelle collection" @@ -998,10 +1004,13 @@ 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 @@ -1043,7 +1052,7 @@ 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." @@ -1053,25 +1062,25 @@ msgstr "Zut !" #: mediagoblin/tools/response.py:36 msgid "An error occured" -msgstr "" +msgstr "Une erreur est survenue" #: mediagoblin/tools/response.py:51 msgid "Operation not allowed" -msgstr "" +msgstr "Opération non autorisée" #: mediagoblin/tools/response.py:52 msgid "" "Sorry Dave, I can't let you do that!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" -msgstr "" +msgstr "Je regrette Dave, cela m'est malheureusement impossible !</p><p>Vous avez essayé d'effectuer une action pour laquelle vous n'avez pas de permission. Avez-vous tenté de supprimer tous les comptes utilisateur à nouveau ?" #: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." -msgstr "" +msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé ! </p><p>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" @@ -1108,69 +1117,69 @@ msgstr "Inclure une note" msgid "commented on your post" msgstr "a commenté votre post" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: 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:419 +#: 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:429 +#: 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 2fff0063c857b1c54a8cf4af21c91ec91367f609..87ce1b2a6f122e4ad71e1e16691ca866c6a7536e 100644 GIT binary patch delta 4163 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 G+`j>*qb0il delta 4094 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 diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index f5de4e85..e074a345 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ msgstr "" "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "שם משתמש" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "סיסמה" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "כתובת דוא״ל" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "שם משתמש או דוא״ל" @@ -204,54 +204,54 @@ msgid "" "change this." msgstr "אזור הכותרת של כתובת אוסף זה. לרוב אין הכרח לשנות את חלק זה." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "אתה עורך דיוקן של משתמש. המשך בזהירות." -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "שינויי דיוקן נשמרו" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "סיסמה שגויה" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "הגדרות חשבון נשמרו" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "אוסף עם חשופית זו כבר קיים עבור משתמש זה." -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות." @@ -279,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "צר לי, אינני תומך בטיפוס קובץ זה :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "המרת וידאו נכשלה" @@ -369,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "הוסף" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "ניתן קובץ שגוי עבור טיפוס מדיה." @@ -394,43 +394,43 @@ msgstr "הידד! נשלח!" msgid "Collection \"%s\" added!" msgstr "אוסף \"%s\" התווסף!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "אמת את הדוא״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "התנתקות" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "החשבון של <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "הוספת מדיה" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "שנה הגדרות חשבון" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "שנה הגדרות חשבון" msgid "Media processing panel" msgstr "לוח עיבוד מדיה" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "מופעל על ידי <a href=\"http://mediagoblin.org\">MediaGoblin</a>, פרויקט <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "משוחרר תחת הרשיון <a href=\"http://www.fsf.org/licensing/ msgid "Image of goblin stressing out" msgstr "תמונה של גובלין מתאמץ יתר על המידה" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "לחקור" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "שלום לך, ברוך בואך אל אתר MediaGoblin זה!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "אתר זה מריץ <a href=\"http://mediagoblin.org\">MediaGoblin</a>, חתיכת תוכנת אירוח מדיה יוצאת מן הכלל." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "אין ברשותך חשבון עדיין? זה קל!" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">יצירת חשבון אצל אתר זה</a>\n או\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">להתקין את MediaGoblin על שרתך</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "המדיה האחרונה ביותר" @@ -606,13 +607,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "הוספת תצריף" @@ -622,7 +623,7 @@ msgstr "הוספת תצריף" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "ביטול" @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "המדיה של <a href=\"%(user_url)s\">%(username)s</a>" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>הוסף בתאריך</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "הוסף מדיה לאוסף" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "הוסף אוסף חדש" @@ -992,10 +996,13 @@ 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 @@ -1037,7 +1044,7 @@ msgstr "ישן יותר" msgid "Tagged with" msgstr "מתויגת עם" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "לא היה ניתן לקרוא את קובץ התמונה." @@ -1102,69 +1109,69 @@ msgstr "הכללת פתק" msgid "commented on your post" msgstr "הגיב/ה על פרסומך" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "אופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "אנא בדוק את רשומותיך ונסה שוב." -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "עליך לבחור או להוסיף אוסף" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" כבר קיים באוסף \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" התווסף אל האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "מחקת את מדיה זו." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "מחקת את הפריט מן אוסף זה." -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת את האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 16ef8c09fd6e871a4077bb6597de7864e7197032..48b9d8a6cb2df0d1d5e992cf6aa7dbb925548054 100644 GIT binary patch delta 4161 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 XK_05~M|7tocLxfpUH?OnGp76pWKI&w delta 4057 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 Ho+sol8F2Ej diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index 286b1a9b..6d22148d 100644 --- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ msgstr "" "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nomine de usator" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Contrasigno" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresse de e-posta" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -204,54 +204,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -279,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -369,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -394,43 +394,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -606,13 +607,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -622,7 +623,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Cancellar" @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -992,9 +996,12 @@ 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 @@ -1037,7 +1044,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1102,69 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 c3f747abddf67c01feec26945c02c97795e8f110..b264c1ac7337115a87e499acfb3840f127c2d721 100644 GIT binary patch delta 4193 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 T*6jbWg1+O{J;AdzOB4SMYcU_3 delta 4119 zcmZYA4Nz3q8OHGgD6D8yz%26VRYXBal~2JhkR*bF3JO|@v8=MzRd+Eg5T%i&W2~(q z>PSTr<7mv(hNL>`I;J5-YiMkf&?c#wbS5>%2AeibbYg5K<D^sjf9CE?J5vVsch22= z&w0=Lo^$!zKv?(dVS#J0!wwpLzThvJzbB&9`|r=y(Z;0E{Rk)Ew>T4%#u!tKm6(W~ zI1Yb~PW%-*@Ct_ERUC!aa0oxg9Ag6Jow3H`b0Iv&m>F1zQ*k5i=E?n7M1OpoJ@9gj zpzlE*HD0_A+fe~@A~BlhaRi>mc<e*n|HshxLzv0@<|`Wfnq;0Hjx(_U3$Pr$xERl) z0u8(09%vS7f^r;*%Ta-?#aLX2&tMBi;uz9037x2biZFxuO*IV-)P~XcB=T$a@u6y* zz*IbiZTNf4#BxT_z)h$Lw<B|zPSi?|hrSOYNi=<^`v!3sevAP{euIW4_!7tC7(P_f z4Ak`pQMFu$O6_LU0Bxw622gva6B)wvqMo~iD&=)li5v-xiB9C#6ep1X0vfC7X{Gy7 z1NWc;JAztKFRC;bL)YKHGWzdf7A6qw4qS+T!r$OJd@jkD>39$Ga5_<H6W3!Qb|jPk zb{em8VLKMG)fv;AMeX`QKD0Offm+eOQ5i^~lZIKSnpUAQ=0`1LFDljDsLb`EN_94L z{Z-Vsg8>?p(_BYI_6@3b@pM$P3{*yDqf%Xr8n6;IaV=`1ZK!dcLIrXh$-3!BrTzod z^EXg??KUc-fp2MOrD2wx>ItX`@=*`Y5A`ciC8<T#(1jk{gDTNKQ4>Z_G^P~OP$}Mk zTF_Bc0H<*u_9Gbym?bPjDX&3dF+S9ddr=uUj2if4==x>UgjZ0R`7GouTt)v5{tPRq zj{?1o`ItD_-YZq84DG;do&O#hbzFE0*JFCRz0#lHF!~3PG0d}Affw*$jGn@V!z$G7 zKZHI!hdKpmY<&ej2UlPXF2xry3%|kVncqw%%<tf3wD4=xfKCp%&UtRgN0GVBZmhwR z*n#2G>^J95tfwEu9302iAC6_X7MGw(`U{M}J`8Au7ic(e0G0AV)TX+ITET6!Fq*LS zik^-d_z_f~F4TSP7=?#W&mTpdmb0imb_sR=$4HFkUs>e8md4Zv>{sm$e31TSoQ2V( zr36cH4(`M!@FMQQxkN*3=5<twZebb5&NSu#)}b43qW0E`Y&)ZV)M+`AP5vpDImd<B z_-E8goaB$DnSq+Xg|YZFY9+@|DZPLiI3<@d;5^j8B{%|Cp)%q^Wy}+@G4y>)fW|z& zkcY!K7RbxWtY*uyA59A?kY{lb4x)Civ%n5C8+m1z#W)H*$S|fAN8&cTg->D;`bjH8 zn3Kp<CNM-pwTLe?<^`TC#R~eLa<^)gLt3J78IHj^ydO7(?7(sKyKywWj5^MJsD->A zy8b1yU(G#?$4u%;MgnF5jU`+t!%cV)A44;jqXkWP9}Zv)zK2Tf5Gu7dQKk7BpFs!d z)XI;eR(J|0;wPAg!{*!f7h$x{e<cm2a20C6R!qir?8d{W$a9MAQ?dpV>AO*x=m_<@ zQ8hk;3iK5mi*JUme~23YIx0hdM`wUWc!?cA0#XfAh<b1<#^Db!5)YyVeh!oH6gu%O zRDgd$UL9uS0(+u7ET=ygwU>6`QhW(D-dzkRV!g1nc_PumI8=)BP&J>AkKj_w#+R@Q zuVQ={fpTUar~l)J>;>rcNVZKODzH{$E^`dq@e|yGu7%`Zsr+K0y`rcxJEdu;6&9h6 zV=d}@`%pDJfI61H#o>4dwFmB^7BY%u%LGipDX4`!gi3u)=(?|*{HxZTT+jo(s5jzy z)B~@fO7S)-g;!Dchb^*GpNa}J9~EddYMf1|fF8#YxCb5hQ{>%cj-X067@(nvhENaO z!4Vj_*mf+kPfQ|uu?{EU?@*ch9I1kd<jfMAS%lh@2T%dMi2LvoMq_oQz1P;D78Lja z4XyAP>KvazO>h|%*k`CW<Xu#%EzYX$pMv!`3xAD0s29s>b{H|4eaNfCe26Mt+%o$W zJ_|kc{kUG||05cTY(bU1;!4znEAhLyBjg9DfoD|PD{MoZp8c4GW0%{ze;%%+zX5Bo z9~DUK3S-{E3RIv;e3`2es%cnU*oB#R0t@h6Ovk8N`=7`I*iF9+*}!HRvozsW%)udy zMCU4AyO@G1Q8()PnUKH4k@PR(c&*@V8roDhFcrgC_C&N$$E_5V`exK_ZbOx*2ensT z!>RZN#^O!XeP*>iPAY2Cm0&$KB2$@nF;GV%gAbk8ov3qq33=(62oC*^uoQRUn^=O& z*4Q=Oj}7$C;R~4XDF3jq9}_WmtzF8cIG%nBPRG5d0Q%OFe~U)!_w1GCqH6C(t)vqt z;8EO$7g4D$thbNpW}HTUE5_hq)G<4WO8I$I=K4{4Yyf#hm_MMIl<uEo1-}}-J3RP) zOl|mNue-tHvYH#M^^IG$xYsv(8hvI#Lxa`4(c|Zu*X#B*2N#X&4G-RPwnQcW&uxAy zBRwPZl)E9*pBa2CwI{sm*vgo$O%*eO8z#<+bIi=Qvh!zW=XAZCXQ`8uO(%FI@0Ez) zUki_i=a&wgXm(ld4L*<6>KQm~xwfnu==0JtE8M;Ym*w&Ktbq$|zu#rKnm4w5-{p6E z8-nNOG(-fa7JuqU8hASNNQ?LXq8U{l8R4jKZ*OY0TpPMNR%Sc0EFQPqO<mrKG)Jqu NX|pB{9;&Ev{s%NL5kvq0 diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index accc1d6b..20d3e13c 100644 --- a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ msgstr "" "Language: is_IS\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Notandanafn" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Lykilorð" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Netfang" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Notandanafn eða netfang" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "Titilhlutinn í vefslóð þessa albúms. Þú þarft vanalega ekki að breyta þessu." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Breytingar á kenniskrá vistaðar" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Vitlaust lykilorð" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Aðgangsstillingar vistaðar" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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." @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Ég styð því miður ekki þessa gerð af skrám :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Myndbandsþverkótun mistókst" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Bæta við" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Ógild skrá gefin fyrir þessa margmiðlunartegund." @@ -393,43 +393,43 @@ msgstr "Jibbí jei! Það tókst að senda inn!" msgid "Collection \"%s\" added!" msgstr "Albúmið \"%s\" var búið til!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "útskrá" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Notandaaðgangur <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Breyta stillingum notandaaðgangs" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "Breyta stillingum notandaaðgangs" msgid "Media processing panel" msgstr "Margmiðlunarvinnsluskiki" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Keyrt af <a href=\"http://mediagoblin.org\">MediaGoblin</a>, sem er <a href=\"http://gnu.org/\">GNU</a> verkefni." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "Gefið út undir <a href=\"http://www.fsf.org/licensing/licenses/agpl-3. msgid "Image of goblin stressing out" msgstr "Mynd af durt í stresskasti" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Skoða" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hæ! Gakktu í bæinn á þetta MediaGoblin vefsvæði!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Þetta vefsvæði keyrira á <a href=\"http://mediagoblin.org\">MediaGoblin</a> sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Búa til aðgang á þessari síðu</a>\n eða\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Settu upp þinn eigin margmiðlunarþjón</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nýlegt efni" @@ -605,13 +606,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Bæta við viðhengi" @@ -621,7 +622,7 @@ msgstr "Bæta við viðhengi" #: 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:86 +#: 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ð" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Efni sem <a href=\"%(user_url)s\">%(username)s</a> á" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Bætt við:</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Bæta efni við albúmið" - #: 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:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Búa til nýtt albúm" @@ -991,10 +995,13 @@ 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 @@ -1036,7 +1043,7 @@ 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." @@ -1101,69 +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:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Obbosí! Athugasemdin þín var innihaldslaus." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Athugasemdin þín var skráð!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 f0b535e4d892db6d173583b2d46003a813af6b48..89338e10f6322e7897f445ef706f1f837edc24f6 100644 GIT binary patch delta 4191 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 Uek=EXtbK6ATIl`Z(viFV4V4rf9smFU delta 4100 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 Wy>-``hLzr?rUs&l^=Hm`CG!6|Lj|7z diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index 7633a33a..d1f56a42 100644 --- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -22,31 +22,31 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nome utente" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Password" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Indirizzo email" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Nome utente o indirizzo email" @@ -206,54 +206,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Cambiamenti del profilo salvati" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Password errata" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Impostazioni del profilo salvate" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -281,7 +281,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Mi dispiace, non supporto questo tipo di file :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Transcodifica video fallita" @@ -371,11 +371,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Aggiungi" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "File non valido per il tipo di file multimediale indicato." @@ -396,43 +396,43 @@ msgstr "Evviva! Caricato!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Cambia le impostazioni dell'account" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -440,13 +440,14 @@ msgstr "Cambia le impostazioni dell'account" msgid "Media processing panel" msgstr "Pannello di elaborazione files multimediali" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Realizzato con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un progetto <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -458,31 +459,31 @@ msgstr "Rilasciato con licenza <a href=\"http://www.fsf.org/licensing/licenses/a msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Esplora" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Ciao, benvenuto in questo sito MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma per caricare e condividere files multimediali." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -490,7 +491,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea un account in questo sito</a>\n oppure\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installa MediaGoblin sul tuo server</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Files multimediali più recenti" @@ -608,13 +609,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Aggiungi allegato" @@ -624,7 +625,7 @@ msgstr "Aggiungi allegato" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annulla" @@ -855,7 +856,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Files multimediali di <a href=\"%(user_url)s\">%(username)s</a>" @@ -884,21 +892,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Aggiunto il</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -994,9 +998,12 @@ msgstr "Sembra che non ci sia ancora nessun file multimediale qui..." 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 @@ -1039,7 +1046,7 @@ 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." @@ -1104,69 +1111,69 @@ msgstr "" msgid "commented on your post" msgstr "ha commentato il tuo post" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 b9483c0e9ae7beb7b41b08347bdc0ef400c274f8..c91b7664d47bf924a2690a13655282007431b1bc 100644 GIT binary patch delta 5962 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 delta 4510 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 diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index 81515f47..d2b3dc9a 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/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,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 10:11-0600\n" -"PO-Revision-Date: 2013-01-18 09:32+0000\n" -"Last-Translator: parlegon <parlegon@gmail.com>\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,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 "タイトル" @@ -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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\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 "" -#: 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.<br/>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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +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 "ファイル" -#: 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 "<a href=\"%(user_url)s\">%(user_name)s</a>'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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'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 <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -381,52 +457,31 @@ msgstr "" 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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, 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 "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -434,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" 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 "%(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 @@ -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 "キャンセル" #: 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 "" +#: 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さんのプロフィールを編集中" @@ -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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" 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 <a href=\"%(user_url)s\">%(username)s</a>" 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 "<a href=\"%(user_url)s\">%(username)s</a>'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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>さんのコンテンツ" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html: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 <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" 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 "あなたの確認メールを紛失した場合、<a href=\"%(login_url 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)" +#: 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" -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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "" -#: mediagoblin/user_pages/forms.py:28 +#: mediagoblin/user_pages/forms.py:23 +msgid "Comment" +msgstr "" + +#: mediagoblin/user_pages/forms.py:25 +msgid "" +"You can use <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "" + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "" -#: mediagoblin/user_pages/forms.py: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/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo index c2722aa4ca3ea4316cb81600a0e97d2964850c01..908b04c06f31d3f3fee73283866ba46b04931784 100644 GIT binary patch delta 4175 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 OAMih7_AW248v8F4Um&mm delta 4070 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 RKSblM%TFB{STZFc;YX%21}p#o diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po index 7f6c00b2..9f6301e5 100644 --- a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "사용자 이름" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "비밀번호" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "email 주소" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "사용자 이름 또는 email" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "사용자의 계정 정보를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "계정 정보가 저장 되었습니다." -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "잘못된 비밀번호" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "계정 설정이 저장 되었습니다." -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 유저의 모음집을 수정 중 입니다. 주의하세요." @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "죄송합니다. 해당 타입의 파일은 지원하지 않아요 :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "비디오 변환에 실패 했습니다." @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "추가" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "알수없는 미디어 파일 입니다." @@ -393,43 +393,43 @@ msgstr "이햐!! 등록했습니다!" msgid "Collection \"%s\" added!" msgstr "\"%s\" 모음집이 추가되었습니다!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "메일을 확인하세요!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "미디어 추가" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "계정 설정 변경" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "계정 설정 변경" msgid "Media processing panel" msgstr "미디어 작업 패널" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "Released under the <a href=\"http://www.fsf.org/licensing/licenses/agpl- msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "탐색" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "안녕하세요! 미디어 고블린 사이트에 온걸 환영 합니다!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "이사이트는 <a href=\"http://mediagoblin.org\">MediaGoblin</a>으로 작동 중입니다. 이는 특이한 미디어 호스팅 소프트웨어중 하나 입니다." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "아직 아무것도 없으시다구요? 매우 쉽습니다!" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">사용자 계정 만들기</a>\n 또는\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">서버를 위한 MediaGoblin 설정하기</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "가장 최근에 등록된 미디어" @@ -605,13 +606,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "첨부 추가" @@ -621,7 +622,7 @@ msgstr "첨부 추가" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "취소" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>의 미디어" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>부가 기능</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "새 모음집 추가" @@ -991,10 +995,13 @@ 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 @@ -1036,7 +1043,7 @@ msgstr "이전" msgid "Tagged with" msgstr "태그 정보" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "이미지 파일을 읽을 수 없습니다." @@ -1101,69 +1108,69 @@ msgstr "노트 추가" msgid "commented on your post" msgstr "게시물에 덧글이 달렸습니다." -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "오우, 댓글이 비었습니다." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "댓글이 등록 되었습니다!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "확인을 하시고 다시 시도하세요." -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "모음집을 추가하거나 기존 모음집을 선택하세요." -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" 모음집이 이미 존재 합니다. \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" 모음집을 추가했습니다. \"%s\"" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "미디어를 삭제 했습니다." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "모음집에 있는 항목을 삭제 했습니다." -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%s\" 모음집을 삭제하셨습니다." -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 723456cec4998f421dd43cef56f20ad2c3ea8b76..741162ed2098b3c638dc60fbc59c7d15b97f4af2 100644 GIT binary patch delta 4173 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 B7+e4V delta 4093 zcmaLZc~F(t8OQO%6#@Zq0m2rRE66G$mt92=V-({OM8O~}^#ZqYBTEIGHVk^5s<kmz zoKm-F7My0GDH-d{bSh&=HPPC{j8nC-P2CccPLs4Y#AKY&H0k#@?>m$H(W!&?bIy6+ z_nh-S&vPzp9SQLNF2Hv+B5;r4-#_`E!2iBr^}hLcd4e&Cbgy7C-o-q;f1)uJxCG;I zCr0557>&m<1TSC!UdHiw6>s1tm~V{FoSS4!5d)6N#>~J{%)nOM&Xc=wCjHn*YvLLl zN8gJ)YT7XzH=#DL6WOB~#C!1w#^4C*{`2<r8<@rV<}(`nm;{~<!aOX-Vywb;d<cJw z+GxOi)<h+!1*$L%Yfu|�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 Qdb$Qattt0ksmh4@FA609ZU6uP diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index f45ae6eb..ae2dea10 100644 --- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Gebruikersnaam" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Wachtwoord" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-mail adres" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Gebruikersnaam of email-adres" @@ -204,54 +204,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profielaanpassingen opgeslagen" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Verkeerd wachtwoord" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Accountinstellingen opgeslagen" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -279,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Sorry, dat bestandstype wordt niet ondersteunt." -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -369,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Voeg toe" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Verkeerd bestandsformaat voor mediatype opgegeven." @@ -394,43 +394,43 @@ msgstr "Mooizo! Toegevoegd!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Accountinstellingen aanpassen" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "Accountinstellingen aanpassen" msgid "Media processing panel" msgstr "Mediaverwerkingspaneel" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Hier draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een <a href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "Uitgegeven onder de <a href=\"http://www.fsf.org/licensing/licenses/agpl msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Verkennen" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hoi, welkom op deze MediaGoblin website!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Deze website draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een buitengewoon goed stuk software voor mediahosting." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">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:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nieuwste media" @@ -606,13 +607,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -622,7 +623,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Annuleren" @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Toegevoegd op</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -992,9 +996,12 @@ 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 @@ -1037,7 +1044,7 @@ 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." @@ -1102,69 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 d72aca91b331a86ee5f142c894c3168cb7bc09a2..e4096ef00701efec31cc627543dd2e40b06246f5 100644 GIT binary patch delta 4169 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 delta 4081 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 Tk-1yjS_7NCTSBX=X2$&+xLWhu diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index e39f51dd..43ecb1ae 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ msgstr "" "Language: nn_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brukarnamn" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Passord" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Epost" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brukarnamn eller epost" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "Tittel-delen av denne samlinga si adresse. Du treng normalt sett ikkje endra denne." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Lagra endring av profilen" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Feil passord" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Lagra kontoinstellingar" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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." @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Orsak, stør ikkje den filtypen :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Skjedde noko gale med video transkodinga" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Legg til" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Ugyldig fil for medietypen." @@ -393,43 +393,43 @@ msgstr "Johoo! Opplasta!" msgid "Collection \"%s\" added!" msgstr "La til samlinga «%s»." -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifiser epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "Logg ut" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> sin konto" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Endra kontoinstellingar" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "Endra kontoinstellingar" msgid "Media processing panel" msgstr "Verkprosesseringspanel" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Drive av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a href=\"http://gnu.org/\">GNU</a>-prosjekt." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "Lisensiert med <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Image of goblin stressing out" msgstr "Bilete av stressa goblin" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Utforsk" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Heihei, velkomen til denne MediaGoblin-sida." -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Denne sida køyrer <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit superbra program for å visa fram dine kreative verk." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Opprett ein konto på denne sida</a> eller <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">set opp MediaGoblin på eigen tenar</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Nyaste verk" @@ -605,13 +606,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Legg ved vedlegg" @@ -621,7 +622,7 @@ msgstr "Legg ved vedlegg" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Bryt av" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine verk" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Lagt til</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Legg til verk til samling" - #: 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:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Legg til ei ny samling" @@ -991,10 +995,13 @@ 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 @@ -1036,7 +1043,7 @@ 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." @@ -1101,69 +1108,69 @@ msgstr "Legg ved eit notat" msgid "commented on your post" msgstr "kom med innspel på innlegget ditt" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Du sletta verket." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 6539b8b3933bb6a2e76bfce695be8bfebf68414a..99f6bbfdfb37eeb16eebd244cbc1de489861bf43 100644 GIT binary patch delta 4187 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 R@E!4Xziw6eZq_Z1|2Lq&9`*nL delta 4110 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 diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index 9b7317af..d833bbfe 100644 --- a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Użytkownik" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Hasło" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adres e-mail" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Użytkownik lub adres e-mail" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "Część adresu zawierająca tytuł. Zwykle nie musisz tego zmieniać." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Zapisano zmiany profilu" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Nieprawidłowe hasło" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Zapisano ustawienia konta" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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ść." @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "NIestety, nie obsługujemy tego typu plików :-(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Konwersja wideo nie powiodła się" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Dodaj" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Niewłaściwy plik dla tego rodzaju mediów." @@ -393,43 +393,43 @@ msgstr "Hura! Wysłano!" msgid "Collection \"%s\" added!" msgstr "Kolekcja \"%s\" została dodana!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Zmień ustawienia konta" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "Zmień ustawienia konta" msgid "Media processing panel" msgstr "Panel przetwarzania mediów" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Obsługiwane przez <a href=\"http://mediagoblin.org\">MediaGoblin</a>, projekt <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "Opublikowane na licencji <a href=\"http://www.fsf.org/licensing/licenses msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Odkrywaj" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Cześć, witaj na stronie MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ten serwis działa w oparciu o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, świetne oprogramowanie do publikowania mediów." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Utwórz konto w tym serwisie</a>\n lub\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">załóż własny serwis MediaGoblin</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Najnowsze media" @@ -605,13 +606,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Dodaj załącznik" @@ -621,7 +622,7 @@ msgstr "Dodaj załącznik" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anuluj" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "media użytkownika <a href=\"%(user_url)s\">%(username)s</a>" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Dodane</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Dodaj nową kolekcję" @@ -991,10 +995,13 @@ 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 @@ -1036,7 +1043,7 @@ 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." @@ -1101,69 +1108,69 @@ msgstr "Dodaj notatkę" msgid "commented on your post" msgstr "komentarze do twojego wpisu" -#: mediagoblin/user_pages/views.py:159 +#: 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:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Twój komentarz został opublikowany!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Media zostały usunięte." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Usunięto kolekcję \"%s\"" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 9f1b35ac0e4a96498e9725ce321a446c4153ff5a..f3263fd7a41c00050eba07f017c66be76b346119 100644 GIT binary patch delta 6454 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 delta 4633 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 Ohl};q@-$t&r1D>bFaNm! diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index 6632d78f..d8877046 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/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: +# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013. # <snd.noise@gmail.com>, 2011. # ufa <ufa@technotroll.org>, 2011. # Vinicius SM <viniciussm@rocketmail.com>, 2013. @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-20 10:11-0600\n" -"PO-Revision-Date: 2013-01-26 16:38+0000\n" -"Last-Translator: Canopus <viniciussm@rocketmail.com>\n" +"POT-Creation-Date: 2013-02-23 10:46-0600\n" +"PO-Revision-Date: 2013-02-23 16:46+0000\n" +"Last-Translator: cwebber <cwebber@dustycloud.org>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,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 "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á 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 "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á 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 enviado novamente." -#: 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 "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: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 "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 "Não foi possível encontrar alguém com este nome de usuário ou email." - -#: mediagoblin/auth/views.py:333 +#: mediagoblin/auth/views.py:328 msgid "You can now log in using your new password." msgstr "Agora você pode entrar usando sua nova senha." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 +#: mediagoblin/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" @@ -105,8 +120,8 @@ 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" " <a href=\"http://daringfireball.net/projects/markdown/basics\">\n" @@ -121,11 +136,11 @@ msgstr "Etiquetas" msgid "Separate tags by commas." msgstr "Separe as etiquetas com vírgulas." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 +#: mediagoblin/edit/forms.py: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" @@ -164,71 +179,87 @@ msgstr "Digite sua senha antiga para provar que esta conta é sua." msgid "New password" 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 "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 "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 "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 "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 "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 "As mudanças no perfil foram salvas" -#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 -msgid "Account settings saved" -msgstr "As mudanças na conta foram salvas" - -#: 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 "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 "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 "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" @@ -238,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.<br/>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.<br/>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 :(" @@ -247,6 +285,15 @@ msgstr "Desculpe, não tenho suporte a este tipo de arquivo :(" msgid "Video transcoding failed" 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 <a href=\"%(osm_url)s\">OpenStreetMap</a>" +msgstr "Ver no <a href=\"%(osm_url)s\">OpenStreetMap</a>" + #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" msgstr "ID do Cliente" @@ -309,11 +356,26 @@ msgstr "" msgid "This field is required for public clients" 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/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 "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" @@ -321,56 +383,71 @@ 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 "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 "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" -msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>" - -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "log out" -msgstr "sair" - -#: 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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Fornecido pelo <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um projeto <a href=\"http://gnu.org/\">GNU</a>." +#: mediagoblin/templates/mediagoblin/base.html:76 +#, python-format +msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" +msgstr "Conta de <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:90 +#: mediagoblin/templates/mediagoblin/base.html:86 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:156 +msgid "Add media" +msgstr "Adicionar mídia" + +#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41 +msgid "Create new collection" +msgstr "Criar nova coleção" + +#: mediagoblin/templates/mediagoblin/base.html:92 +msgid "Change account settings" +msgstr "Mudar configurações da conta" + +#: 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 "Painel de processamento de mídia" + +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format +msgid "" +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -382,52 +459,31 @@ msgstr "Lançado sob a <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0. msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:25 -msgid "Actions" -msgstr "Ações" - #: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Create new collection" -msgstr "Criar nova coleção" - -#: mediagoblin/templates/mediagoblin/root.html:34 -msgid "Change account settings" -msgstr "Mudas configurações da conta" - -#: 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 "Painel de processamento de mídia" - -#: mediagoblin/templates/mediagoblin/root.html:51 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á, bem-vindo 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 <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Este site roda o <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um programa excelente para hospedar, gerenciar e compartilhar mídia." -#: mediagoblin/templates/mediagoblin/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 "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 "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -435,7 +491,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Criar uma conta neste site</a>\nou\n<a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Configurar MediaGoblin em seu próprio servidor</a>" -#: mediagoblin/templates/mediagoblin/root.html:67 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mídia mais recente" @@ -476,11 +532,11 @@ 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 @@ -541,6 +597,11 @@ 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 @@ -548,34 +609,50 @@ msgid "Editing attachments for %(media_title)s" 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 "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 "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 @@ -588,13 +665,17 @@ msgstr "Editando %(media_title)s" msgid "Changing %(username)s's account settings" msgstr "Alterando as configurações da conta de %(username)s" +#: mediagoblin/templates/mediagoblin/edit/edit_account.html: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 "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" @@ -610,7 +691,7 @@ msgstr "Etiquetas desta mídia: %(tag_name)s" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:48 msgid "Download" msgstr "Baixar" @@ -623,7 +704,7 @@ msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "Desculpe, este áudio não irá executar porque \n »seu navegador não oferece suporte a áudio \n »HTML5." +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 "" @@ -633,7 +714,7 @@ msgid "" msgstr "Você pode obter um navegador moderno\n »capaz de reproduzir o áudio em <a href=\"http://getfirefox.com\">\n » http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 -#: mediagoblin/templates/mediagoblin/media_displays/video.html:56 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Original file" msgstr "Arquivo original" @@ -645,11 +726,11 @@ msgstr "Arquivo 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 "" +msgstr "Imagem para %(media_title)s" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Toggle Rotate" @@ -691,21 +772,21 @@ msgstr "Formato de Arquivo" msgid "Object Height" 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 "Desculpe, esse vídeo não irá rodar porque\n» seu navegador não oferece suporte a vídeos\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 <a href=\"http://getfirefox.com\">\n" -"\t http://getfirefox.com</a>!" -msgstr "Você pode obter um navegador moderno\n» capaz de reproduzir este vídeo em <a href=\"http://getfirefox.com\">\n» http://getfirefox.com</a>!" +" can play this video at <a href=\"http://getfirefox.com\">\n" +" http://getfirefox.com</a>!" +msgstr "Você pode obter um navegador moderno\n capaz de reproduzir este vídeo em <a href=\"http://getfirefox.com\">\n http://getfirefox.com</a>!" -#: mediagoblin/templates/mediagoblin/media_displays/video.html:59 +#: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" msgstr "Arquivo WebM (640p, VP8/Vorbis)" @@ -713,12 +794,6 @@ msgstr "Arquivo WebM (640p, VP8/Vorbis)" msgid "Add a collection" msgstr "Adicionar uma coleção" -#: 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 "Adicionar" - #: 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 <a href=\"%(user_url)s\">%(username)s</a>" msgstr "%(collection_title)s de <a href=\"%(user_url)s\">%(username)s</a>" #: 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" @@ -750,11 +825,6 @@ 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 "Deletar permanentemente" - #: 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 "Realmente remover %(media_title)s de %(collection_title)s?" msgid "Remove" 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 "<a href=\"%(user_url)s\">%(username)s</a>'s collections" +msgstr "Coleções de <a href=\"%(user_url)s\">%(username)s</a>" + #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" @@ -776,56 +856,53 @@ msgstr "Olá %(username)s,\n %(comment_author)s comentou na sua publicação (%( msgid "%(username)s's media" msgstr "Mídia de %(username)s's" -#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:38 +#, python-format +msgid "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Mídia de <a href=\"%(user_url)s\"> %(username)s </a> " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:46 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:38 #, python-format msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>" msgstr "❖ Vendo mídia de <a href=\"%(user_url)s\">%(username)s</a>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:94 msgid "Add a comment" msgstr "Adicionar um comentário" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:109 -msgid "" -"You can use <a " -"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" -" formatting." -msgstr "Você pode usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para formatação." - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:113 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add this comment" 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 "" "<h3>Added on</h3>\n" " <p>%(date)s</p>" msgstr "<h3>Adicionado em</h3>\n<p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 -msgid "Add media to collection" -msgstr "Adicionar mídia à coleção" - -#: 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 "Adicionar %(title)s à coleção" +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 "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Adicionar uma nova coleção" @@ -887,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..." @@ -917,39 +998,35 @@ msgstr "Aparentemente não há nenhuma mídia aqui ainda..." msgid "(remove)" msgstr "(apagar)" -#: mediagoblin/templates/mediagoblin/utils/collections.html:20 -#, python-format -msgid "In collections (%(collected)s)" -msgstr "Nas coleções (%(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 "í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 "Localização" - -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 -#, python-format -msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>" -msgstr "Ver no <a href=\"%(osm_url)s\">OpenStreetMap</a>" - #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" 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:" @@ -958,60 +1035,75 @@ 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 "Etiquetas" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." 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 "Um erro ocorreu" -#: mediagoblin/tools/response.py:46 +#: mediagoblin/tools/response.py:51 msgid "Operation not allowed" 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!</p><p>You have tried to perform a " "function that you are not allowed to. Have you been trying to delete all " "user accounts again?" msgstr "Me desculpe Dave, não posso deixar você fazer isso!</p><p>Você tentou executar uma função sem autorização. Por acaso estava novamente tentando deletar todas as contas de usuários?" -#: mediagoblin/tools/response.py:55 +#: mediagoblin/tools/response.py:60 msgid "" "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure" " the address is correct, maybe the page you're looking for has been moved or" " deleted." msgstr "Parece que não há uma página com este endereço. Desculpe!</p><p>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 <a " +"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for" +" formatting." +msgstr "Você pode usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para formatação." + +#: mediagoblin/user_pages/forms.py:31 msgid "I am sure I want to delete this" msgstr "Eu tenho certeza de que quero apagar isso" -#: 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 "Tenho certeza que quero remover este item da coleção" -#: mediagoblin/user_pages/forms.py:35 +#: 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 "Incluir uma nota" @@ -1019,74 +1111,69 @@ msgstr "Incluir uma nota" msgid "commented on your post" 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 "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 +#: 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 "Você deve selecionar ou adicionar uma coleção" -#: mediagoblin/user_pages/views.py:238 +#: 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:253 +#: 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: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 "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 "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 "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 "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 "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 "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 "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 "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 01d1916a61cf68d4dfb0a6c93c3184982bbc07d2..ff91d595e95865f84db2ef0d2f714e2e27f69be2 100644 GIT binary patch delta 5433 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 Zy<ICx`_Gh$WD-*bGyTepomgQc{R35$1E2r^ delta 4350 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 Og@=UH`t~kzyZ!|a8gL8% diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index 34c8fb3c..5778e080 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -4,13 +4,13 @@ # # Translators: # <gapop@hotmail.com>, 2011. -# George Pop <gapop@hotmail.com>, 2011-2012. +# George Pop <gapop@hotmail.com>, 2011-2013. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." -msgstr "" +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 does not take email addresses." -msgstr "" - -#: mediagoblin/auth/forms.py:31 msgid "This field requires an email address." -msgstr "" +msgstr "Această rubrică trebuie completată cu o adresă de e-mail." -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Nume de utilizator" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Parolă" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresa de e-mail" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Numele de utilizator sau adresa de e-mail" @@ -86,11 +86,11 @@ msgstr "E-mail-ul de verificare a fost retrimis." msgid "" "If that email address (case sensitive!) is registered an email has been sent" " with instructions on how to change your password." -msgstr "" +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 "" +msgstr "Nu există nimeni cu acest nume de utilizator." #: mediagoblin/auth/views.py:264 msgid "" @@ -179,11 +179,11 @@ msgstr "Noua parolă" #: mediagoblin/edit/forms.py:74 msgid "License preference" -msgstr "" +msgstr "Licența preferată" #: mediagoblin/edit/forms.py:80 msgid "This will be your default license on upload forms." -msgstr "" +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" @@ -204,54 +204,54 @@ msgid "" "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:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." -msgstr "" +msgstr "Nu poți modifica decât propriul tău profil." -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Modificările profilului au fost salvate" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Parolă incorectă" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Setările pentru acest cont au fost salvate" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." -msgstr "" +msgstr "Trebuie să confirmi ștergerea contului tău." -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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ță." @@ -272,14 +272,14 @@ msgid "" "CSRF cookie not present. This is most likely the result of a cookie blocker " "or somesuch.<br/>Make sure to permit the settings of cookies for this " "domain." -msgstr "" +msgstr "Lipsește cookie-ul CSRF. Probabil că blocați cookie-urile.<br/>Asigurați-vă că există permisiunea setării cookie-urilor pentru acest domeniu." #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Scuze, nu recunosc acest tip de fișier :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Transcodarea video a eșuat" @@ -360,20 +360,20 @@ msgstr "Clientul {0} a fost înregistrat!" #: mediagoblin/plugins/oauth/templates/oauth/client/connections.html:22 msgid "OAuth client connections" -msgstr "" +msgstr "Conexiuni client OAuth" #: mediagoblin/plugins/oauth/templates/oauth/client/list.html:22 msgid "Your OAuth clients" -msgstr "" +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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Adaugă" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Formatul fișierului nu corespunde cu tipul de media selectat." @@ -394,43 +394,43 @@ msgstr "Ura! Trimis!" msgid "Collection \"%s\" added!" msgstr "Colecția \"%s\" a fost creată!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "Ieșire" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Contul lui <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Modifică setările contului" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "Modifică setările contului" msgid "Media processing panel" msgstr "Panou de procesare media" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proiect <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "Publicat sub licența <a href=\"http://www.fsf.org/licensing/licenses/ag msgid "Image of goblin stressing out" msgstr "Imagine cu un goblin stresat" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Explorează" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Salut, bine ai venit pe acest site MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Acest site folosește <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un software excepțional pentru găzduirea fișierelor media." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creează un cont pe acest site</a>\n sau\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instalează MediaGoblin pe serverul tău</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Cele mai recente fișiere" @@ -606,13 +607,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Atașează" @@ -622,7 +623,7 @@ msgstr "Atașează" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anulare" @@ -638,11 +639,11 @@ 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 "" +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 "" +msgstr "Da, doresc ștergerea contului meu" #: mediagoblin/templates/mediagoblin/edit/delete_account.html:44 #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:47 @@ -664,7 +665,7 @@ msgstr "Se modifică setările contului pentru userul %(username)s" #: mediagoblin/templates/mediagoblin/edit/edit_account.html:62 msgid "Delete my account" -msgstr "" +msgstr "Șterge contul meu" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format @@ -774,14 +775,14 @@ msgid "" "Sorry, this video will not work because\n" " your web browser does not support HTML5 \n" " video." -msgstr "" +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 "" "You can get a modern web browser that \n" " can play this video at <a href=\"http://getfirefox.com\">\n" " http://getfirefox.com</a>!" -msgstr "" +msgstr "Puteți obține un browser Web modern care poate reda această înregistrare de la <a href=\"http://getfirefox.com\">http://getfirefox.com</a>!" #: mediagoblin/templates/mediagoblin/media_displays/video.html:55 msgid "WebM file (640p; VP8/Vorbis)" @@ -834,12 +835,12 @@ msgstr "Șterge" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Colecțiile utilizatorului %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "Colecțiile utilizatorului <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Adăugat la</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Adaugă un fișier la colecție" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" -msgstr "" +msgstr "Adaugă „%(media_title)s” la o colecție" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Creează o nouă colecție" @@ -969,7 +973,7 @@ msgstr "Acest utilizator nu și-a completat (încă) profilul." #: mediagoblin/templates/mediagoblin/user_pages/user.html:124 msgid "Browse collections" -msgstr "" +msgstr "Vizitează colecțiile" #: mediagoblin/templates/mediagoblin/user_pages/user.html:137 #, python-format @@ -992,10 +996,13 @@ 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 @@ -1037,7 +1044,7 @@ 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." @@ -1069,7 +1076,7 @@ msgstr "Nu există nicio pagină la această adresă.</p><p>Dacă sunteți sigur #: mediagoblin/user_pages/forms.py:23 msgid "Comment" -msgstr "" +msgstr "Comentariu" #: mediagoblin/user_pages/forms.py:25 msgid "" @@ -1088,7 +1095,7 @@ msgstr "Sunt sigur(ă) că vreau să șterg acest articol din colecție" #: mediagoblin/user_pages/forms.py:39 msgid "Collection" -msgstr "" +msgstr "Colecție" #: mediagoblin/user_pages/forms.py:40 msgid "-- Select --" @@ -1102,69 +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:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Ai șters acest fișier" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: 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:419 +#: 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:429 +#: 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 8278bfb192503db924057198fc4d88aadd25bb43..31e551b69a54c91b62e9e39bac6c5ba96d9133f9 100644 GIT binary patch delta 4547 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 Ne%wHJ%i>ub{tafMAMXGF delta 4160 zcmY+`3s6+o9mny*iir3?2!cc&3qk}T;jN+~h*1=Upn%3`5?)Ir;U(xa7<HZcjADFj zRBW|sT5Ft2hPozIOt7X_o5W6+lE$<~v6>m9Z5}3ZoWxGk?{DtTv{m49&fR;@{h$B; ze=pp)<Fn&4ALq4T-`$3P|KvM@?^S~|`|rO`h8q*f^eRT<15CxyfyU(GTznYYF$9ld zD87yU*oQv&2@b_;coYAD>BczCpGFvy#Q|H8F)26^$Kq1l#FaZRoB61RtcB;}0Oobb zrKSOg;Tlu`?MRH~Fb>8p48v~J`G59)eiIY9zxkR0UnYX92VyFY$MHA|8?X@HLIvtG z(pqQ&>ISoL2+l_Z_6!DN74E|o=!b!%B^E<b0cB$X_c!wxXrYxDfa{Sjvz;HR#xF4n z-@ujlM@+<7tfGZmP&aHt?q%9hJAKXjxf@BM=|-J*34O62or?TZ2D-slI0^&#p_(S3 zj!#F`vI>>j7f=hVMAg)Z>Ya9E33Ci}-8ob#ucJ!jAI_Q>ihP;eaPmK%!6Ihb=?>Jw z9jL$#pmuZ&RhqNj<G;rO=DnDV;Y7O{XX0f%k5#yTv@uEe17>0pQL2e6a3ZdaApdI^ zoaR6qPNdaY)0{wc{Uv^=H}0Tz^lwxKBAJZAWK>N{P#J4QZR8bHs`sEWcMMgk6W-&e zQR`lEGN7F1Ix4dJsM>`wQOy!i8JUDibuMbbxu_eLqi*yfYMrg9Kwd+#Zr(wq{v*`& zpQ3v0E-ItW2Mn}RAG?+6Xw(g|P!~@1&gY^^QjV%&CD!2<REfSt-7p}=n0y?AN^vb} zLkCd-bm4Y<2g!)j6tNAZybOuOG@?#?1(kuHq89G-9>0LPVIL|px4nLW3z>g|M{o}H zQJ{A*3m=ZNdZh%Fq1BkC=f8u&Qyh37t1&*_+Ud*a%X~MohWQE3!5*A}0gupdSc2;Q zz1WB+QBT1bT3>-r#!@W9VtgHw@jf2r{w9tvAHxf1$9t#+LwU&coM(7_8o9UGgk{)? zYtc5&dULMB3g&K1#}Hb7AQs>=ScEF+aU6i%=+q8-82IDwP$|EJYN~6f9o$7b1`xJh z(MhO<7o!5LM4h(=2jO1S^#@T;%L!DEokN}9kHl#Hl}!H28H|0@deyGR>C7+S1PmZ8 zd6<uraUHJ0v$z4L5Dl@JcTpw!0t+xW)tFuQ6gu#8RBx50Ss86bJuL^)$Uo&WCpj<) zub_4kO8yv{6x0nWF&MX@c5(=n(jL^pkr|W$b5INC;b2^d%19+DV|8Aeyq~XdGRWZr zdBcat0>?8yM9Z>Ca~YpNKMpEW3sBvA9MxnOQE#?>48ai6#xf=mLoo@*b08ldXWll^ zdK!9g4s++X47Ag{Z0px;3vOfnJ?Y5B&E#Fr?;ntcHGlQ$GsSAML{tDva5U~js$e>i ztedMyxy^8PNxz!O7>5odBTlo0K@A6XU>n}U^Vl?%dSfP0D8;8R20zAl{2o;jd!A(m z?qfa^hvId79zRD;HBU~ndZ+_cnh!BR&;K<B^qaYjs#RD%uUCx5R3BsNQIQ{@Gl%0v zjKYslJG+Mw82h;Oc`gPqFGgjo0)25aDwEq#*ZmALxxe{<K@94xqEyDBZnV&AE$YG* zs6aNNO4fy1=mt_n6FAd)(ab^}-;Zk2_mEReLIIB^Hlo(^n??Th+=nq3f_5B($v6;8 zyz>RPiTO&TD#kXOzvplo?j}P~g#^R=BpszUsbjA7hstk}zBH4IjCmSca1DC!9zIb_ z{`Df5L5t^MGlt`@F&;lab@g3TV16am&c`8rYL?&#+=J?cqZo+Y7=Z7i*8dCgVDYDx zm6=RTU|Knk{EuR=g#&i{Ir`#x48!-(AODU^@eZm4rSq*WUybR^J5lRg$6@##Y9oV6 zt*0UemC+njiKnAV^rDl&2nI(`7rcc-(Ss_<RaB(6u?>UEtOeRp=buCR(_BHmOcXB( z1>TBUXDeRB4h+VM1=gFh6&Eshe#bzmp2ut~{s{FPA4E0f8BD>esLTv|(%Nw_Dxev7 z1kWOUW*m#iA|A)*v4n=8+~y1tgBiS-EaJ0Rt>?dRiB+pNyq-qY`aG`3&+t`jpo3PS zjh2o;CpO}Kq@m4_XRT%{#V+Ps@E}gEuzm+z!Nbg_Ra%exO`M_UKd8!Ts)eZ9zU<YF z%FI<{^JW0yUdF{p@Ft^%bmDeQ$FESO9OEEp%tZA<WUck<HVJ*1r=XfM6HB?j$z`B- zu?w@YAC>a(=ZF?(<3QYscHD_$@dT<l|Aw)66BV!@of?VB$jj6eVj*tEeb|Q^u%V7D zDy82r;9Ap6!Cu0Tu?5RsuwKO%Q5Uq=ThDQDgH@ttT*vWOu?I&{kDYiKAH}*RYeRcc z0rg@reu-^3wVC`s#^6-5Rf1cnREICKx^)?*Fkg>f;z`WMUl5%QZ($zZ!7xl}wVHN1 zj%4mY9e)YK(S=pmi6%C_HP-I_diW-r`@^7eTU>*qrmoVyyvbhORA29?US8MKXr|TF z*q1M@Yvou&gQIb|dv?e%oBM~*6@w!F=d@OPLVSYvDo0IXYodEuREN#=`nV8RZh5l1 zHYVpG|I{pdTGphrbl0yk?V6;gF>&{0&at`n2aa}6op9gB^>+3+*OZ{4uIB6__ozv0 z1_Z44ba_sD&e%QOuIQXcTzhh&cjbh-`g6iui$cb^v!<@~b-$Z`YgpVa`~Tga^F2MD zGyH$k)7`t#bE<cH?*`Y=lHUZ+t*dr4wmR(1Esk18i=(mH;odrL(Eyw0kgK?+VA$E- qwOpu+e(ZUZ*kj#w<+USR8<R5JDYZrZu8Pz+S6}@|_k+gg{Qd)4d`d(B diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index 1929ccef..64ade0a0 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# <deletesoftware@yandex.ru>, 2013. # <deletesoftware@yandex.ru>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +20,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Логин" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Пароль" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Адрес электронной почты" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Имя пользователя или адрес электронной почты" @@ -178,11 +179,11 @@ msgstr "Новый пароль" #: mediagoblin/edit/forms.py:74 msgid "License preference" -msgstr "" +msgstr "Предпочитаемая лицензия" #: mediagoblin/edit/forms.py:80 msgid "This will be your default license on upload forms." -msgstr "" +msgstr "Она будет лицензией по умолчанию для ваших загрузок" #: mediagoblin/edit/forms.py:82 msgid "Email me when others comment on my media" @@ -203,54 +204,54 @@ msgid "" "change this." msgstr "Отличительная часть адреса этой коллекции, основанная на названии. Обычно не нужно её изменять." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." -msgstr "" +msgstr "Вы можете редактировать только свой собственный профиль." -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "Вы редактируете профиль пользователя. Будьте осторожны." -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Изменения профиля сохранены" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Неправильный пароль" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Настройки учётной записи записаны" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "У этого пользователя уже есть коллекция с такой отличительной частью адреса." -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "Вы редактируете коллекцию другого пользователя. Будьте осторожны." @@ -278,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Увы, я не поддерживаю этот тип файлов :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Перекодировка видео не удалась" @@ -368,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Добавить" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Неправильный формат файла." @@ -393,43 +394,43 @@ msgstr "Ура! Файл загружен!" msgid "Collection \"%s\" added!" msgstr "Коллекция «%s» добавлена!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Подтвердите ваш адрес электронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "завершение сеанса" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Учётная запись <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "Добавить файлы" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Изменить настройки учётной записи" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +438,14 @@ msgstr "Изменить настройки учётной записи" msgid "Media processing panel" msgstr "Панель обработки файлов" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, проекте <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +457,31 @@ msgstr "Он опубликован на условиях <a href=\"http://www.f msgid "Image of goblin stressing out" msgstr "Изображение нервничающего гоблина" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Смотреть" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Привет! Добро пожаловать на наш MediaGoblin’овый сайт!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Этот сайт работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, необыкновенно замечательном ПО для хостинга мультимедийных файлов." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "У вас её ещё нет? Не проблема!" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Создайте учётную запись на этом сайте</a>\n или\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">установите MediaGoblin на собственный сервер</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Самые новые файлы" @@ -605,13 +607,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Добавить сопутствующий файл" @@ -621,7 +623,7 @@ msgstr "Добавить сопутствующий файл" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Отмена" @@ -833,12 +835,12 @@ msgstr "Исключить" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:21 #, python-format msgid "%(username)s's collections" -msgstr "" +msgstr "Коллекции %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:28 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s collections" -msgstr "" +msgstr "Коллекции <a href=\"%(user_url)s\">%(username)s</a>" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -852,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Файлы пользователя <a href=\"%(user_url)s\">%(username)s</a>" @@ -881,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Добавлено</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Добавить файл к коллекции" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" -msgstr "" +msgstr "Добавление «%(media_title)s» в коллекцию" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Добавление новой коллекции" @@ -991,10 +996,13 @@ 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 @@ -1036,7 +1044,7 @@ msgstr "более старые" msgid "Tagged with" msgstr "Метки" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "Не удалось прочитать файл с изображением." @@ -1101,69 +1109,69 @@ msgstr "Примечание" msgid "commented on your post" msgstr "оставил комментарий к вашему файлу" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуст." -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "Необходимо выбрать или добавить коллекцию" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» — уже в коллекции «%s»" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» добавлено в коллекцию «%s»" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Вы удалили файл." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "Вы исключили файл из коллекции." -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Вы удалили коллекцию «%s»" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 e014501541cc9e248ab8f39662e34474369849e4..4844597f1babb172c5b1845f4d3d06571a46d471 100644 GIT binary patch delta 4175 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 Hzlr@9QLGt7 delta 4111 zcmZYC3s6+o9mny*ib6mk0<J+GE(j3>t01UgPy+@u5lck0A<>GkEi1w%ESRE^wPUPS zF*+LYk!V6PLYUOYxM?g#v}U8zsrC_VbUHO^s<Aa~NHtBJNt&kLU+<l1XUgDy&bhny zJpTXxxr-;>3Axu7;=dXby3_FUSN<jP@3}Db{`+$!%9td&AL3~I3MXPhv@tVqE{?(u zjKdyu;t34Lix`4ea425I8~7K@HO6m#bH6e9TyP9GW&%#du~?5AxN{p8(0?G-8hAbq zqVGX&HH|n7+ffVXK-Orw@IE|(Bk?%u^B3&*Z(t_#o4YjlHHq9k7$@RnoQ$)v5g*03 zQ40+jVGT3|HNk9*#QCU&Ex{OEhI_CThhQ{eNku1WK?Rt>{N`~Q8fX<p;Pc3@*~*Ku z(T&M?2v^~+FcW7piUw{*P1uIaWjathea(J9fCSMTM}6)*hT=8!Yvng-XoA1t0~pPV za+-m<UV_TyGE`_APy?(&<<yU=oepFO(~G+AG%A(XQ7H<KXH0Y=zh*`}@t;iN33}S; zHq^koQ48CL+EFhmHK*+BXRwU^`<RXKtac5S;$?gfm*L9^#$@3)n1@-cQboKJr{dZ~ z;@?iAj|*)$l~QL+a}-te=Xp_We1h81zfciKqB91wQ8}$ZMa+lV$P1`YccLQKi%Qi| z`+6U0-1B}Kq|;nSt?V8ucO&U2XBnu76rw^s12y1W)WlV&iGF|@XESOcuOU%4{ix7i zLfwB8Rcm)p5%qsXLpu#|S)m?{njjx_<8-?}7nPDKR1Ry<gPTw(`a5dEh!kUraSSTN z-$QNa71RQb;8yHMBH}mYY(pVmfULzdp+5KmDgrN|20mzCKZ~01A}TVsZ3l1>{m=0L zK1P1D&^wrqqtdKesX#?&4d&?l@1{}Bg<oPVrl(sw{V|5p--(Q2_TpoB5+A{c2PrtL zKvn-PY{Iutr(g`FuZ2&;N?d^R@D0qyd)USNCXHo&3(ukpzd#M><dEx}PqJN%%xyN{ z0z8Oo(J{_?a<0Rr^aGfSag_dGEW;&Oj!NlIa1b6xzjk<%MmPphAwQ2Qs;j6S+(8#c zuxve|vrq#+iCSn4>T~TFhPzPrzk)g~M^QC)8uj^W$QsQ*vx$Edjj`jcN9`Icp??;q zU<6^AiN!b#*Wq(`3fJR9tcJCjcTp)Cz%q=PXv}u3MmK(ns;$Z#E22KsY1x-U{7IL2 ziwlML2h>iS#E+(#fSRBNV{i*<C$FMHdJ;8o(j?M=MW}&i;(fRX6_FZL#5}fM`~6lw zjUwKVfe?-bYJz7d*>v2B58+R72Hr(gZ|-Dk;pIr(nif=U_aMWV9=qR*1N4vKbnGUq z3}HUThtZ!f)p|xR#_x0Ideo!x(*moCQwfW9P>4Fm#kQ5`q+e(ES7S8&4&-TTUPhgQ zpJ6Qi7O7Wr6Ls99$mbB9{|p-c2{k^#8#P#pJvb8wP&=DI7&Ji<s#wcWRlE?DnrhsG zjmW?zjIgT6qEHhSpf*;C8gC;;==^um&`P^dJMBXX)SSjmIDlGt8}U<4Uq>zEAnLw; z)PNsgB;LT`_!*AC5b~x4jYPeljEOi7NBU`$(MZ7WVhXNCO|%a+Q4eaz$1nnajvC+` zY5{-7BviO`3X)L^Dn<(5RG@0)hd2ehQ5(IAeueNB4TbO%)XKj`RckaA5{DyjHjcxw z=);Zp65hkKVq>1g#1bpyFQQU-3R7^%EGzUG*iL^jcHos+#9uq{koaW$5vo`Ypmx-U zTF_-2gSSzU8ph~pn28GQJk$oN?0!9Jhh9_)o<$w&EvWgrF&%@Yeygf)b3sM&C5B>L znHB1I+cX@{^$Dn|UyP~Pf*NQSYJz@L$}ZX7!lCs4fkSW*VbpyQsD+L9(@?HUP&+8c zFkFhdu^yGfR&2#?)QyRAtVeP#5`9yN92C=uQFs9rxsPx&evT?W|D)FPV>2o>{%#t& z;TN`-QIWWXx<OxgDzc%d9i-X)EUczqf`@QFYN6$Gts-m3Ec$PwCi)}tXfdJX*53_9 zSgZ5jLqiLQoM(l86e`!FkzZ573m-AtkwQ1uQK5Eyn}-h;U^ebYE&LqnzK@YLnY;?? z+jT7-qJJ253YI*s`^bMM4Ha7uGw~zL!N~bmZi|qyOf9a%0CKd=luGM6U?t|#{{RPL zIN#07F$#xc8>*%@+it@M`a99d{N_~}s`_K7>OO}B_$SQ6lqzfBg{V{V6pq5xs9Nd7 zp|~HT@lDi*-oX+0d(_50!-W{niz4$h`ip3sprPD-i3&~DBI|!ZwYY))UR;l<-?9Fr zdIOcB_mRRjU*JwGdcyh(=pyP=6jLA%Vm*$=t#<z~&Z2**n)o|uBs^(_JQv5)ufrJJ zjykUg(2eh+a-H#%^(|M03G^4?{piDC_&h2y+c6yXVkEwfTJT{ssp-B{SKw~c21np` z!>b%=jqW;6jjP4$s`ai|;jV4*c$>__b#<<mdXJB5jg9W6mcX32UPs^?XKPsE|9s5n z%1F<!?{e2=`Z5F0B=2_YI8qrKC`efz8$L1Lm6KnXle^>1JeNATIdlRS^S&Mw$SNpx zWUUPLx2*Iwx4G)Pu2suC?&gLzQ_<|Ht2uMP)xxY^SA$ox2fLaBFHZZlBjBB$7@o9{ zt1H|MwVq&CZT<hPU{mP@M`V4l>&(U)S5vUdw_{u7q!?fD_<LJwd<^?^vv;|>p`~?4 NVM=P?+MEw#{|%Vz5cmK9 diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index 9bfe5af4..7f6efd1d 100644 --- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -23,31 +23,31 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Brugernavn" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Kodeord" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email adresse" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Brugernavn eller email" @@ -207,54 +207,54 @@ msgid "" "change this." msgstr "Titeldelen af denne samlings's adresse. Du behøver normalt ikke ændre dette." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Profilændringer gemt" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Forkert kodeord" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Kontoindstillinger gemt" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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å." @@ -282,7 +282,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Konvertovanie videa zlyhalo" @@ -372,11 +372,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Pridať" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Forkert fil for medietypen." @@ -397,43 +397,43 @@ msgstr "Juhuu! Delt!" msgid "Collection \"%s\" added!" msgstr "Kolekcia \"%s\" pridaná!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "odhlásiť sa" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Účet používateľa <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Zmeniť nastavenia účtu" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -441,13 +441,14 @@ msgstr "Zmeniť nastavenia účtu" msgid "Media processing panel" msgstr "Sekcia spracovania výtvorov" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Poháňa nás <a href=\"http://mediagoblin.org\">MediaGoblin</a>, súčasť projektu <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -459,31 +460,31 @@ msgstr "Vydané pod <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.htm msgid "Image of goblin stressing out" msgstr "Obrázok hysterického goblina" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Udforsk" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hey, velkommen til denne MediaGoblin side!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin</a>, výnimočne skvelý kus softvéru na hostovanie médií." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -491,7 +492,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Vytvoriť účet na tejto stránke</a>\n alebo\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Založiť MediaGoblin na vlastnom serveri</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Najčerstvejšie výtvory" @@ -609,13 +610,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Pridať prílohu" @@ -625,7 +626,7 @@ msgstr "Pridať prílohu" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Afbryd" @@ -856,7 +857,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Výtvory, ktoré vlastní <a href=\"%(user_url)s\">%(username)s</a>" @@ -885,21 +893,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Pridané</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Pridať výtvory do zbierky" - #: 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:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Pridať novú kolekciu" @@ -995,10 +999,13 @@ 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 @@ -1040,7 +1047,7 @@ 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." @@ -1105,69 +1112,69 @@ msgstr "Pridať poznámku" msgid "commented on your post" msgstr "skomentoval tvoj príspevok" -#: mediagoblin/user_pages/views.py:159 +#: 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:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol zaslaný!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: 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:419 +#: 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:429 +#: 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 e50892891800946072e038407cc5d2b8ebc6d273..772f78f0b6da92f54651e8f8b6f38a09c725aa8d 100644 GIT binary patch delta 4170 zcmb8xdr*|u8OQO%MUabJEhH$gVz`MYAP}IUL_rZR(I{T9qY&8Owge}*HO8*pcugi_ z!j!EsPA-N_%p@_!OtyoujkQgyNm{L);HZsl)M0FDRcLFiH9Bd(Kh8VTfBHx3Ec-d< zyzidN^PKa(?(7S>cqqjGMN;@K!@ukNjpc7!q-y{9cP-ACbgI`e6Jz3yDZ&Drj^DyG zd<jS6Axyy&I1&di1g~K%4&ngb!4hNq=0buoWi%uu8Z#N|u?aU|F81S7^l%3&sc%iT z102CH>Zg$|%sCu|S5OnVh0NK+Qi;MbsQa>!OQsy-7~eEd$fse2b73ovpuQW+@nx*X z)7XIN->?&2gX-`V)Bp!D1`neqb_|p7Q{02U#|T_cc(QO4rZT>Hl|mkVfa>THDpXf7 z8vluWOjxQh%1#<)U>0t~2T%+65H-LbQ3GE`#x&+0JJA%>^;{&FW)k{!V-1CHT#Q=5 za?}8A$j5BuYdFVF`yo_r&!9ql0rmSq)WmO~_L8}m6+$|yzcN%xm!MMRyO;QD<<HQ- z#{~H*$CId)hBK-<jzvu@5w)UpREnlJ?Ugv2dL2&0XK@q$7|&wG7-JsB1ZGu$>#!8} zjwSw?6i(Anfq%#EV<B7q348}Nu^gtaQ&5B2JgZPE@51r88I{w0$e896)B*-j5x$Cw z*w?5OL^7z_<NOrV;W$)|%aD(m$Cox&2P#*aP?6|Hh4_c44tr4pzm4kfB&wf_sEOP{ zvSE^3Hsl4U-&dmcntv7rg>oTkg-cN(_M!%O29>LTQ}0Ek;%!vw`fvwcK>hBKadto- z&Y->v71?vB1tl_DO&|-qb^a$)P)LrVLVX;Ww7H17QSns-Mxj=ciE6Jv4OoYY%u2^* zTt?lE`|t>AqOJGYW4jY4QvV3kbpD4Z6w?r$Z67>Sv6cF6)JpGQI7a5!T*u;E>P1+G zKAeRgA=}49<r>q8IhcyOP!m6Zi}5%vz%*txk@1a(LN7j#ldyur?80_bhfgCPv(NDq zGADBzmtf`uW1d7W>Ir%in=!j!_z`P%;0Wr6aTOj#r8I*u_`@hnq@WcR;Ych)g?t)n zQ!PZTpcP%{Lk;vYs^gQWiT0!J`wK>5RH6NSBI>l<huULPQ1>q?B>qg+bkfj>d$1md za3)p|j{DJvHTWa^Cf-CJ7Bh?O_%5<2Q(9zG)Qq#KZ^Irufo@z)p0&4*p(1*@nE30s z#FvmS%)u(0k6OvosJ+pP8lWGO@L#BvBu%j)EkbqNjiGoD)$jWlg`c7#(vOPRdB;nB z=Y}t_nhSr$6Cs3`$CC!QTV^{>E4Q!RDx6OHcTnehKk{BO$5ET@JSv4ZkZ#OfjK!~U z0AmOzb2mds*T$b!VOP8yn`j6i8`KP<Ub`uk_O<&8VM(F=9BR)DVFKR3Q5a5MG?65X z!(3E*IqJSzOvXm%x(7*t-)wL$yoL%*A1V?bqV~d9_yEqFY9p{6)nOk-<Hs0-pE>m} zP${~Cd+;tQ1<%tdj}-GNDpJ3|Je~jZ6m&!QG#jcoRL5gbE6zdXt{OA24mV;OvI27f zbv=r_=+q>l9!%p=6RpGuY;dkGLQSw0!~GQ2Q_u>&hZ^81ya(Svh3u%)-jB-d-%ugG zgF3d+HFo0hIF|ZY)bA^C96p3fsTVb&moN_xpnp7tGZfe#<}1`niix)dszgm}25LnM zP$_D2+P{snsjo*p4}OXP9K^G@Wrlt2HgT49dX6Cb+FZd*%%~;)>@zd1*1mQh$IaCL zfqEBgsI#Y_2Nj9;P%Hl>YU2H<-Fyqva01U^Euan+;`ykBG&}7cr~NU<ZL|F3nHzS~ zpcw^G1NEbF`6VjEw{iFwp*oCV+1gB_Q3KtN3Vj1=BJHRYY(brZ7g4`|3$@q!Q2qYQ zPa&PcF;s{LPy^gX{V=rNhCBh4iWJPlEZl)}QNQ~PHQ=9+sGE>E_O)A!%K0YL1fIig zd=VqiU(mpFnL-KX<1*9_HlrfYgX;KoR0l^;1O5uNf{Un*F5^nPhWoI7uAS&0mQhcg zXJ2mf9er4+^S_@$6F2-0Td{P$UFi#`j$cRRdOy;aIfbO#j9Fk`yDg~DzloiA47GPk zAG8x+fQzZOBbUrikP~a77wWA`{^wAbK*LoWhbfC}hZU%ZG&=e*oBCT=gQxIGOn7K` zCFTd%O#LX9po>wpfW^29n{X5!#xVRChtL17DJbN>#YDV>Nq7Sl`iLd=e=M0enfg2& zfj-pAx1jFZiyGhqjK|{`hi6cG>@w>9utvLJ7y9`#bNOQ5m|mQTf5u{*wA8M&87p)h zefT+U$7Rdxx&8wxMN!LbN(!-ux)<FTxx${VM^O=d7E|!h3gVwb;Wso?;Z4-Dxrhy+ z3Djc&ZbU`o4b(~wV>_Nj9oy;byii<?>iA)d#wRcmx1l1o)3FDmsK2msq<z`Ewles6 zTz6<7EHQt=qwY3Oi|cWZca6*2((ant;#$+?exy1pJCEw>?{;<MugjV?TnVOCJQx~y zFF7u7COI+QyVlj>YF*pW;coSM)^-N=RxJsZk8TVd;cjzzIs>)UL&2`p=OTic8M{I= zCTF?49&d-cI(MnNYaO?{vh&v4QvSN!z+;P&gP*uO$s<dqxQdIaO3MS4rLN&hIh9~b q>CeOd|GBn={<nDs_f{Qn<`}H4ekU>*Uw80-oZrrn;Ho+ACjJ{x$`y$K delta 4093 zcma*pdr*}{7{~GDpeU#)h=7WCKrv8C?s73D3_-yn#SAP1f%1$36*ws=ua1?IAvT>Z z+7+EFn9|78R5D6qnKcDvSux$r87;HYQY)u4>-+0{oBFGXK|Z_hW%t=<pFPJTFZ;E; z<YyfY?f0PJ=X?G|@o&`t_5S(!JlL2qbicr{cpj5*^iX4_V=<1x77W8@FdX;bKs<zg z_&E;7!*~?G!xUpI^WHFH(z)OYF=jGm;w88Q*YoCmm_<KwxIOS(^r!DZUNyBi1e;L- zv>-8>tr&=%7=c}==Ra`nAH@XbH)m+@Yod6&KPF)YW?&)K;%s~g6{z0`d!Q+(2?}u# z&P4^b2t#o(Zo%akfI~@3EQX^3%EEZ&H`mb6Kus8gcOt)L6MwWDPh&Lh#3t;;1T16} z4SXAF!j;HerUkXqZO(lkl0?&mdaeii;g@JB@?$hK!H*b;L;0gUjYnOdf!fQ(sMIb+ z4bX(zQwvo)Eyxh21NGiM)K(rrZPCDyjEUjMubDoQ{AbW8qo<YLhZ=Y@DzL{<E9yXP z&8yD!H?V;I`<RF$iFP&4#6H}Qi}A71#!SLLFbyXWrHZ%$GjUB6`ERDNn+q#3lTv3) zvkO)AJ^WE^e2ZGqMN|gH&>4q`s68z~Wvl_UkXBTxA3|lW1GQDVoa?($<MvoI*iLf< z71=q|-bK*Sp2edwl8s9Bbku;wsEOyJCR%|S=U!AG+mNiAy{OcGjC%hVs@6`UGHRWt zp_Tf%?NpCNO^}XyahlUFMs3M_)E-u%2RER$=qJ>KK{3YU;W$)^Z$d5TNmKxxxC!?n z8L`Y9mZ6lFBC(h{)Pt?43_OY&c!zWS0BXWRsLY&jJcSGBpT+H1#QrGI)0mE<#@n@0 zg38cpOxF3|Orx9&Z(|k4#n~&p2m8@~5E;Wff<@Sk`4}{Tg2NJ2^*@Yt_#)~QjHC1w zcn;3PQoIV=F%i$<R^~V33G*^MfNuO5HDEZ0T<1L1@djjWvmQ%v2d+WaMEjF-9ahly zVG4#(`u(v07vUV#mOh96*oBr>*iB;~zK%+H52~mRqgHSl-55mJ`iP!{8h9Zp&`Q*E z%{TxbM!o+e>a^@a)!07N^Isw{nhS~Ke?E;%F10^uSK|!&2XG1ok(OM{!yH_PtMFC4 z3#Sqdv6<IUTXYHwFf_@S`>`Br@Fc3X<|W%1Z9tut$CJrF+htzlLN<PeT1hzhqiH6i zCaA<v+=yC98!DyUsDa0%vJH4SYT#T9#098~RH8EGajbXlFSlr1&JEe)$FV?7uz`}* z!0kxz<}I9#zoM!)E5rV_D@7HX2epN3kzvdR9E>e^6t^I;n$@J0AxtM~!PeI_C`1#J zX@A|$!Yuml^Cuh!@sx@s7Kh;kR1r<VFwDnbEO)MZPyyYJdVZ60zYVEZ^E?j6PmqjQ z<|GYe;4BtmG8=sbHlbF&2Q|=148n^z2m`0u{Sg>S-;G-^6_xs4<fFj!p#u61Ianr? z$#g#lgLMA$X=tS-sJ*%w`4l$w*o3X9$OEU@_fs*1eh!YnIj8`uFaR5!`*)xM+lV@4 zZK%MvV>G^ik<4!n(ojlHI5&Pr?PU}juGGe%21rBgX%<G|OjNN}VGOQ9ZRHcFfDWKm z+=n_HI!cs*8IM}%LbNnd6%9qU47H*asA_FRU4H-zunl$ozd<iXvQK^Z94^K?^X$`d z9Mk9zpJ5kqAyQUm2{z+aT#N22$^S?i+pe^$eh(@WpJFtgLS<k`zP*AdR2ApqC~QEj zq!pFwhfoXZaIWuiu6H^1;%M$4!LfKD-?Ar+nrZK8687Up9xBxZr~ykc7H>dJv<9^W zUQ{5RsI7Phbvllr-amsXwm(qg29m}x7>vqvqD4a!<e^?H!v0u>O8t!(k4w>m51?MW zh?+30(Ehr;6qVvzP<!8j3ZM%&;hPwM3udwZxCj%_T1P`K>_Am@H)`O6r~yu(Cj14p zg2A)xfkJR0{Yc!7jTn!kitG=V8F(4}m5%Mmr@HCGa_nFH*SD=@DrgMi!hTeQ2XUMp zM4mP0k?k@CbL_9%ji}Urh;?`xRYMh5*?~9VJo;Yb*Bs{$2g+nzP2u5koQM%6IyLNn z9t{mxjS0Bc@mY+c{}JZmd0c~2ud!FM7c1z0hbqeAx%L7qTtxqF9D-k=Kb}Qp@Ei`q z3mC%uW(eVi;#gGbQ!o*WP{(ZrswUb|f$l^-_YP`;V>lGgU@*G)&w+|81oix6)QXF7 zKHiR$gXu+!qiDjpnvCU`i!G>P>cv$UaIO7yyACJO4_shxQ94rCrVQ`LHmt$a>+IvT z1(ng=7>-AA0{({C7*j_6BWPS-W(UxSn&4?vMm|8T<SV=x{iz(C+okBjdr<?oVi0b} z0oaMk*ej0R7)XCV@@a0~MH3s>5bO4x3108={g7GU@{SG*9$#Bi?WuG(*1N0fmo2NQ zYV_3CnJcQR-Hl5;4P2|Ot*LAD%?j&qd1I#?_kA7F8W8obM;qMnaq-TZHPs0X3BFsS zH@m#;6T^JjF`nTAlhWPE>DkFC-e=R?>ZByo@f}Lr=kNP4ga|TnLjP9;-dSO#zCAf* fE??}lrw06I1m0Vt(|qUhoBxiY#m|>AduPa>=O_a5 diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index 081c3608..4b202d51 100644 --- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Uporabniško ime" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Geslo" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-poštni naslov" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Za vrsto vsebine je bila podana napačna datoteka." @@ -393,43 +393,43 @@ msgstr "Juhej! Poslano." msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "" msgid "Media processing panel" msgstr "Podokno obdelovanja vsebine" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -605,13 +606,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -621,7 +622,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Prekliči" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -991,9 +995,12 @@ msgstr "Videti je, da tu še ni nobene vsebine ..." 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 @@ -1036,7 +1043,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1101,69 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 2f7501a6521aeb7b1ebe4d5cac7d7df5a14401a4..928f9a1394c07d5382758e3fc314373848481ad5 100644 GIT binary patch delta 4163 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 delta 4093 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 aH=OP1c)C0<WP`WX*O8l;6qs8QJLcauwF*T5 diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 6679e49f..edd811d7 100644 --- a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ msgstr "" "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Emër përdoruesi" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Fjalëkalim" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Adresë email" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "Emër përdoruesi ose email" @@ -204,54 +204,54 @@ msgid "" "change this." msgstr "Pjesa titull e adresës së këtij koleksioni. Zakonisht nuk keni pse e ndryshoni këtë." -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "Ndryshimet e profilit u ruajtën" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Fjalëkalim i gabuar" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "Rregullimet e llogarisë u ruajtën" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: 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:344 +#: 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ë." @@ -279,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "Na ndjeni, nuk e mbullojmë këtë lloj kartele :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "Ndërkodimi i videos dështoi" @@ -369,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "Shtoni" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Kartelë e gabuar e dhënë për llojin e medias." @@ -394,43 +394,43 @@ msgstr "Yhaaaaaa! U parashtrua!" msgid "Collection \"%s\" added!" msgstr "U shtua koleksioni \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "dilni" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "Llogaria e <a href=\"%(user_url)s\">%(user_name)s</a>" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "Ndryshoni rregullime llogarie" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "Ndryshoni rregullime llogarie" msgid "Media processing panel" msgstr "Paneli i Përpunimit të Medias" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "Bazuar në <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një projekt <a href=\"http://gnu.org/\">GNU</a>." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "Hedhur në qarkullim sipas <a href=\"http://www.fsf.org/licensing/licens msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Eksploroni" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Tungjatjeta juaj, mirë se vini te ky site MediaGoblin!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "Ky site përdor <a href=\"http://mediagoblin.org\">MediaGoblin</a>, një program jashtëzakonisht i shkëlqyer për strehim mediash." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Krijoni një llogarin te ky site</a>\n ose\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instaloni dhe rregulloni MediaGoblin-in te shërbyesi juaj</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Mediat më të reja" @@ -606,13 +607,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "Shtoni bashkangjitje" @@ -622,7 +623,7 @@ msgstr "Shtoni bashkangjitje" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Anuloje" @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "Media nga <a href=\"%(user_url)s\">%(username)s</a>" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>Shtuar më</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "Shtoni koleksion media" - #: 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:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "Shtoni një koleksion të ri" @@ -992,10 +996,13 @@ 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 @@ -1037,7 +1044,7 @@ 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." @@ -1102,69 +1109,69 @@ msgstr "Përfshini një shënim" msgid "commented on your post" msgstr "komentoi te postimi juaj" -#: mediagoblin/user_pages/views.py:159 +#: 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:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" -#: mediagoblin/user_pages/views.py:190 +#: 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:229 +#: 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:241 +#: 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:258 +#: 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:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "E fshitë median." -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: 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:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%s\"" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 4af77439dd682ab09048e873ddd85607165e3208..19e7da9ea1120d3df32bf2afd04bbc0e3156e9ba 100644 GIT binary patch delta 4161 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 delta 4042 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 Z`rWB+by7T89*^%#YCz!sJ=yPJe*+o4?x+9& diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 0c8eca57..97af606b 100644 --- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:11+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 <cwebber@dustycloud.org>\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -18,31 +18,31 @@ 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:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -202,54 +202,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -277,7 +277,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -367,11 +367,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -392,43 +392,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -436,13 +436,14 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -454,31 +455,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -486,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -604,13 +605,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -620,7 +621,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "" @@ -851,7 +852,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -880,21 +888,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -990,9 +994,12 @@ 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 @@ -1035,7 +1042,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1100,69 +1107,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 683ffa33b320af202615452d69e7c08e643fb46e..6ec18aa414cbfb8056551ff103bb1d7a6cb210e1 100644 GIT binary patch delta 4183 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 delta 4092 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 diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index ed8bfdd8..ab382efb 100644 --- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:11+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 <cwebber@dustycloud.org>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -20,31 +20,31 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "Användarnamn" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "Lösenord" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "E-postadress" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -204,54 +204,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: 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:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "Fel lösenord" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -279,7 +279,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -369,11 +369,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "Ogiltig fil för mediatypen." @@ -394,43 +394,43 @@ msgstr "Tjohoo! Upladdat!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: 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:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -438,13 +438,14 @@ msgstr "" msgid "Media processing panel" msgstr "Mediabehandlingspanel" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -456,31 +457,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "Utforska" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "Hej, välkommen till den här MediaGoblin-sidan!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: 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:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -488,7 +489,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "Senast medier" @@ -606,13 +607,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -622,7 +623,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "Avbryt" @@ -853,7 +854,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media" @@ -882,21 +890,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -992,9 +996,12 @@ 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 @@ -1037,7 +1044,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1102,69 +1109,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 f021546bf3f5c607bf5c28fea227ecd06264b22e..0de9a879eb23d7ed970dc1b7f38b2898a9359e2d 100644 GIT binary patch delta 4174 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 delta 4055 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 H*Y*AjD?RT} diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po index 010d8a8f..e82ffbdc 100644 --- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -19,31 +19,31 @@ msgstr "" "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "వాడుకరి పేరు" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "సంకేతపదం" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "ఈమెయిలు చిరునామా" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -203,54 +203,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -278,7 +278,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -368,11 +368,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -393,43 +393,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -437,13 +437,14 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -455,31 +456,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -487,7 +488,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -605,13 +606,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -621,7 +622,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "రద్దుచేయి" @@ -852,7 +853,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -881,21 +889,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -991,9 +995,12 @@ 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 @@ -1036,7 +1043,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1101,69 +1108,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 8f8a49bb866642172350de6a0789371affcc150e..d3b50931f4e1a009944ae20165c899c7f8a35fd7 100644 GIT binary patch delta 4163 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 delta 4072 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 diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index acb727ce..c265c818 100644 --- a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -18,31 +18,31 @@ msgstr "" "Language: zh_TW.Big5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "" @@ -202,54 +202,54 @@ msgid "" "change this." msgstr "" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "" @@ -277,7 +277,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "" @@ -367,11 +367,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "" @@ -392,43 +392,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -436,13 +436,14 @@ msgstr "" msgid "Media processing panel" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -454,31 +455,31 @@ msgstr "" msgid "Image of goblin stressing out" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -486,7 +487,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "" @@ -604,13 +605,13 @@ msgid "Editing attachments for %(media_title)s" msgstr "" #: mediagoblin/templates/mediagoblin/edit/attachments.html:43 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "" @@ -620,7 +621,7 @@ msgstr "" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "" @@ -851,7 +852,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "" @@ -880,21 +888,17 @@ msgid "" " <p>%(date)s</p>" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "" @@ -990,9 +994,12 @@ 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 @@ -1035,7 +1042,7 @@ msgstr "" msgid "Tagged with" msgstr "" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "" @@ -1100,69 +1107,69 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: 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 54864829c16d95a264ca23bc6a30ad43e5afdf86..42460628d20d068cda64a17d920d337d70d5fac9 100644 GIT binary patch delta 4177 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 G&+{*Ru@GSZ delta 4102 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 JxHTs=;@@*F4<!Hq diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index 00ff84ff..90078737 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2013-02-05 15:12-0600\n" -"PO-Revision-Date: 2013-02-05 21:12+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 <cwebber@dustycloud.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -21,31 +21,31 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: mediagoblin/auth/forms.py:29 +#: mediagoblin/auth/forms.py:28 msgid "Invalid User name or email address." msgstr "" -#: mediagoblin/auth/forms.py:30 +#: mediagoblin/auth/forms.py:29 msgid "This field does not take email addresses." msgstr "" -#: mediagoblin/auth/forms.py:31 +#: mediagoblin/auth/forms.py:30 msgid "This field requires an email address." msgstr "" -#: mediagoblin/auth/forms.py:53 mediagoblin/auth/forms.py:68 +#: mediagoblin/auth/forms.py:52 mediagoblin/auth/forms.py:67 msgid "Username" msgstr "使用者名稱" -#: mediagoblin/auth/forms.py:57 mediagoblin/auth/forms.py:72 +#: mediagoblin/auth/forms.py:56 mediagoblin/auth/forms.py:71 msgid "Password" msgstr "密碼" -#: mediagoblin/auth/forms.py:61 +#: mediagoblin/auth/forms.py:60 msgid "Email address" msgstr "Email 位址" -#: mediagoblin/auth/forms.py:79 +#: mediagoblin/auth/forms.py:78 msgid "Username or email" msgstr "使用者名稱或 email" @@ -205,54 +205,54 @@ msgid "" "change this." msgstr "此蒐藏網址的標題部份，通常不需要修改。" -#: mediagoblin/edit/views.py:67 +#: 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:183 +#: mediagoblin/edit/views.py:182 msgid "You can only edit your own profile." msgstr "" -#: mediagoblin/edit/views.py:189 +#: mediagoblin/edit/views.py:188 msgid "You are editing a user's profile. Proceed with caution." msgstr "您正在修改別人的個人檔案，請小心操作。" -#: mediagoblin/edit/views.py:205 +#: mediagoblin/edit/views.py:204 msgid "Profile changes saved" msgstr "個人檔案修改已儲存" -#: mediagoblin/edit/views.py:242 +#: mediagoblin/edit/views.py:241 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:253 +#: mediagoblin/edit/views.py:252 msgid "Account settings saved" msgstr "帳號設定已儲存" -#: mediagoblin/edit/views.py:287 +#: mediagoblin/edit/views.py:286 msgid "You need to confirm the deletion of your account." msgstr "" -#: mediagoblin/edit/views.py:323 mediagoblin/submit/views.py:142 -#: mediagoblin/user_pages/views.py:207 +#: 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:327 +#: mediagoblin/edit/views.py:326 msgid "A collection with that slug already exists for this user." msgstr "這個使用者已經有使用該簡稱的蒐藏了。" -#: mediagoblin/edit/views.py:344 +#: mediagoblin/edit/views.py:343 msgid "You are editing another user's collection. Proceed with caution." msgstr "您正在修改別人的蒐藏，請小心操作。" @@ -280,7 +280,7 @@ msgstr "" msgid "Sorry, I don't support that file type :(" msgstr "抱歉，我不支援這樣的檔案格式 :(" -#: mediagoblin/media_types/video/processing.py:36 +#: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" msgstr "影像轉碼失敗" @@ -370,11 +370,11 @@ 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:87 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68 msgid "Add" msgstr "增加" -#: mediagoblin/processing/__init__.py:138 +#: mediagoblin/processing/__init__.py:172 msgid "Invalid file given for media type." msgstr "指定錯誤的媒體類別！" @@ -395,43 +395,43 @@ msgstr "啊哈！PO 上去啦！" msgid "Collection \"%s\" added!" msgstr "蒐藏「%s」新增完成！" -#: mediagoblin/templates/mediagoblin/base.html:59 +#: mediagoblin/templates/mediagoblin/base.html:61 msgid "Verify your email!" msgstr "確認您的電子郵件" -#: mediagoblin/templates/mediagoblin/base.html:60 -#: mediagoblin/templates/mediagoblin/base.html:79 +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:82 msgid "log out" msgstr "登出" -#: mediagoblin/templates/mediagoblin/base.html:65 +#: 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:73 +#: mediagoblin/templates/mediagoblin/base.html:76 #, python-format msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account" msgstr "<a href=\"%(user_url)s\">%(user_name)s</a> 的帳號" -#: mediagoblin/templates/mediagoblin/base.html:83 +#: mediagoblin/templates/mediagoblin/base.html:86 #: mediagoblin/templates/mediagoblin/user_pages/user.html:156 msgid "Add media" msgstr "新增媒體" -#: mediagoblin/templates/mediagoblin/base.html:86 +#: 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:89 +#: mediagoblin/templates/mediagoblin/base.html:92 msgid "Change account settings" msgstr "更改帳號設定" -#: mediagoblin/templates/mediagoblin/base.html:93 -#: mediagoblin/templates/mediagoblin/base.html:99 +#: 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 @@ -439,13 +439,14 @@ msgstr "更改帳號設定" msgid "Media processing panel" msgstr "媒體處理面板" -#: mediagoblin/templates/mediagoblin/base.html:117 +#: mediagoblin/templates/mediagoblin/base.html:121 +#, python-format msgid "" -"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a " -"href=\"http://gnu.org/\">GNU</a> project." -msgstr "基於 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 一項 <a href=\"http://gnu.org/\">GNU</a> 專案。" +"Powered by <a href=\"http://mediagoblin.org/\" title='Version " +"%(version)s'>MediaGoblin</a>, a <a href=\"http://gnu.org/\">GNU</a> project." +msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:120 +#: mediagoblin/templates/mediagoblin/base.html:124 #, python-format msgid "" "Released under the <a " @@ -457,31 +458,31 @@ msgstr "以 <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL msgid "Image of goblin stressing out" msgstr "滿臉問號的哥布林" -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/root.html:31 msgid "Explore" msgstr "探索" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:33 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "嘿！歡迎來到 MediaGoblin 站台！ " -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:35 msgid "" "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an " "extraordinarily great piece of media hosting software." msgstr "本站使用 <a href=\"http://mediagoblin.org\">MediaGoblin</a> — 與眾不同的媒體分享網站。" -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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:31 +#: mediagoblin/templates/mediagoblin/root.html:38 msgid "Don't have one yet? It's easy!" msgstr "沒有帳號嗎？開帳號很簡單！" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:39 #, python-format msgid "" "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n" @@ -489,7 +490,7 @@ msgid "" " <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>" msgstr "<a class=\"button_action_highlight\" href=\"%(register_url)s\">在這個網站上建立帳號</a>\n 或是\n <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">在自己的伺服器上建立 MediaGoblin</a>" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:47 msgid "Most recent media" msgstr "最新的媒體" @@ -607,13 +608,13 @@ 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:161 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:177 +#: 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:182 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:180 msgid "Add attachment" msgstr "新增附件" @@ -623,7 +624,7 @@ msgstr "新增附件" #: 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:86 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:48 msgid "Cancel" msgstr "取消" @@ -854,7 +855,14 @@ 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 "" +"<a href=\"%(user_url)s\">%(username)s</a>'s media with tag <a " +"href=\"%(tag_url)s\">%(tag)s</a>" +msgstr "" + +#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:48 #, python-format msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media" msgstr "<a href=\"%(user_url)s\">%(username)s</a> 的媒體" @@ -883,21 +891,17 @@ msgid "" " <p>%(date)s</p>" msgstr "<h3>加入日期</h3>\n <p>%(date)s</p>" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add media to collection" -msgstr "將媒體加入蒐藏" - #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:28 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:40 #, python-format msgid "Add “%(media_title)s” to a collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:54 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:61 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:58 msgid "Add a new collection" msgstr "新增新的蒐藏" @@ -993,10 +997,13 @@ 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 @@ -1038,7 +1045,7 @@ msgstr "更舊的" msgid "Tagged with" msgstr "標籤" -#: mediagoblin/tools/exif.py:78 +#: mediagoblin/tools/exif.py:80 msgid "Could not read the image file." msgstr "無法讀取圖片檔案。" @@ -1103,69 +1110,69 @@ msgstr "加註" msgid "commented on your post" msgstr "在您的內容張貼評論" -#: mediagoblin/user_pages/views.py:159 +#: mediagoblin/user_pages/views.py:166 msgid "Oops, your comment was empty." msgstr "啊，您的留言是空的。" -#: mediagoblin/user_pages/views.py:165 +#: mediagoblin/user_pages/views.py:172 msgid "Your comment has been posted!" msgstr "您的留言已經張貼完成！" -#: mediagoblin/user_pages/views.py:190 +#: mediagoblin/user_pages/views.py:197 msgid "Please check your entries and try again." msgstr "請檢查項目並重試。" -#: mediagoblin/user_pages/views.py:229 +#: mediagoblin/user_pages/views.py:236 msgid "You have to select or add a collection" msgstr "您需要選擇或是新增一個蒐藏" -#: mediagoblin/user_pages/views.py:241 +#: mediagoblin/user_pages/views.py:248 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "「%s」已經在「%s」蒐藏" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:265 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "「%s」加入「%s」蒐藏" -#: mediagoblin/user_pages/views.py:279 +#: mediagoblin/user_pages/views.py:286 msgid "You deleted the media." msgstr "您已經刪除此媒體。" -#: mediagoblin/user_pages/views.py:286 +#: 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:294 +#: 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:365 +#: mediagoblin/user_pages/views.py:375 msgid "You deleted the item from the collection." msgstr "您已經從該蒐藏中刪除該項目。" -#: mediagoblin/user_pages/views.py:369 +#: 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:379 +#: 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:412 +#: mediagoblin/user_pages/views.py:422 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%s」蒐藏。" -#: mediagoblin/user_pages/views.py:419 +#: 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:429 +#: mediagoblin/user_pages/views.py:439 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您正在刪除別人的蒐藏，請小心操作。" From 954b407cf8386f3c40ce1f51c2c7f321075b0fe6 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sun, 24 Feb 2013 11:30:17 +0100 Subject: [PATCH 103/130] Use the media id for attachmemt editing. And remove some stray white space from the output. --- mediagoblin/edit/views.py | 4 ++-- .../mediagoblin/edit/attachments.html | 15 +++++++------ .../mediagoblin/user_pages/media.html | 22 ++++++++++--------- mediagoblin/user_pages/routing.py | 2 +- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index ceab52d0..cdb5c713 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -27,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 ( @@ -98,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/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 <http://www.gnu.org/licenses/>. #} -{% extends "mediagoblin/base.html" %} +{%- extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} @@ -28,13 +28,14 @@ {% block mediagoblin_content %} <form action="{{ request.urlgen('mediagoblin.edit.attachments', user= media.get_uploader.username, - media= media.id) }}" + media_id=media.id) }}" method="POST" enctype="multipart/form-data"> <div class="form_box"> <h1> - {% trans media_title=media.title -%} + {%- trans media_title=media.title -%} Editing attachments for {{ media_title }} - {%- endtrans %}</h1> + {%- endtrans -%} + </h1> <div style="text-align: center;" > <img src="{{ media.thumb_url }}" /> </div> @@ -42,19 +43,19 @@ {% if media.attachment_files|count %} <h2>{% trans %}Attachments{% endtrans %}</h2> <ul> - {% for attachment in media.attachment_files %} + {%- for attachment in media.attachment_files %} <li> <a target="_blank" href="{{ request.app.public_store.file_url( attachment['filepath']) }}"> {{- attachment.name -}} </a> </li> - {% endfor %} + {%- endfor %} </ul> {% endif %} <h2>{% trans %}Add attachment{% endtrans %}</h2> - {{ wtforms_util.render_divs(form) }} + {{- wtforms_util.render_divs(form) }} <div class="form_submit_buttons"> <a href="{{ media.url_for_self(request.urlgen) }}"> {%- trans %}Cancel{% endtrans -%} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 7550c6c1..535ee448 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 <http://www.gnu.org/licenses/>. #} -{% extends "mediagoblin/base.html" %} +{%- extends "mediagoblin/base.html" %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% from "mediagoblin/utils/pagination.html" import render_pagination %} @@ -155,31 +155,33 @@ {% include "mediagoblin/utils/exif.html" %} - {% if media.attachment_files|count %} + {%- if media.attachment_files|count %} <h3>{% trans %}Attachments{% endtrans %}</h3> <ul> - {% for attachment in media.attachment_files %} + {%- for attachment in media.attachment_files %} <li> <a href="{{ request.app.public_store.file_url(attachment.filepath) }}"> {{- attachment.name -}} </a> </li> - {% endfor %} + {%- endfor %} </ul> - {% 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 %} <h3>{% trans %}Attachments{% endtrans %}</h3> - {% endif %} + {%- endif %} <p> <a href="{{ request.urlgen('mediagoblin.edit.attachments', user=media.get_uploader.username, - media=media.id) }}">{% trans %}Add attachment{% endtrans %}</a> + media_id=media.id) }}"> + {%- trans %}Add attachment{% endtrans -%} + </a> </p> - {% endif %} + {%- endif %} {% template_hook("media_sideinfo") %} diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 6ea3c3e2..7de3ab60 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -87,5 +87,5 @@ add_route('mediagoblin.edit.edit_media', 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', - '/u/<string:user>/m/<string:media>/attachments/', + '/u/<string:user>/m/<int:media_id>/attachments/', 'mediagoblin.edit.views:edit_attachments') From 96a2249bc01ba67ee4487703f1b8757d9e6e77e7 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sun, 24 Feb 2013 16:08:55 +0100 Subject: [PATCH 104/130] Use media.id for collecting media too. Also remove some useless whitespace while at it. --- .../mediagoblin/user_pages/media_collect.html | 2 +- .../templates/mediagoblin/utils/collections.html | 12 ++++++------ mediagoblin/user_pages/routing.py | 2 +- mediagoblin/user_pages/views.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html index 0fa0a9f4..b4c9671c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media_collect.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media_collect.html @@ -33,7 +33,7 @@ {% block mediagoblin_content %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_collect', user=media.get_uploader.username, - media=media.id) }}" + media_id=media.id) }}" method="POST" enctype="multipart/form-data"> <div class="form_box"> <h1> diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index db23625b..2cff7a29 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -20,7 +20,7 @@ {% if media.collections %} <h3>{% trans %}Collected in{% endtrans %}</h3> <p> - {% for collection in media.collections %} + {%- 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 %} @@ -32,17 +32,17 @@ {% else %} <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> · {% endif %} - {% endfor %} + {%- endfor %} </p> - {% endif %} - {% if request.user %} + {%- endif %} + {%- if request.user %} <p> <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', user=media.get_uploader.username, - media=media.id) }}" + media_id=media.id) }}" class="button_action"> {% trans %}Add to a collection{% endtrans %} </a> </p> - {% endif %} + {%- endif %} {% endblock %} diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 7de3ab60..9cb665b5 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -50,7 +50,7 @@ add_route('mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.views:atom_feed') add_route('mediagoblin.user_pages.media_collect', - '/u/<string:user>/m/<string:media>/collect/', + '/u/<string:user>/m/<int:media_id>/collect/', 'mediagoblin.user_pages.views:media_collect') add_route('mediagoblin.user_pages.collection_list', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 601eef17..bbc3259a 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -180,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""" From 5a0501689625176b712f3da5711fed325e9033f9 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sun, 24 Feb 2013 16:09:45 +0100 Subject: [PATCH 105/130] Add owner to list of collections. When listing the collections, that a media is contained in, also show the owner of the collection. Also simplify the whole looping a lot. --- .../mediagoblin/utils/collections.html | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index 2cff7a29..69738e26 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -21,17 +21,13 @@ <h3>{% trans %}Collected in{% endtrans %}</h3> <p> {%- 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 %} - · - {% endif %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> - {% elif loop.revindex == 2 %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> - {% else %} - <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> · - {% endif %} + {%- if not loop.first %} + · + {%- endif %} + <a href="{{ collection.url_for_self(request.urlgen) }}"> + {{- collection.title }} ( + {{- collection.get_creator.username -}} + )</a> {%- endfor %} </p> {%- endif %} From f6d1d28d455d4cd84e55f7979667f57f64481b0b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 24 Feb 2013 12:33:39 -0600 Subject: [PATCH 106/130] extra_head template hook. This will allow plugins to add extra js/css more easily. This commit sponsored by Moritz Berberich. Thank you! --- mediagoblin/templates/mediagoblin/base.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 3c8a26bc..36bb4c62 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -36,7 +36,14 @@ <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script> <![endif]--> + {# For clarification, the difference between the extra_head.html template + # and the extra_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("extra_head") %} {% block mediagoblin_head %} {% endblock mediagoblin_head %} From cac17c156b85b275b76384550261a13b697eb5d6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 24 Feb 2013 12:42:17 -0600 Subject: [PATCH 107/130] Renaming "extrahead" template hooks to "head". As Elrond points out, the "extra" is implied by it being a hook! This commit sponsored by Andrew Fustini. Thanks, Drew! --- mediagoblin/plugins/geolocation/__init__.py | 2 +- mediagoblin/templates/mediagoblin/base.html | 4 ++-- mediagoblin/templates/mediagoblin/media_displays/image.html | 2 +- mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py index c55e1e6a..5d14590e 100644 --- a/mediagoblin/plugins/geolocation/__init__.py +++ b/mediagoblin/plugins/geolocation/__init__.py @@ -27,7 +27,7 @@ def setup_plugin(): pluginapi.register_template_hooks( {"image_sideinfo": "mediagoblin/plugins/geolocation/map.html", - "image_extrahead": "mediagoblin/plugins/geolocation/map_js_head.html"}) + "image_head": "mediagoblin/plugins/geolocation/map_js_head.html"}) hooks = { diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 36bb4c62..25e71396 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -37,13 +37,13 @@ <![endif]--> {# For clarification, the difference between the extra_head.html template - # and the extra_head template hook is that the former should be used by + # 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("extra_head") %} + {% template_hook("head") %} {% block mediagoblin_head %} {% endblock mediagoblin_head %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index bc03c456..158dd67f 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -20,7 +20,7 @@ {% block mediagoblin_head %} {{ super() }} - {% template_hook("image_extrahead") %} + {% template_hook("image_head") %} {% endblock mediagoblin_head %} {% block mediagoblin_sidebar %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 535ee448..876ce850 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -30,7 +30,7 @@ <script type="text/javascript" src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script> - {% template_hook("media_extrahead") %} + {% template_hook("media_head") %} {% endblock mediagoblin_head %} {% block mediagoblin_content %} From 76b399a3ef5ca844c0c6d1f288cf6f0030603093 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 24 Feb 2013 13:53:15 -0600 Subject: [PATCH 108/130] Changing the order so that config_spec.ini is mentioned after mediagoblin_local.ini This commit sponsored by Matteo Settenvini. Thanks! --- mediagoblin.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mediagoblin.ini b/mediagoblin.ini index 66c9c77c..bed69737 100644 --- a/mediagoblin.ini +++ b/mediagoblin.ini @@ -1,9 +1,9 @@ -# 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. :) - # 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/ From fe253e31b33b82e2c6a6d17955945f698a59221d Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Sun, 24 Feb 2013 20:53:34 +0100 Subject: [PATCH 109/130] Improved dropdown styling --- mediagoblin/static/css/base.css | 1 + mediagoblin/templates/mediagoblin/base.html | 37 +++++++++------------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 04b4ee28..7de7a7d0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -132,6 +132,7 @@ header { } .header_dropdown li { + margin: 4px 0; list-style: none; } diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 25e71396..068af79a 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -85,33 +85,26 @@ user_name=request.user.username -%} <a href="{{ user_url }}">{{ user_name }}</a>'s account {%- endtrans %} - </span> - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) - </p> - <ul> - <li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> - {%- trans %}Add media{% endtrans -%} - </a></li> - <li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}"> - {%- trans %}Create new collection{% endtrans -%} - </a></li> - <li><a href="{{ request.urlgen('mediagoblin.edit.account') }}"> - {%- trans %}Change account settings{% endtrans -%} - </a></li> - <li><a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel', + </span> · + <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a> · + <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel', user=request.user.username) }}"> {%- trans %}Media processing panel{% endtrans -%} - </a></li> + </a> · <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> + </p> + <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> + {%- trans %}Add media{% endtrans -%} + </a> + <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}"> + {%- trans %}Create new collection{% endtrans -%} + </a> + + {% if request.user.is_admin %} - <li>Admin: - <ul> - <li><a href="{{ request.urlgen('mediagoblin.admin.panel') }}"> + <a href="{{ request.urlgen('mediagoblin.admin.panel') }}"> {%- trans %}Media processing panel{% endtrans -%} - </a></li> - </ul> - </li> + </a> {% endif %} - </ul> </div> {% endif %} </header> From a5b9a066bf7f18b9707d798990560bf6b52a1a8d Mon Sep 17 00:00:00 2001 From: Jef van Schendel <mail@jefvanschendel.nl> Date: Sun, 24 Feb 2013 21:09:16 +0100 Subject: [PATCH 110/130] Improved dropdown styling, part deux --- mediagoblin/static/css/base.css | 5 ++++ mediagoblin/templates/mediagoblin/base.html | 29 ++++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 7de7a7d0..8df9f2e1 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -136,6 +136,11 @@ header { list-style: none; } +.header_dropdown p { + margin-top: 12px; + margin-bottom: 10px; +} + .dropdown_title { font-size: 20px; } diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 068af79a..13433b33 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -85,25 +85,30 @@ user_name=request.user.username -%} <a href="{{ user_url }}">{{ user_name }}</a>'s account {%- endtrans %} - </span> · - <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a> · - <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel', + </span> + · + <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a> + · + <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel', user=request.user.username) }}"> - {%- trans %}Media processing panel{% endtrans -%} - </a> · <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> + {%- trans %}Media processing panel{% endtrans -%} + </a> + · + <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> </p> - <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> + <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> {%- trans %}Add media{% endtrans -%} </a> - <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}"> + <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}"> {%- trans %}Create new collection{% endtrans -%} </a> - - {% if request.user.is_admin %} - <a href="{{ request.urlgen('mediagoblin.admin.panel') }}"> - {%- trans %}Media processing panel{% endtrans -%} - </a> + <p> + <span class="dropdown_title">Admin powers:</span> + <a href="{{ request.urlgen('mediagoblin.admin.panel') }}"> + {%- trans %}Media processing panel{% endtrans -%} + </a> + </p> {% endif %} </div> {% endif %} From 37b48053e9f2da3a6e2378874b025ab152f6f614 Mon Sep 17 00:00:00 2001 From: pythonsnake <pythonsnake98@gmail.com> Date: Sun, 10 Feb 2013 14:07:09 +0100 Subject: [PATCH 111/130] Fix bug 461 --- docs/source/siteadmin/deploying.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 91406f96..d1300d72 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -282,6 +282,9 @@ 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; From a49c741f1141e8b9ff6022ebeddc4ad335fdab8a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Sun, 24 Feb 2013 16:37:39 -0600 Subject: [PATCH 112/130] Removing stray character from pythonsnake's doc change and filling comment This commit sponsored by Johannes Knabbe. Thank you! --- docs/source/siteadmin/deploying.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index d1300d72..9b2324ae 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -282,8 +282,9 @@ 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;· + # 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; From 86f0ff75e3538b45b23c251d3a7c31496fe8f39a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Mon, 25 Feb 2013 12:15:12 -0600 Subject: [PATCH 113/130] You can now set the PASTE_CONFIG environment variable to control logging setup So this should work: PASTE_CONFIG=/path/to/paste_foo.ini ./lazycelery.sh Thanks to Laurent Fournier for sponsoring this commit! --- mediagoblin/init/celery/from_celery.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 29037d10..5c99ddff 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -35,6 +35,11 @@ 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)) From e66431f4c39e58cccfd356e0300a246f1494b15e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Mon, 25 Feb 2013 16:16:21 -0600 Subject: [PATCH 114/130] Supplying migrations for a bold new era of mediagoblin entry slugs Okay, that's a totally confusing statement, but the docstring of this migration summarizes it well: 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) This commit sponsored by John Sullivan. Thanks johnsu01! :) --- mediagoblin/db/migrations.py | 54 ++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index b25d577d..3c997b94 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -195,3 +195,57 @@ def add_license_preference(db): 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): + # Technically returns the number of entries with this slug and user + # that already exist + return db.execute( + media_table.select( + media_table.c.uploader==uploader, + media_table.c.slug==slug)).first().tbl_row_count + + 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"-")) From 0c6a34bf5ceee7ec6b95287d4464772a0618ff8d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Mon, 25 Feb 2013 16:35:05 -0600 Subject: [PATCH 115/130] Dope'ily missed .count() on the query where we're counting Thanks for catching, Elrond. This commit sponsored by Graham King. Thank you! --- mediagoblin/db/migrations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 3c997b94..05dc31ef 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -219,7 +219,7 @@ def mediaentry_new_slug_era(db): return db.execute( media_table.select( media_table.c.uploader==uploader, - media_table.c.slug==slug)).first().tbl_row_count + media_table.c.slug==slug).count()).first().tbl_row_count def append_garbage_till_unique(row, new_slug): """ From 0b7cdb6f3ec1c6e053df02434ead8714dc0cb32f Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 09:58:25 -0600 Subject: [PATCH 116/130] And of course, we need to actually commit at the end of a migration. This commit sponsored by Tamas Kemenczy. Thanks, Tamas! --- mediagoblin/db/migrations.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 05dc31ef..0a3bf825 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -241,6 +241,7 @@ def mediaentry_new_slug_era(db): 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: @@ -249,3 +250,5 @@ def mediaentry_new_slug_era(db): 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() From ab1f65e6d773cce591e8779d84d8429f7d21d519 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 10:15:26 -0600 Subject: [PATCH 117/130] Import sqlalchemy's and_ and use it in our select statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit sponsored by Hans-Jörg Dollansky. Thank you! --- mediagoblin/db/migrations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 0a3bf825..e9b4e9ef 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 @@ -218,8 +219,8 @@ def mediaentry_new_slug_era(db): # that already exist return db.execute( media_table.select( - media_table.c.uploader==uploader, - media_table.c.slug==slug).count()).first().tbl_row_count + and_(media_table.c.uploader==uploader, + media_table.c.slug==slug)).count()).first().tbl_row_count def append_garbage_till_unique(row, new_slug): """ From 67c7c81162c1114093d4588668d5ba4cf83cf902 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 10:33:51 -0600 Subject: [PATCH 118/130] Small PEP-8 compliance fix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit sponsored by Mats Sjöberg. Thanks! --- mediagoblin/decorators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 42406b7d..85883c1a 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -126,9 +126,9 @@ def get_user_media_entry(controller): raise NotFound() media = MediaEntry.query.filter_by( - slug = request.matchdict['media'], - state = u'processed', - uploader = user.id).first() + slug=request.matchdict['media'], + state=u'processed', + uploader=user.id).first() if not media: # no media via slug? Grab it via object id From 397c22d1396cef285e3752d3972979bf53beb988 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 13:08:23 -0600 Subject: [PATCH 119/130] Stylistic cleanups to some urlgen calls. This commit sponsored by Stephane Berube. Thank you! --- mediagoblin/templates/mediagoblin/user_pages/media.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 876ce850..f151c577 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -117,14 +117,14 @@ <div class="comment_author"> <img src="{{ request.staticdirect('/images/icon_comment.png') }}" /> <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user = comment_author.username) }}"> + user=comment_author.username) }}"> {{- comment_author.username -}} </a> {% trans %}at{% endtrans %} <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment', - comment = comment.id, - user = media.get_uploader.username, - media = media.slug_or_id) }}#comment"> + comment=comment.id, + user=media.get_uploader.username, + media=media.slug_or_id) }}#comment"> {{- comment.created.strftime("%I:%M%p %Y-%m-%d") -}} </a>: </div> From 7de20e52345949fa9d377f06ab0241d98063d9c9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 13:38:11 -0600 Subject: [PATCH 120/130] Media URLs with ids in them are now like /u/cwebber/m/id:4112/ rather than /u/cwebber/m/4112/ This avoids some potential name collision issues. This commit sponsored by Asokan Pichai. Thank you! --- mediagoblin/db/mixin.py | 6 ++++-- mediagoblin/decorators.py | 39 +++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index b69e7d51..6789a970 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -150,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/decorators.py b/mediagoblin/decorators.py index 85883c1a..14b4f8fc 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -125,24 +125,31 @@ 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 + + # might not be a slug, might be an id, but whatever + media_slug = request.matchdict['media'] + + if u":" in request.matchdict['media']: + # okay, it's not actually a slug, it's some kind of identifier, + # probably id: + if media_slug.startswith(u'id:'): + try: + media = MediaEntry.query.filter_by( + id=int(media_slug[3:]), + state=u'processed', + uploader=user.id).first() + except ValueError: + raise NotFound() + else: + # no magical id: stuff? It's a slug! + media = MediaEntry.query.filter_by( + slug=request.matchdict['media'], + state=u'processed', + uploader=user.id).first() if not media: - # no media via slug? Grab it via object id - try: - media = MediaEntry.query.filter_by( - id = int(request.matchdict['media']), - state = u'processed', - uploader = user.id).first() - except ValueError: - # media "id" was no int - raise NotFound() - - 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) From 697c74c2de0cc940b45014f9becdfa55f961d193 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 13:54:19 -0600 Subject: [PATCH 121/130] Replacing several request.matchdict['media'] -> media_slug ... shorter! Thanks for pointing this out, Elrond ;) This commit sponsored by Gerardo Joven Valdivia. Thank you! --- mediagoblin/decorators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 14b4f8fc..b6f6f909 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -130,7 +130,7 @@ def get_user_media_entry(controller): # might not be a slug, might be an id, but whatever media_slug = request.matchdict['media'] - if u":" in request.matchdict['media']: + if u":" in media_slug: # okay, it's not actually a slug, it's some kind of identifier, # probably id: if media_slug.startswith(u'id:'): @@ -144,7 +144,7 @@ def get_user_media_entry(controller): else: # no magical id: stuff? It's a slug! media = MediaEntry.query.filter_by( - slug=request.matchdict['media'], + slug=media_slug, state=u'processed', uploader=user.id).first() From e4e50a27653bd582e853e3f328ebc67cdd07b0e7 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 14:04:26 -0600 Subject: [PATCH 122/130] Simplifying the "id:" url detection, per Elrond's suggestion. As pointed out, we didn't need that nested if. This commit sponsored by Paul Kuriakose. Thank you! --- mediagoblin/decorators.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index b6f6f909..fbf7b188 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -130,17 +130,15 @@ def get_user_media_entry(controller): # might not be a slug, might be an id, but whatever media_slug = request.matchdict['media'] - if u":" in media_slug: - # okay, it's not actually a slug, it's some kind of identifier, - # probably id: - if media_slug.startswith(u'id:'): - try: - media = MediaEntry.query.filter_by( - id=int(media_slug[3:]), - state=u'processed', - uploader=user.id).first() - except ValueError: - raise NotFound() + # 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(media_slug[3:]), + state=u'processed', + uploader=user.id).first() + except ValueError: + raise NotFound() else: # no magical id: stuff? It's a slug! media = MediaEntry.query.filter_by( From 443dcf867c0effb3d7e96b351aea4dd665852024 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 17:17:27 -0600 Subject: [PATCH 123/130] Copying the license from the jquery repository rather than the generic MIT one. Damned MIT and BSD licenses encouraging modification by every project makes compliance annoying. --- extlib/jquery/{MIT.txt => MIT-LICENSE.txt} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename extlib/jquery/{MIT.txt => MIT-LICENSE.txt} (93%) diff --git a/extlib/jquery/MIT.txt b/extlib/jquery/MIT-LICENSE.txt similarity index 93% rename from extlib/jquery/MIT.txt rename to extlib/jquery/MIT-LICENSE.txt index 5a2aeb47..957f26d3 100644 --- a/extlib/jquery/MIT.txt +++ b/extlib/jquery/MIT-LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) <year> <copyright holders> +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 From 6bdf9a104428543840c4967ac21518af3dc60bea Mon Sep 17 00:00:00 2001 From: Joar Wandborg <joar@wandborg.se> Date: Tue, 26 Feb 2013 23:57:20 +0100 Subject: [PATCH 124/130] Allow media managers without sniff_handler --- mediagoblin/media_types/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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: From 8db7eed3bcba5c0527befc48a9d2b84cf5be62a8 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Tue, 26 Feb 2013 17:49:53 -0600 Subject: [PATCH 125/130] Removing html5shiv for not complying with its own licenses and racism Issues of racism seem to have been resolved and removed from upstream, but make having this as a dependency somewhat uncomfortable: https://github.com/aFarkas/html5shiv/issues/91 Regardless, at the time of writing the project doesn't comply with its own license... it states to be dual licensed under MIT and GPLv2 but distributes neither of these licenses with its source. --- extlib/html5shiv/MIT.txt | 20 -------------------- extlib/html5shiv/html5shiv.js | 3 --- mediagoblin/static/js/extlib/html5shiv.js | 1 - mediagoblin/templates/mediagoblin/base.html | 4 ---- 4 files changed, 28 deletions(-) delete mode 100644 extlib/html5shiv/MIT.txt delete mode 100644 extlib/html5shiv/html5shiv.js delete mode 120000 mediagoblin/static/js/extlib/html5shiv.js diff --git a/extlib/html5shiv/MIT.txt b/extlib/html5shiv/MIT.txt deleted file mode 100644 index 5a2aeb47..00000000 --- a/extlib/html5shiv/MIT.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) <year> <copyright holders> - -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/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="<x-element></x-element>",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<style>","article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}","audio{display:none}","canvas,video{display:inline-block;*display:inline;*zoom:1}","[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}","mark{background:#FF0;color:#000}","</style>"].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/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 13433b33..66b95661 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -32,10 +32,6 @@ <script type="text/javascript" src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script> - <!--[if lt IE 9]> - <script src="{{ request.staticdirect('/js/extlib/html5shiv.js') }}"></script> - <![endif]--> - {# 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. From aecd65b789c1c6094a6bf5d8c75987675fd9e4f3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Wed, 27 Feb 2013 09:56:56 -0600 Subject: [PATCH 126/130] Simplifying the test for whether or not a user and slug combo exists. Thanks to tchernobog for catching this (it was breaking on postgres) and Elrond for the suggestion on how to fix it. This commit sponsored by Caleb Cooper. Thanks Caleb! --- mediagoblin/db/migrations.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index e9b4e9ef..167c4f87 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -215,12 +215,10 @@ def mediaentry_new_slug_era(db): import uuid def slug_and_user_combo_exists(slug, uploader): - # Technically returns the number of entries with this slug and user - # that already exist return db.execute( media_table.select( and_(media_table.c.uploader==uploader, - media_table.c.slug==slug)).count()).first().tbl_row_count + media_table.c.slug==slug))).first() is not None def append_garbage_till_unique(row, new_slug): """ From a808364e7f4b5e08e06bcd25c584fe9d956f9bb4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Wed, 27 Feb 2013 13:25:42 -0600 Subject: [PATCH 127/130] Fixing translations stuff for command line tools and such. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We had switched mg_globals to have the default translations set to None so that it would be set up by the mediagoblin app later. However, this would mean that things like scripts would try to call gettext and error out. Thanks to Tumulte for catching this. This commit sponsored by Aurimas Fišeras. Thank you! --- mediagoblin/mg_globals.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 From 42de9886cfbf979da5bdf88e0079c4ed05ff6688 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber <cwebber@dustycloud.org> Date: Wed, 27 Feb 2013 14:08:38 -0600 Subject: [PATCH 128/130] MediaGoblin not really anything to do with FooCorp anymore. --- FOO300 | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 FOO300 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 From 918d811a78839ba156a88a15dd115ce924ea5553 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Sun, 24 Feb 2013 18:30:26 +0100 Subject: [PATCH 129/130] Fixup _("...") % (...) in media_collect. Get some messages translated. Bad: _("..." % (...)) Good: _("...") % (...) --- mediagoblin/user_pages/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index bbc3259a..6f8f8059 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -211,8 +211,8 @@ 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"!' - % existing_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) @@ -244,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 @@ -261,8 +261,8 @@ 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, From b7a3798e1806eb52a244088fb600376ff25e0de9 Mon Sep 17 00:00:00 2001 From: Elrond <elrond+mediagoblin.org@samba-tng.org> Date: Fri, 1 Mar 2013 14:45:20 +0100 Subject: [PATCH 130/130] Fix some media page redirects in media_collect. Use .slug_or_id instead of only .id. --- mediagoblin/user_pages/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 6f8f8059..69d7defb 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -214,8 +214,8 @@ def media_collect(request, media): _('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'] @@ -266,7 +266,7 @@ def media_collect(request, media): 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?