From 7742dcc1fbda04c3a1c76a057a1a93a8f504502e Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sun, 14 Oct 2012 13:46:31 +0200 Subject: [PATCH 001/140] Switched most stuff over from Routes Removed the Routes routing functionality and replaced it with werkzeug.routes. Most views are functional. Known issues: - Translation integration with the request object is not yet figured out. This breaks 404 pages. --- mediagoblin/app.py | 73 +++++++++-------- mediagoblin/auth/routing.py | 53 ++++++++----- mediagoblin/edit/routing.py | 14 ++-- mediagoblin/listings/routing.py | 16 ++-- mediagoblin/plugins/api/__init__.py | 12 +-- mediagoblin/plugins/oauth/__init__.py | 24 +++--- mediagoblin/routing.py | 40 ++++------ mediagoblin/submit/routing.py | 11 +-- mediagoblin/tools/pluginapi.py | 2 +- mediagoblin/user_pages/routing.py | 108 +++++++++++++++----------- mediagoblin/webfinger/routing.py | 12 ++- 11 files changed, 189 insertions(+), 176 deletions(-) diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 08515df9..5758dbbb 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -18,11 +18,12 @@ import os import urllib import logging -import routes -from webob import exc -from werkzeug.wrappers import Request +from mediagoblin.routing import url_map, view_functions, add_route -from mediagoblin import routing, meddleware, __version__ +from werkzeug.wrappers import Request +from werkzeug.exceptions import HTTPException, NotFound + +from mediagoblin import meddleware, __version__ from mediagoblin.tools import common, translate, template from mediagoblin.tools.response import render_404 from mediagoblin.tools.theme import register_themes @@ -90,7 +91,10 @@ class MediaGoblinApp(object): self.public_store, self.queue_store = setup_storage() # set up routing - self.routing = routing.get_mapper(PluginManager().get_routes()) + self.url_map = url_map + + for route in PluginManager().get_routes(): + add_route(*route) # set up staticdirector tool self.staticdirector = get_staticdirector(app_config) @@ -135,7 +139,7 @@ class MediaGoblinApp(object): ## Routing / controller loading stuff path_info = request.path - route_match = self.routing.match(path_info) + map_adapter = self.url_map.bind_to_environ(request.environ) # By using fcgi, mediagoblin can run under a base path # like /mediagoblin/. request.path_info contains the @@ -154,47 +158,52 @@ class MediaGoblinApp(object): environ.pop('HTTPS') ## Attach utilities to the request object - request.matchdict = route_match - request.urlgen = routes.URLGenerator(self.routing, environ) # Do we really want to load this via middleware? Maybe? request.session = request.environ['beaker.session'] # Attach self as request.app # Also attach a few utilities from request.app for convenience? request.app = self - request.locale = translate.get_locale_from_request(request) - request.template_env = template.get_jinja_env( - self.template_loader, request.locale) request.db = self.db request.staticdirect = self.staticdirector mg_request.setup_user_in_request(request) - # No matching page? - if route_match is None: - # Try to do see if we have a match with a trailing slash - # added and if so, redirect - if not path_info.endswith('/') \ - and request.method == 'GET' \ - and self.routing.match(path_info + '/'): - new_path_info = path_info + '/' - if request.GET: - new_path_info = '%s?%s' % ( - new_path_info, urllib.urlencode(request.GET)) - redirect = exc.HTTPFound(location=new_path_info) - return request.get_response(redirect)(environ, start_response) + try: + endpoint, url_values = map_adapter.match() + request.matchdict = url_values - # Okay, no matches. 404 time! - request.matchdict = {} # in case our template expects it + request.locale = translate.get_locale_from_request(request) + request.template_env = template.get_jinja_env( + self.template_loader, request.locale) + except NotFound as exc: + return NotImplemented return render_404(request)(environ, start_response) + except HTTPException as exc: + # Support legacy webob.exc responses + return exc(environ, start_response) - # import the controller, or if it's already a callable, call that - route_controller = route_match['controller'] - if isinstance(route_controller, unicode) \ - or isinstance(route_controller, str): - controller = common.import_component(route_match['controller']) + def build_proxy(endpoint, **kw): + try: + qualified = kw.pop('qualified') + except KeyError: + qualified = False + + return map_adapter.build( + endpoint, + values=dict(**kw), + force_external=qualified) + + request.urlgen = build_proxy + + view_func = view_functions[endpoint] + + # import the endpoint, or if it's already a callable, call that + if isinstance(view_func, unicode) \ + or isinstance(view_func, str): + controller = common.import_component(view_func) else: - controller = route_match['controller'] + controller = view_func # pass the request through our meddleware classes for m in self.meddleware: diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index 15d8fc3c..58faa5a3 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -14,25 +14,36 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import Route +from routes.route import add_route +from mediagoblin.routing import add_route -auth_routes = [ - Route('mediagoblin.auth.register', '/register/', - controller='mediagoblin.auth.views:register'), - Route('mediagoblin.auth.login', '/login/', - controller='mediagoblin.auth.views:login'), - Route('mediagoblin.auth.logout', '/logout/', - controller='mediagoblin.auth.views:logout'), - Route('mediagoblin.auth.verify_email', '/verify_email/', - controller='mediagoblin.auth.views:verify_email'), - Route('mediagoblin.auth.resend_verification', '/resend_verification/', - controller='mediagoblin.auth.views:resend_activation'), - Route('mediagoblin.auth.resend_verification_success', - '/resend_verification_success/', - template='mediagoblin/auth/resent_verification_email.html', - controller='mediagoblin.views:simple_template_render'), - Route('mediagoblin.auth.forgot_password', '/forgot_password/', - controller='mediagoblin.auth.views:forgot_password'), - Route('mediagoblin.auth.verify_forgot_password', - '/forgot_password/verify/', - controller='mediagoblin.auth.views:verify_forgot_password')] +add_route('mediagoblin.auth.logout', + '/auth/logout/', 'mediagoblin.auth.views:logout') + + +add_route('mediagoblin.auth.register', '/register/', + 'mediagoblin.auth.views:register') + +add_route('mediagoblin.auth.login', '/login/', + 'mediagoblin.auth.views:login') + +add_route('mediagoblin.auth.logout', '/logout/', + 'mediagoblin.auth.views:logout') + +add_route('mediagoblin.auth.verify_email', '/verify_email/', + 'mediagoblin.auth.views:verify_email') + +add_route('mediagoblin.auth.resend_verification', '/resend_verification/', + 'mediagoblin.auth.views:resend_activation') + +add_route('mediagoblin.auth.resend_verification_success', + '/resend_verification_success/', + template='mediagoblin/auth/resent_verification_email.html', + 'mediagoblin.views:simple_template_render') + +add_route('mediagoblin.auth.forgot_password', '/forgot_password/', + 'mediagoblin.auth.views:forgot_password') + +add_route('mediagoblin.auth.verify_forgot_password', + '/forgot_password/verify/', + 'mediagoblin.auth.views:verify_forgot_password') diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py index 321c1f44..28b73d1e 100644 --- a/mediagoblin/edit/routing.py +++ b/mediagoblin/edit/routing.py @@ -14,13 +14,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +from mediagoblin.routing import add_route -from routes.route import Route - -edit_routes = [ - # Media editing view handled in user_pages/routing.py - Route('mediagoblin.edit.profile', '/profile/', - controller="mediagoblin.edit.views:edit_profile"), - Route('mediagoblin.edit.account', '/account/', - controller="mediagoblin.edit.views:edit_account"), - ] +add_route('mediagoblin.edit.profile', '/edit/profile/', + 'mediagoblin.edit.views:edit_profile') +add_route('mediagoblin.edit.account', '/edit/account/', + 'mediagoblin.edit.views:edit_account') diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py index d228a727..d25f1c8c 100644 --- a/mediagoblin/listings/routing.py +++ b/mediagoblin/listings/routing.py @@ -14,14 +14,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +from mediagoblin.routing import add_route -from routes.route import Route - -tag_routes = [ - # Route('mediagoblin.listings.tags_home', "/", - # controller="mediagoblin.listings.views:tags_home"), - Route('mediagoblin.listings.tags_listing', "/{tag}/", - controller="mediagoblin.listings.views:tag_listing"), - Route('mediagoblin.listings.tag_atom_feed', "/{tag}/atom/", - controller="mediagoblin.listings.views:tag_atom_feed"), - ] +add_route('mediagoblin.listings.tags_listing', + "/tag//", + "mediagoblin.listings.views:tag_listing") +add_route('mediagoblin.listings.tag_atom_feed', "/tag//atom/", + "mediagoblin.listings.views:tag_atom_feed") diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py index 40722088..f370cca6 100644 --- a/mediagoblin/plugins/api/__init__.py +++ b/mediagoblin/plugins/api/__init__.py @@ -33,12 +33,12 @@ def setup_plugin(): _log.debug('API config: {0}'.format(config)) routes = [ - Route('mediagoblin.plugins.api.test', '/api/test', - controller='mediagoblin.plugins.api.views:api_test'), - Route('mediagoblin.plugins.api.entries', '/api/entries', - controller='mediagoblin.plugins.api.views:get_entries'), - Route('mediagoblin.plugins.api.post_entry', '/api/submit', - controller='mediagoblin.plugins.api.views:post_entry')] + ('mediagoblin.plugins.api.test', '/api/test', + 'mediagoblin.plugins.api.views:api_test'), + ('mediagoblin.plugins.api.entries', '/api/entries', + 'mediagoblin.plugins.api.views:get_entries'), + ('mediagoblin.plugins.api.post_entry', '/api/submit', + 'mediagoblin.plugins.api.views:post_entry')] pluginapi.register_routes(routes) diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py index 63bf49a8..64acf0e7 100644 --- a/mediagoblin/plugins/oauth/__init__.py +++ b/mediagoblin/plugins/oauth/__init__.py @@ -36,21 +36,21 @@ def setup_plugin(): _log.debug('OAuth config: {0}'.format(config)) routes = [ - Route('mediagoblin.plugins.oauth.authorize', '/oauth/authorize', - controller='mediagoblin.plugins.oauth.views:authorize'), - Route('mediagoblin.plugins.oauth.authorize_client', '/oauth/client/authorize', - controller='mediagoblin.plugins.oauth.views:authorize_client'), - Route('mediagoblin.plugins.oauth.access_token', '/oauth/access_token', - controller='mediagoblin.plugins.oauth.views:access_token'), - Route('mediagoblin.plugins.oauth.access_token', + ('mediagoblin.plugins.oauth.authorize', '/oauth/authorize', + 'mediagoblin.plugins.oauth.views:authorize'), + ('mediagoblin.plugins.oauth.authorize_client', '/oauth/client/authorize', + 'mediagoblin.plugins.oauth.views:authorize_client'), + ('mediagoblin.plugins.oauth.access_token', '/oauth/access_token', + 'mediagoblin.plugins.oauth.views:access_token'), + ('mediagoblin.plugins.oauth.access_token', '/oauth/client/connections', - controller='mediagoblin.plugins.oauth.views:list_connections'), - Route('mediagoblin.plugins.oauth.register_client', + 'mediagoblin.plugins.oauth.views:list_connections'), + ('mediagoblin.plugins.oauth.register_client', '/oauth/client/register', - controller='mediagoblin.plugins.oauth.views:register_client'), - Route('mediagoblin.plugins.oauth.list_clients', + 'mediagoblin.plugins.oauth.views:register_client'), + ('mediagoblin.plugins.oauth.list_clients', '/oauth/client/list', - controller='mediagoblin.plugins.oauth.views:list_clients')] + 'mediagoblin.plugins.oauth.views:list_clients')] pluginapi.register_routes(routes) pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 90e1f3f8..4b9c42ee 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -14,36 +14,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes import Mapper +from werkzeug.routing import Map, Rule -from mediagoblin.auth.routing import auth_routes -from mediagoblin.submit.routing import submit_routes -from mediagoblin.user_pages.routing import user_routes -from mediagoblin.edit.routing import edit_routes -from mediagoblin.listings.routing import tag_routes -from mediagoblin.webfinger.routing import webfinger_well_known_routes, \ - webfinger_routes -from mediagoblin.admin.routing import admin_routes +url_map = Map() +view_functions = {'index': 'mediagoblin.views:index'} -def get_mapper(plugin_routes): - mapping = Mapper() - mapping.minimization = False +def add_route(endpoint, url, controller): + view_functions.update({endpoint: controller}) - # Plugin routes go first so they can override default routes. - mapping.extend(plugin_routes) + url_map.add(Rule(url, endpoint=endpoint)) - mapping.connect( - "index", "/", - controller="mediagoblin.views:root_view") +add_route('index', '/', 'mediagoblin.views:root_view') - mapping.extend(auth_routes, '/auth') - mapping.extend(submit_routes, '/submit') - mapping.extend(user_routes, '/u') - mapping.extend(edit_routes, '/edit') - mapping.extend(tag_routes, '/tag') - mapping.extend(webfinger_well_known_routes, '/.well-known') - mapping.extend(webfinger_routes, '/api/webfinger') - mapping.extend(admin_routes, '/a') - - return mapping +import mediagoblin.submit.routing +import mediagoblin.user_pages.routing +import mediagoblin.auth.routing +import mediagoblin.edit.routing +import mediagoblin.webfinger.routing +import mediagoblin.listings.routing diff --git a/mediagoblin/submit/routing.py b/mediagoblin/submit/routing.py index 1e399d1e..cbed1895 100644 --- a/mediagoblin/submit/routing.py +++ b/mediagoblin/submit/routing.py @@ -14,11 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import Route +from mediagoblin.routing import add_route -submit_routes = [ - Route('mediagoblin.submit.start', '/', - controller='mediagoblin.submit.views:submit_start'), - Route('mediagoblin.submit.collection', '/collection', - controller='mediagoblin.submit.views:add_collection'), - ] +add_route('mediagoblin.submit.start', + '/submit/', 'mediagoblin.submit.views:submit_start') +add_route('collection_home', '/submit/collection', 'mediagoblin.submit.views:add_collection') diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index 7c1e108b..df3f51c4 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -162,7 +162,7 @@ def register_routes(routes): Be careful when designing your route urls. If they clash with core urls, then it could result in DISASTER! """ - if isinstance(routes, (tuple, list)): + if isinstance(routes, list): for route in routes: PluginManager().register_route(route) else: diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 1cfce2dd..678f18f9 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -14,48 +14,68 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import Route +from mediagoblin.routing import add_route -user_routes = [ - Route('mediagoblin.user_pages.user_home', "/{user}/", - controller="mediagoblin.user_pages.views:user_home"), - Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/", - controller="mediagoblin.user_pages.views:user_gallery"), - Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/', - requirements=dict(m_id="[0-9a-fA-F]{24}"), - controller="mediagoblin.user_pages.views:media_home"), - Route('mediagoblin.user_pages.media_home.view_comment', - '/{user}/m/{media}/c/{comment}/', - controller="mediagoblin.user_pages.views:media_home"), - Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/", - controller="mediagoblin.edit.views:edit_media"), - Route('mediagoblin.edit.attachments', - '/{user}/m/{media}/attachments/', - controller="mediagoblin.edit.views:edit_attachments"), - Route('mediagoblin.user_pages.media_confirm_delete', - "/{user}/m/{media}/confirm-delete/", - controller="mediagoblin.user_pages.views:media_confirm_delete"), - Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/', - controller="mediagoblin.user_pages.views:atom_feed"), - Route('mediagoblin.user_pages.media_post_comment', - '/{user}/m/{media}/comment/add/', - controller="mediagoblin.user_pages.views:media_post_comment"), - Route('mediagoblin.user_pages.media_collect', - "/{user}/m/{media}/collect/", - controller="mediagoblin.user_pages.views:media_collect"), - Route('mediagoblin.user_pages.user_collection', "/{user}/collection/{collection}/", - controller="mediagoblin.user_pages.views:user_collection"), - Route('mediagoblin.edit.edit_collection', "/{user}/c/{collection}/edit/", - controller="mediagoblin.edit.views:edit_collection"), - Route('mediagoblin.user_pages.collection_confirm_delete', - "/{user}/c/{collection}/confirm-delete/", - controller="mediagoblin.user_pages.views:collection_confirm_delete"), - Route('mediagoblin.user_pages.collection_item_confirm_remove', - "/{user}/collection/{collection}/{collection_item}/confirm_remove/", - controller="mediagoblin.user_pages.views:collection_item_confirm_remove"), - Route('mediagoblin.user_pages.collection_atom_feed', '/{user}/collection/{collection}/atom/', - controller="mediagoblin.user_pages.views:collection_atom_feed"), - Route('mediagoblin.user_pages.processing_panel', - '/{user}/panel/', - controller="mediagoblin.user_pages.views:processing_panel"), - ] +add_route('mediagoblin.user_pages.user_home', + '/u//', 'mediagoblin.user_pages.views:user_home') + +add_route('mediagoblin.user_pages.media_home', + '/u//m//', + 'mediagoblin.user_pages.views:media_home') + +add_route('mediagoblin.user_pages.media_confirm_delete', + '/u//m//confirm-delete/', + 'mediagoblin.user_pages.views:media_confirm_delete') + +add_route('mediagoblin.user_pages.media_post_comment', + '/u//m//comment/add/', + 'mediagoblin.user_pages.views:media_post_comment') + +add_route('mediagoblin.user_pages.user_gallery', + '/u//gallery/', + 'mediagoblin.user_pages.views:user_gallery') + +add_route('mediagoblin.user_pages.media_home.view_comment', + '/u//m//c//', + 'mediagoblin.user_pages.views:media_home') + +add_route('mediagoblin.user_pages.atom_feed', + '/u//atom/', + 'mediagoblin.user_pages.views:atom_feed') + +add_route('mediagoblin.user_pages.media_collect', + '/u//m//collect/', + 'mediagoblin.user_pages.views:media_collect') + +add_route('mediagoblin.user_pages.user_collection', + '/u//collection//', + 'mediagoblin.user_pages.views:user_collection') + +add_route('mediagoblin.edit.edit_collection', + '/u//c//edit/', + 'mediagoblin.edit.views:edit_collection') + +add_route('mediagoblin.user_pages.collection_confirm_delete', + '/u//c//confirm-delete/', + 'mediagoblin.user_pages.views:collection_confirm_delete') + +add_route('mediagoblin.user_pages.collection_item_confirm_remove', + '/u//collection///confirm_remove/', + 'mediagoblin.user_pages.views:collection_item_confirm_remove') + +add_route('mediagoblin.user_pages.collection_atom_feed', + '/u//collection//atom/', + 'mediagoblin.user_pages.views:collection_atom_feed') + +add_route('mediagoblin.user_pages.processing_panel', + '/u//panel/', + 'mediagoblin.user_pages.views:processing_panel') + +# Stray edit routes +add_route('mediagoblin.edit.edit_media', + '/u//m//edit/', + 'mediagoblin.user_pages.views:edit_media') + +add_route('mediagoblin.edit.attachments', + '/u//m//attachments/', + 'mediagoblin.user_pages.views:edit_attachments') diff --git a/mediagoblin/webfinger/routing.py b/mediagoblin/webfinger/routing.py index 7e84a00a..18f9eb02 100644 --- a/mediagoblin/webfinger/routing.py +++ b/mediagoblin/webfinger/routing.py @@ -14,12 +14,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import Route +from mediagoblin.routing import add_route -webfinger_well_known_routes = [ - Route('mediagoblin.webfinger.host_meta', '/host-meta', - controller='mediagoblin.webfinger.views:host_meta')] +add_route('mediagoblin.webfinger.host_meta', '/.well-known/host-meta', + 'mediagoblin.webfinger.views:host_meta') -webfinger_routes = [ - Route('mediagoblin.webfinger.xrd', '/xrd', - controller='mediagoblin.webfinger.views:xrd')] +add_route('mediagoblin.webfinger.xrd', '/webfinger/xrd', + 'mediagoblin.webfinger.views:xrd') From 1ec7ff2adbb1821c5318b4e0a18194f441d7a87e Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sun, 14 Oct 2012 20:05:44 +0200 Subject: [PATCH 002/140] Fixed 404 page under werkzeug.routing - Removed ?lang= feature due to incompatibility with werkzeug routes in the current state of the architecture. --- mediagoblin/app.py | 35 ++++++++++++++++--------------- mediagoblin/auth/routing.py | 4 ++-- mediagoblin/tools/translate.py | 7 +------ mediagoblin/user_pages/routing.py | 2 +- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 5758dbbb..8a19b3e0 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -15,7 +15,6 @@ # along with this program. If not, see . import os -import urllib import logging from mediagoblin.routing import url_map, view_functions, add_route @@ -138,7 +137,6 @@ class MediaGoblinApp(object): request.accept = request.accept_mimetypes ## Routing / controller loading stuff - path_info = request.path map_adapter = self.url_map.bind_to_environ(request.environ) # By using fcgi, mediagoblin can run under a base path @@ -167,21 +165,9 @@ class MediaGoblinApp(object): request.db = self.db request.staticdirect = self.staticdirector - mg_request.setup_user_in_request(request) - - try: - endpoint, url_values = map_adapter.match() - request.matchdict = url_values - - request.locale = translate.get_locale_from_request(request) - request.template_env = template.get_jinja_env( - self.template_loader, request.locale) - except NotFound as exc: - return NotImplemented - return render_404(request)(environ, start_response) - except HTTPException as exc: - # Support legacy webob.exc responses - return exc(environ, start_response) + request.locale = translate.get_locale_from_request(request) + request.template_env = template.get_jinja_env( + self.template_loader, request.locale) def build_proxy(endpoint, **kw): try: @@ -196,8 +182,23 @@ class MediaGoblinApp(object): request.urlgen = build_proxy + mg_request.setup_user_in_request(request) + + try: + endpoint, url_values = map_adapter.match() + request.matchdict = url_values + except NotFound as exc: + return render_404(request)(environ, start_response) + except HTTPException as exc: + # Support legacy webob.exc responses + return exc(environ, start_response) + view_func = view_functions[endpoint] + _log.debug('endpoint: {0} view_func: {1}'.format( + endpoint, + view_func)) + # import the endpoint, or if it's already a callable, call that if isinstance(view_func, unicode) \ or isinstance(view_func, str): diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index 58faa5a3..ee4b957a 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import add_route from mediagoblin.routing import add_route add_route('mediagoblin.auth.logout', @@ -36,9 +35,10 @@ add_route('mediagoblin.auth.verify_email', '/verify_email/', add_route('mediagoblin.auth.resend_verification', '/resend_verification/', 'mediagoblin.auth.views:resend_activation') +# XXX: Does this work? add_route('mediagoblin.auth.resend_verification_success', '/resend_verification_success/', - template='mediagoblin/auth/resent_verification_email.html', + # template='mediagoblin/auth/resent_verification_email.html', 'mediagoblin.views:simple_template_render') add_route('mediagoblin.auth.forgot_password', '/forgot_password/', diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index cdc827a0..01cabe6a 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -65,12 +65,7 @@ def get_locale_from_request(request): if request_form.has_key('lang'): return locale_to_lower_upper(request_form['lang']) - # Your routing can explicitly specify a target language - matchdict = request.matchdict or {} - - if 'locale' in matchdict: - target_lang = matchdict['locale'] - elif 'target_lang' in request.session: + if 'target_lang' in request.session: target_lang = request.session['target_lang'] # Pull the first acceptable language or English else: diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 678f18f9..35e1bd6e 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -74,7 +74,7 @@ add_route('mediagoblin.user_pages.processing_panel', # Stray edit routes add_route('mediagoblin.edit.edit_media', '/u//m//edit/', - 'mediagoblin.user_pages.views:edit_media') + 'mediagoblin.edit.views:edit_media') add_route('mediagoblin.edit.attachments', '/u//m//attachments/', From 0d857844b12b033ee8ecdbcfa474781f835bee59 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 14 Oct 2012 16:26:23 -0500 Subject: [PATCH 003/140] Added rudimentary route "mounting" w/ werkzeug routes; fixed auth routes auth routes fixes: - mounted the auth routes at /auth/ - removed crufty old verification email route --- mediagoblin/auth/routing.py | 50 +++++++++++++---------------------- mediagoblin/routing.py | 15 ++++++++++- mediagoblin/submit/routing.py | 2 +- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index ee4b957a..145761ea 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -14,36 +14,22 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from mediagoblin.routing import add_route -add_route('mediagoblin.auth.logout', - '/auth/logout/', 'mediagoblin.auth.views:logout') - - -add_route('mediagoblin.auth.register', '/register/', - 'mediagoblin.auth.views:register') - -add_route('mediagoblin.auth.login', '/login/', - 'mediagoblin.auth.views:login') - -add_route('mediagoblin.auth.logout', '/logout/', - 'mediagoblin.auth.views:logout') - -add_route('mediagoblin.auth.verify_email', '/verify_email/', - 'mediagoblin.auth.views:verify_email') - -add_route('mediagoblin.auth.resend_verification', '/resend_verification/', - 'mediagoblin.auth.views:resend_activation') - -# XXX: Does this work? -add_route('mediagoblin.auth.resend_verification_success', - '/resend_verification_success/', - # template='mediagoblin/auth/resent_verification_email.html', - 'mediagoblin.views:simple_template_render') - -add_route('mediagoblin.auth.forgot_password', '/forgot_password/', - 'mediagoblin.auth.views:forgot_password') - -add_route('mediagoblin.auth.verify_forgot_password', - '/forgot_password/verify/', - 'mediagoblin.auth.views:verify_forgot_password') +auth_routes = [ + ('mediagoblin.auth.logout', + '/logout/', 'mediagoblin.auth.views:logout'), + ('mediagoblin.auth.register', '/register/', + 'mediagoblin.auth.views:register'), + ('mediagoblin.auth.login', '/login/', + 'mediagoblin.auth.views:login'), + ('mediagoblin.auth.logout', '/logout/', + 'mediagoblin.auth.views:logout'), + ('mediagoblin.auth.verify_email', '/verify_email/', + 'mediagoblin.auth.views:verify_email'), + ('mediagoblin.auth.resend_verification', '/resend_verification/', + 'mediagoblin.auth.views:resend_activation'), + ('mediagoblin.auth.forgot_password', '/forgot_password/', + 'mediagoblin.auth.views:forgot_password'), + ('mediagoblin.auth.verify_forgot_password', + '/forgot_password/verify/', + 'mediagoblin.auth.views:verify_forgot_password')] diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 4b9c42ee..8f0f37a5 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -21,15 +21,28 @@ url_map = Map() view_functions = {'index': 'mediagoblin.views:index'} def add_route(endpoint, url, controller): + """ + Add a route to the url mapping + """ view_functions.update({endpoint: controller}) url_map.add(Rule(url, endpoint=endpoint)) +def mount(mountpoint, routes): + """ + Mount a bunch of routes to this mountpoint + """ + for endpoint, url, controller in routes: + url = "%s/%s" % (mountpoint.rstrip('/'), url.lstrip('/')) + add_route(endpoint, url, controller) + add_route('index', '/', 'mediagoblin.views:root_view') import mediagoblin.submit.routing import mediagoblin.user_pages.routing -import mediagoblin.auth.routing import mediagoblin.edit.routing import mediagoblin.webfinger.routing import mediagoblin.listings.routing + +from mediagoblin.auth.routing import auth_routes +mount('/auth', auth_routes) diff --git a/mediagoblin/submit/routing.py b/mediagoblin/submit/routing.py index cbed1895..fbe3c39c 100644 --- a/mediagoblin/submit/routing.py +++ b/mediagoblin/submit/routing.py @@ -18,4 +18,4 @@ from mediagoblin.routing import add_route add_route('mediagoblin.submit.start', '/submit/', 'mediagoblin.submit.views:submit_start') -add_route('collection_home', '/submit/collection', 'mediagoblin.submit.views:add_collection') +add_route('mediagoblin.submit.collection', '/submit/collection', 'mediagoblin.submit.views:add_collection') From d56e82635f85f7a8a7d184a3eae539c09a7b001d Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Mon, 15 Oct 2012 00:12:58 +0200 Subject: [PATCH 004/140] Fixed OAuth access_token duplicate route Changed route name to "[...]list_connections" --- mediagoblin/app.py | 1 + mediagoblin/auth/routing.py | 2 -- mediagoblin/plugins/api/__init__.py | 9 ++++++--- mediagoblin/plugins/oauth/__init__.py | 11 +++++++---- mediagoblin/routing.py | 4 +++- mediagoblin/tools/pluginapi.py | 1 + 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 8a19b3e0..3a2d00f0 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -93,6 +93,7 @@ class MediaGoblinApp(object): self.url_map = url_map for route in PluginManager().get_routes(): + _log.debug('adding plugin route: {0}'.format(route)) add_route(*route) # set up staticdirector tool diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py index 145761ea..2a6abb47 100644 --- a/mediagoblin/auth/routing.py +++ b/mediagoblin/auth/routing.py @@ -16,8 +16,6 @@ auth_routes = [ - ('mediagoblin.auth.logout', - '/logout/', 'mediagoblin.auth.views:logout'), ('mediagoblin.auth.register', '/register/', 'mediagoblin.auth.views:register'), ('mediagoblin.auth.login', '/login/', diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py index f370cca6..3b7ced0c 100644 --- a/mediagoblin/plugins/api/__init__.py +++ b/mediagoblin/plugins/api/__init__.py @@ -33,11 +33,14 @@ def setup_plugin(): _log.debug('API config: {0}'.format(config)) routes = [ - ('mediagoblin.plugins.api.test', '/api/test', + ('mediagoblin.plugins.api.test', + '/api/test', 'mediagoblin.plugins.api.views:api_test'), - ('mediagoblin.plugins.api.entries', '/api/entries', + ('mediagoblin.plugins.api.entries', + '/api/entries', 'mediagoblin.plugins.api.views:get_entries'), - ('mediagoblin.plugins.api.post_entry', '/api/submit', + ('mediagoblin.plugins.api.post_entry', + '/api/submit', 'mediagoblin.plugins.api.views:post_entry')] pluginapi.register_routes(routes) diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py index 64acf0e7..3ed695de 100644 --- a/mediagoblin/plugins/oauth/__init__.py +++ b/mediagoblin/plugins/oauth/__init__.py @@ -36,13 +36,16 @@ def setup_plugin(): _log.debug('OAuth config: {0}'.format(config)) routes = [ - ('mediagoblin.plugins.oauth.authorize', '/oauth/authorize', + ('mediagoblin.plugins.oauth.authorize', + '/oauth/authorize', 'mediagoblin.plugins.oauth.views:authorize'), - ('mediagoblin.plugins.oauth.authorize_client', '/oauth/client/authorize', + ('mediagoblin.plugins.oauth.authorize_client', + '/oauth/client/authorize', 'mediagoblin.plugins.oauth.views:authorize_client'), - ('mediagoblin.plugins.oauth.access_token', '/oauth/access_token', - 'mediagoblin.plugins.oauth.views:access_token'), ('mediagoblin.plugins.oauth.access_token', + '/oauth/access_token', + 'mediagoblin.plugins.oauth.views:access_token'), + ('mediagoblin.plugins.oauth.list_connections', '/oauth/client/connections', 'mediagoblin.plugins.oauth.views:list_connections'), ('mediagoblin.plugins.oauth.register_client', diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index 8f0f37a5..b61a3626 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -18,12 +18,14 @@ from werkzeug.routing import Map, Rule url_map = Map() -view_functions = {'index': 'mediagoblin.views:index'} +view_functions = {} def add_route(endpoint, url, controller): """ Add a route to the url mapping """ + #assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule' + view_functions.update({endpoint: controller}) url_map.add(Rule(url, endpoint=endpoint)) diff --git a/mediagoblin/tools/pluginapi.py b/mediagoblin/tools/pluginapi.py index df3f51c4..1752dfc8 100644 --- a/mediagoblin/tools/pluginapi.py +++ b/mediagoblin/tools/pluginapi.py @@ -125,6 +125,7 @@ class PluginManager(object): def register_route(self, route): """Registers a single route""" + _log.debug('registering route: {0}'.format(route)) self.routes.append(route) def get_routes(self): From 42d4763c7a4cb049ed8ab30935a6a6394abdd8f4 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 19 Oct 2012 21:01:44 +0200 Subject: [PATCH 005/140] Thumbnail styling edits to base theme and Airy theme --- mediagoblin/static/css/base.css | 8 ++++++-- mediagoblin/themes/airy/assets/css/airy.css | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 6bc85674..c6152a1c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -408,10 +408,10 @@ textarea#comment_content { .media_thumbnail { float: left; padding: 0px; - width: 180px; + width: 212px; height: 156px; overflow: hidden; - margin: 0px 4px 10px; + margin: 0px 28px 24px 0px; text-align: center; font-size: 0.875em; background-color: #222; @@ -431,6 +431,10 @@ textarea#comment_content { max-height: 135px; } +.thumb_entry_last { + margin-right: 0px; +} + /* collection media */ .collection_thumbnail { diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index 22f12d5e..da4ed085 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -67,7 +67,7 @@ input, textarea { .media_thumbnail { background-color: #fff; border: 1px solid #e4e4e4; - margin: 0 3px 10px; + border-width: 1px 1px 2px; } .media_thumbnail a { From 1c66750a4a0611d2399e6e60eec5ea6915b458f6 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 19 Oct 2012 21:13:40 +0200 Subject: [PATCH 006/140] Thumbnail styling edits plus edits to the object_gallery (4 columns instead of 5 by default) --- mediagoblin/static/css/base.css | 11 ++++++++--- .../templates/mediagoblin/utils/object_gallery.html | 7 +++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index c6152a1c..312edc49 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -409,9 +409,8 @@ textarea#comment_content { float: left; padding: 0px; width: 212px; - height: 156px; overflow: hidden; - margin: 0px 28px 24px 0px; + margin: 0px 28px 26px 0px; text-align: center; font-size: 0.875em; background-color: #222; @@ -425,10 +424,16 @@ textarea#comment_content { .media_thumbnail a { color: #eee; text-decoration: none; + display: block; +} + +a.thumb_entry_title { + padding: 8px; } .media_thumbnail img { - max-height: 135px; + width: 212px; + max-height: 159px; } .thumb_entry_last { diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index 81506a84..b63419a8 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -18,7 +18,7 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} -{% macro media_grid(request, media_entries, col_number=5) %} +{% macro media_grid(request, media_entries, col_number=4) %} {% for row in gridify_cursor(media_entries, col_number) %} {% if entry.title %} -
- {{ entry.title }} + {{ entry.title }} {% endif %} {% endfor %} @@ -56,7 +55,7 @@ - col_number: How many columns per row (default 5) #} {% macro object_gallery(request, media_entries, pagination, - pagination_base_url=None, col_number=5) %} + pagination_base_url=None, col_number=4) %} {% if media_entries and media_entries.count() %} {{ media_grid(request, media_entries, col_number=col_number) }}
From 54397b90633b350984dc72ce192b2e2373203463 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 19 Oct 2012 21:21:53 +0200 Subject: [PATCH 007/140] Styling edits for buttons (Airy only) --- mediagoblin/themes/airy/assets/css/airy.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index da4ed085..ba9048b2 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -18,7 +18,8 @@ a { .navigation_button { background-color: #fff; border: 1px solid; - border-color: #F3F3F3 #ECECEC #C7C7C7; + border-color: #e4e4e4; + border-width: 1px 1px 2px; color: #4a4a4a; font-weight: bold; } @@ -44,14 +45,16 @@ footer { color: #4a4a4a; background-color: #fff; border: 1px solid; - border-color: #F3F3F3 #ECECEC #C7C7C7; + border-color: #E4E4E4; + border-width: 1px 1px 2px; padding: 5px 10px; } .button_action_highlight, .button_form { color: #fff; background-color: #37BD85; - border-color: #A2DEC3 #6CAA8E #5C9179; + border-color: #6CAA8E; + border-width: 1px 1px 2px; } input, textarea { From 5b60ec41ee5d0f25d66190b2a0114a8e1b216f86 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sat, 20 Oct 2012 12:09:23 +0200 Subject: [PATCH 008/140] Removed Routes dependency, added admin routes --- mediagoblin/admin/routing.py | 7 +++---- mediagoblin/plugins/api/__init__.py | 2 -- mediagoblin/plugins/flatpagesfile/__init__.py | 3 +-- mediagoblin/plugins/oauth/__init__.py | 2 -- mediagoblin/routing.py | 13 +++++++++---- setup.py | 1 - 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mediagoblin/admin/routing.py b/mediagoblin/admin/routing.py index ea768c24..29515f12 100644 --- a/mediagoblin/admin/routing.py +++ b/mediagoblin/admin/routing.py @@ -14,8 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from routes.route import Route - admin_routes = [ - Route('mediagoblin.admin.panel', '/panel', - controller='mediagoblin.admin.views:admin_processing_panel')] + ('mediagoblin.admin.panel', + '/panel', + 'mediagoblin.admin.views:admin_processing_panel')] diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py index 3b7ced0c..d3fdf2ef 100644 --- a/mediagoblin/plugins/api/__init__.py +++ b/mediagoblin/plugins/api/__init__.py @@ -17,8 +17,6 @@ import os import logging -from routes.route import Route - from mediagoblin.tools import pluginapi _log = logging.getLogger(__name__) diff --git a/mediagoblin/plugins/flatpagesfile/__init__.py b/mediagoblin/plugins/flatpagesfile/__init__.py index b9b52012..3d797809 100644 --- a/mediagoblin/plugins/flatpagesfile/__init__.py +++ b/mediagoblin/plugins/flatpagesfile/__init__.py @@ -19,7 +19,6 @@ import logging import os import jinja2 -from routes.route import Route from mediagoblin.tools import pluginapi from mediagoblin.tools.response import render_to_response @@ -68,7 +67,7 @@ def setup_plugin(): name = 'flatpagesfile.%s' % name.strip() controller = flatpage_handler_builder(template) routes.append( - Route(name, url, controller=controller)) + (name, url, controller)) pluginapi.register_routes(routes) _log.info('Done setting up flatpagesfile!') diff --git a/mediagoblin/plugins/oauth/__init__.py b/mediagoblin/plugins/oauth/__init__.py index 3ed695de..4714d95d 100644 --- a/mediagoblin/plugins/oauth/__init__.py +++ b/mediagoblin/plugins/oauth/__init__.py @@ -17,8 +17,6 @@ import os import logging -from routes.route import Route - from mediagoblin.tools import pluginapi from mediagoblin.plugins.oauth.models import OAuthToken, OAuthClient, \ OAuthUserClient diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py index b61a3626..defbc4ba 100644 --- a/mediagoblin/routing.py +++ b/mediagoblin/routing.py @@ -24,7 +24,10 @@ def add_route(endpoint, url, controller): """ Add a route to the url mapping """ - #assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule' + # XXX: We cannot use this, since running tests means that the plugin + # routes will be populated over and over over the same session. + # + # assert endpoint not in view_functions.keys(), 'Trying to overwrite a rule' view_functions.update({endpoint: controller}) @@ -40,11 +43,13 @@ def mount(mountpoint, routes): add_route('index', '/', 'mediagoblin.views:root_view') +from mediagoblin.admin.routing import admin_routes +from mediagoblin.auth.routing import auth_routes +mount('/auth', auth_routes) +mount('/a', admin_routes) + import mediagoblin.submit.routing import mediagoblin.user_pages.routing import mediagoblin.edit.routing import mediagoblin.webfinger.routing import mediagoblin.listings.routing - -from mediagoblin.auth.routing import auth_routes -mount('/auth', auth_routes) diff --git a/setup.py b/setup.py index 21c1179e..99584369 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,6 @@ setup( 'setuptools', 'PasteScript', 'beaker', - 'routes', 'webob<=1.2a2,>=1.1', 'wtforms', 'py-bcrypt', From e3f1fddf872caae45d6f4fdc81c2f4f9e8e19022 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 20 Oct 2012 15:19:11 +0200 Subject: [PATCH 009/140] Fix thumbnail aspect ratios --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 312edc49..b37da026 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -432,7 +432,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: 212px; + width: auto; max-height: 159px; } From 933b5a49633b497af9557e94cf20cf280bae9e72 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 20 Oct 2012 16:47:31 +0200 Subject: [PATCH 010/140] Replace dark empty_dots.png for Airy theme --- mediagoblin/themes/airy/assets/css/airy.css | 4 ++++ .../themes/airy/assets/images/empty_dots.png | Bin 0 -> 205 bytes 2 files changed, 4 insertions(+) create mode 100644 mediagoblin/themes/airy/assets/images/empty_dots.png diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index ba9048b2..09d447d2 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -86,3 +86,7 @@ input, textarea { .dropdown_items { background-color: #fff; } + +.empty_space { + background-image: url("../images/empty_dots.png"); +} diff --git a/mediagoblin/themes/airy/assets/images/empty_dots.png b/mediagoblin/themes/airy/assets/images/empty_dots.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee050b218fce0f869580f5060a4774bf7508788 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5m^kR ztU#FYL&_vCprB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*1jE{-7* zQxJ3EWj|NZ~}pJ#``Wgx{ZAtAA3=8PGaBtI}L1M^-UNSOct literal 0 HcmV?d00001 From e711d1cf7271c24597dcd7fb42746e7e474b63cb Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 20 Oct 2012 18:09:45 +0200 Subject: [PATCH 011/140] Replace icon_feed.png with proper Airy version --- .../themes/airy/assets/images/icon_feed.png | Bin 0 -> 473 bytes .../mediagoblin/utils/feed_link.html | 23 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 mediagoblin/themes/airy/assets/images/icon_feed.png create mode 100644 mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html diff --git a/mediagoblin/themes/airy/assets/images/icon_feed.png b/mediagoblin/themes/airy/assets/images/icon_feed.png new file mode 100644 index 0000000000000000000000000000000000000000..18c085b4c40c7e0043f354bee4c81688d7504f88 GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^PK; zkR_TQD8gCb5m^k>ejS7voit`w00r4gJbhi+?{J9-F!HZVRI~+}66xvU7-DgH>14xI zha3dj_IH?HIOP?{!o7OSL1vCH=C1aDi5eab0xbLqIcFFzATF>>%F`FHJAi>~3Y3!7sC!Z^IBi4p7lvv5e z-p<>;o. +#} + + + {% trans %}feed icon{% endtrans %} + +{%- trans %}Atom feed{% endtrans -%} From f93ac9f28cf966f67af4a675a07fc79429e3095d Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 20 Oct 2012 18:33:26 +0200 Subject: [PATCH 012/140] Implement new RSS icon for Airy theme --- .../themes/airy/templates/mediagoblin/utils/feed_link.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html index 6a41cef5..cf5099a2 100644 --- a/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html +++ b/mediagoblin/themes/airy/templates/mediagoblin/utils/feed_link.html @@ -17,7 +17,7 @@ #} - {% trans %}feed icon{% endtrans %} {%- trans %}Atom feed{% endtrans -%} From ac4c5aef5775d5c4a3d8ebd5528e6d2db8062174 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Sat, 20 Oct 2012 23:56:00 +0200 Subject: [PATCH 013/140] Added HTTP API auth plugin --- mediagoblin/plugins/httpapiauth/__init__.py | 58 +++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 mediagoblin/plugins/httpapiauth/__init__.py diff --git a/mediagoblin/plugins/httpapiauth/__init__.py b/mediagoblin/plugins/httpapiauth/__init__.py new file mode 100644 index 00000000..d3d2065e --- /dev/null +++ b/mediagoblin/plugins/httpapiauth/__init__.py @@ -0,0 +1,58 @@ +# 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 . + +import logging +import base64 + +from werkzeug.exceptions import BadRequest, Unauthorized + +from mediagoblin.plugins.api.tools import Auth + +_log = logging.getLogger(__name__) + + +def setup_http_api_auth(): + _log.info('Setting up HTTP API Auth...') + + +class HTTPAuth(Auth): + def trigger(self, request): + if request.authorization: + return True + + return False + + def __call__(self, request, *args, **kw): + _log.debug('Trying to authorize the user agent via HTTP Auth') + if not request.authorization: + return False + + user = request.db.User.query.filter_by( + username=request.authorization['username']).first() + + if user.check_login(request.authorization['password']): + request.user = user + return True + else: + raise Unauthorized() + + return False + + + +hooks = { + 'setup': setup_http_api_auth, + 'auth': HTTPAuth()} From c40cb686de2c5ea242af81ac749d9239ac6a2dab Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 21 Oct 2012 02:17:38 +0200 Subject: [PATCH 014/140] Styling edits to Airy theme --- mediagoblin/themes/airy/assets/css/airy.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index 09d447d2..6143b6e1 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -3,16 +3,12 @@ body { background-color: #F7F7F7; } -h1,h2 { - color: #787878; -} - -h3 { +h1,h2,h3 { color: #4a4a4a; } a { - color: #37BD85; + color: #37AB74; } .navigation_button { @@ -52,7 +48,7 @@ footer { .button_action_highlight, .button_form { color: #fff; - background-color: #37BD85; + background-color: #37AB74; border-color: #6CAA8E; border-width: 1px 1px 2px; } From 30a8828f9b4efc4ff8026a375f11756ca76e412b Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 21 Oct 2012 20:36:30 +0200 Subject: [PATCH 015/140] Add "Add collection" link to Airy theme --- mediagoblin/themes/airy/templates/mediagoblin/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html index 8bd9a7f9..d243d331 100644 --- a/mediagoblin/themes/airy/templates/mediagoblin/base.html +++ b/mediagoblin/themes/airy/templates/mediagoblin/base.html @@ -65,6 +65,7 @@
{% if request.user and request.user.status == 'active' %} {% trans %}+ Add media{% endtrans %} + {% trans %}+ Add collection{% endtrans %} {% endif %} {% trans %}View your profile{% endtrans %} {% trans %}Log out{% endtrans %} From 9e443248aad8de07710f46aab05008107122b5ff Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 21 Oct 2012 21:18:08 +0200 Subject: [PATCH 016/140] Move "Add collection" and "Change account settings" links to root.html --- mediagoblin/templates/mediagoblin/base.html | 1 - mediagoblin/templates/mediagoblin/root.html | 9 +++++++++ mediagoblin/templates/mediagoblin/user_pages/user.html | 6 ------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b6ba8818..5620debd 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -64,7 +64,6 @@
{% if request.user and request.user.status == 'active' %} {% trans %}+ Add media{% endtrans %} - {% trans %}+ Add collection{% endtrans %} {% endif %} {% trans %}View your profile{% endtrans %} {% trans %}Log out{% endtrans %} diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 5c6eb52f..99d3269f 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -21,6 +21,15 @@ {% block mediagoblin_content %} {% if request.user %} + {% if request.user.status == 'active' %} +

{% trans %}Actions{% endtrans %}

+

+ {% trans %}Create new collection{% endtrans %} +

+

+ {%- trans %}Change account settings{% endtrans -%} +

+ {% endif %}

{% trans %}Explore{% endtrans %}

{% else %}

{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index a58d745f..4f7b1208 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -119,12 +119,6 @@ {% endif %} {% endif %} - - {% if request.user and (request.user._id == user._id) %} - - {%- trans %}Change account settings{% endtrans -%} - - {% endif %}
{% if media_entries.count() %} From 294979824c2eb651168c66f58e1d759a2ff56ada Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 21 Oct 2012 21:49:39 +0200 Subject: [PATCH 017/140] Replace dropdown in top right with regular links --- mediagoblin/static/css/base.css | 31 --------------------- mediagoblin/static/js/header_dropdown.js | 30 -------------------- mediagoblin/templates/mediagoblin/base.html | 20 +++++-------- 3 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 mediagoblin/static/js/header_dropdown.js diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b37da026..cd16a7c0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -138,37 +138,6 @@ header { list-style: none; } -.dropdown { - display: inline-block; - color: #c3c3c3; - background-color: #424242; - border: 1px solid; - border-color: #464646 #2B2B2B #252525; - border-radius: 4px; - padding: 3px 8px; - font-size: 16px; - text-decoration: none; - font-style: normal; - font-weight: bold; - cursor: pointer; - position: relative; -} - -.dropdown_items { - position: absolute; - right: 0px; - top: 25px; - background-color: #424242; - padding: 10px; - width: 160px; - border-radius: 5px 0 5px 5px; - box-shadow: 0 2px 1px black; -} - -.dropdown_items a { - display: block; -} - a.logo { color: #fff; font-weight: bold; diff --git a/mediagoblin/static/js/header_dropdown.js b/mediagoblin/static/js/header_dropdown.js deleted file mode 100644 index 643bafa4..00000000 --- a/mediagoblin/static/js/header_dropdown.js +++ /dev/null @@ -1,30 +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 . - */ - -$(document).ready(function() { - $(".dropdown_items").hide(); - $(document).mouseup(function(e) { - if($(e.target).is(".dropdown")) { - $(".dropdown_items").toggle(); - } else if($(e.target).is(".dropdown_items")) { - return; - } else { - $(".dropdown_items").hide(); - } - }); -}); diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 5620debd..ef99242f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -52,23 +52,17 @@ {% block mediagoblin_header_title %}{% endblock %}
{% if request.user %} + {{ request.user.username }}{% trans %}'s account{% endtrans %} + ({% trans %}log out{% endtrans %}) + {% if request.user and request.user.status == 'active' %} + {% trans %}Add media{% endtrans %} + {% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} - {% trans %}Verify your email!{% endtrans %} + {% trans %}Verify your email!{% endtrans %} {% endif %} -
- {{ request.user.username }} ▾ -
- {% if request.user and request.user.status == 'active' %} - {% trans %}+ Add media{% endtrans %} - {% endif %} - {% trans %}View your profile{% endtrans %} - {% trans %}Log out{% endtrans %} -
-
{% else %} {% trans %}Log in{% endtrans %} From 7a0a308fe8571b027284c1e91c47fd468f40863f Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 22 Oct 2012 11:06:15 -0500 Subject: [PATCH 018/140] Set the user page to two columns wide so we don't have this weird wrapping. This is a stopgap solution! --- mediagoblin/templates/mediagoblin/user_pages/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index a58d745f..c417ccd4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -130,7 +130,7 @@ {% if media_entries.count() %}
{{ object_gallery(request, media_entries, pagination, - pagination_base_url=user_gallery_url, col_number=3) }} + pagination_base_url=user_gallery_url, col_number=2) }} {% include "mediagoblin/utils/object_gallery.html" %}

From c43f8c1d927c7b01d70bdd5662848fa3009f1141 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 23 Oct 2012 01:09:09 +0200 Subject: [PATCH 019/140] Fixed attachments --- mediagoblin/edit/views.py | 23 +++++++++++------------ mediagoblin/storage/cloudfiles.py | 5 ++++- mediagoblin/user_pages/routing.py | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 61b2cb82..2d42ff0b 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -106,9 +106,8 @@ def edit_attachments(request, media): form = forms.EditAttachmentsForm() # Add any attachements - if ('attachment_file' in request.form - and isinstance(request.form['attachment_file'], FieldStorage) - and request.form['attachment_file'].file): + if 'attachment_file' in request.files \ + and request.files['attachment_file']: # Security measure to prevent attachments from being served as # text/html, which will be parsed by web clients and pose an XSS @@ -121,13 +120,13 @@ def edit_attachments(request, media): # machine parsing the upload form, and not necessarily the machine # serving the attachments. if mimetypes.guess_type( - request.form['attachment_file'].filename)[0] in \ + request.files['attachment_file'].filename)[0] in \ UNSAFE_MIMETYPES: public_filename = secure_filename('{0}.notsafe'.format( - request.form['attachment_file'].filename)) + request.files['attachment_file'].filename)) else: public_filename = secure_filename( - request.form['attachment_file'].filename) + request.files['attachment_file'].filename) attachment_public_filepath \ = mg_globals.public_store.get_unique_filepath( @@ -139,13 +138,13 @@ def edit_attachments(request, media): try: attachment_public_file.write( - request.form['attachment_file'].file.read()) + request.files['attachment_file'].stream.read()) finally: - request.form['attachment_file'].file.close() + request.files['attachment_file'].stream.close() media.attachment_files.append(dict( name=request.form['attachment_name'] \ - or request.form['attachment_file'].filename, + or request.files['attachment_file'].filename, filepath=attachment_public_filepath, created=datetime.utcnow(), )) @@ -156,7 +155,7 @@ def edit_attachments(request, media): request, messages.SUCCESS, "You added the attachment %s!" \ % (request.form['attachment_name'] - or request.form['attachment_file'].filename)) + or request.files['attachment_file'].filename)) return exc.HTTPFound( location=media.url_for_self(request.urlgen)) @@ -276,12 +275,12 @@ def edit_collection(request, collection): # and userid. slug_used = check_collection_slug_used(request.db, collection.creator, request.form['slug'], collection.id) - + # Make sure there isn't already a Collection with this title existing_collection = request.db.Collection.find_one({ 'creator': request.user._id, 'title':request.form['title']}) - + if existing_collection and existing_collection.id != collection.id: messages.add_message( request, messages.ERROR, diff --git a/mediagoblin/storage/cloudfiles.py b/mediagoblin/storage/cloudfiles.py index ced3beb3..1b5a6363 100644 --- a/mediagoblin/storage/cloudfiles.py +++ b/mediagoblin/storage/cloudfiles.py @@ -104,10 +104,13 @@ class CloudFilesStorage(StorageInterface): mimetype = mimetypes.guess_type( filepath[-1]) - if mimetype: + if mimetype[0]: # Set the mimetype on the CloudFiles object obj.content_type = mimetype[0] obj.metadata = {'mime-type': mimetype[0]} + else: + obj.content_type = 'application/octet-stream' + obj.metadata = {'mime-type': 'application/octet-stream'} return CloudFilesStorageObjectWrapper(obj, *args, **kwargs) diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 35e1bd6e..8162e641 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -78,4 +78,4 @@ add_route('mediagoblin.edit.edit_media', add_route('mediagoblin.edit.attachments', '/u//m//attachments/', - 'mediagoblin.user_pages.views:edit_attachments') + 'mediagoblin.edit.views:edit_attachments') From 8567c0479fba75602b3e64b4688a20a8d1bf971e Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 15:41:46 +0200 Subject: [PATCH 020/140] Don't show zoom in cursor if there is no larger version --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index cd16a7c0..9a203f3a 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -464,7 +464,7 @@ p.media_specs { padding: 130px 10px 20px 10px; } -img.media_image { +a img.media_image { cursor: -webkit-zoom-in; cursor: -moz-zoom-in; cursor: zoom-in; From a04bbd9deaf5abbdf941e18b2d0936e6dec3de35 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 15:47:05 +0200 Subject: [PATCH 021/140] Don't show link to original when the file is an image --- .../templates/mediagoblin/media_displays/image.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index 86725cca..30c2a90d 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -19,15 +19,4 @@ {% extends 'mediagoblin/user_pages/media.html' %} {% block mediagoblin_sidebar %} - {% if 'original' in media.media_files %} -

{% trans %}Download{% endtrans %}

-

- - {%- trans -%} - Original - {%- endtrans -%} - -

- {% endif %} {% endblock %} From 5e210d200da991a8d573321b59ffa20f30eca24d Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 16:09:40 +0200 Subject: [PATCH 022/140] Remove obsolete dropdown styling --- mediagoblin/themes/airy/assets/css/airy.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index 6143b6e1..f3d11171 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -73,16 +73,6 @@ input, textarea { color: #4a4a4a; } -.dropdown { - color: #4a4a4a; - border: 1px solid #e4e4e4; - background-color: #fff; -} - -.dropdown_items { - background-color: #fff; -} - .empty_space { background-image: url("../images/empty_dots.png"); } From a4a2e2310e919e349e0e1ba7e2db4c22091d46f4 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 16:11:06 +0200 Subject: [PATCH 023/140] Move end tag --- 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 ef99242f..e1fa0191 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -47,7 +47,8 @@ + alt="{% trans %}MediaGoblin logo{% endtrans %}" /> + {% endblock mediagoblin_logo %} {% block mediagoblin_header_title %}{% endblock %}
From afb4631e655a6d3abbd048cfc3c5dcb8076af1fa Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 16:12:11 +0200 Subject: [PATCH 024/140] Update Airy's base.html --- .../airy/templates/mediagoblin/base.html | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html index d243d331..db500199 100644 --- a/mediagoblin/themes/airy/templates/mediagoblin/base.html +++ b/mediagoblin/themes/airy/templates/mediagoblin/base.html @@ -53,24 +53,17 @@ {% block mediagoblin_header_title %}{% endblock %}
{% if request.user %} + {{ request.user.username }}{% trans %}'s account{% endtrans %} + ({% trans %}log out{% endtrans %}) + {% if request.user and request.user.status == 'active' %} + {% trans %}Add media{% endtrans %} + {% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} - {% trans %}Verify your email!{% endtrans %} + {% trans %}Verify your email!{% endtrans %} {% endif %} -
- {{ request.user.username }} ▾ -
- {% if request.user and request.user.status == 'active' %} - {% trans %}+ Add media{% endtrans %} - {% trans %}+ Add collection{% endtrans %} - {% endif %} - {% trans %}View your profile{% endtrans %} - {% trans %}Log out{% endtrans %} -
-
{% else %} {% trans %}Log in{% endtrans %} From 4232c52fab2c6ab939b994b5699809a74b5fdef0 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 1 Nov 2012 16:59:27 +0100 Subject: [PATCH 025/140] Change thumbnail width to 212px --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 9a203f3a..6cda47fc 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -401,7 +401,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: auto; + width: 212px; max-height: 159px; } From 02e100ea1fee4cef503d22f6bde79650239253cc Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 1 Nov 2012 17:03:45 +0100 Subject: [PATCH 026/140] Change to 5 thumbnails per row --- mediagoblin/templates/mediagoblin/utils/object_gallery.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index b63419a8..bfd19ee6 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -18,7 +18,7 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} -{% macro media_grid(request, media_entries, col_number=4) %} +{% macro media_grid(request, media_entries, col_number=5) %}
{% for row in gridify_cursor(media_entries, col_number) %} From 52aef5b445710dbe800ebba7f44ca0cc0e06ea54 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 1 Nov 2012 17:10:16 +0100 Subject: [PATCH 027/140] Revert thumbnail styling and sizing; allows for 5 thumbnails per row --- mediagoblin/static/css/base.css | 8 ++++---- mediagoblin/themes/airy/assets/css/airy.css | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 6cda47fc..4120f965 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -377,9 +377,10 @@ textarea#comment_content { .media_thumbnail { float: left; padding: 0px; - width: 212px; + width: 180px; + height: 156px; overflow: hidden; - margin: 0px 28px 26px 0px; + margin: 0px 4px 10px; text-align: center; font-size: 0.875em; background-color: #222; @@ -401,8 +402,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: 212px; - max-height: 159px; + max-height: 135px; } .thumb_entry_last { diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index f3d11171..c63345b2 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -65,8 +65,6 @@ input, textarea { .media_thumbnail { background-color: #fff; - border: 1px solid #e4e4e4; - border-width: 1px 1px 2px; } .media_thumbnail a { From 5e5b8acfec73ad7f12eb685ff81c6962aee655f1 Mon Sep 17 00:00:00 2001 From: LotusEcho Date: Mon, 24 Sep 2012 16:15:34 -0400 Subject: [PATCH 028/140] Don't put checkbox text on separate line (#475) Manually render the "notify me" checkbox line in the account settings to not put the form label as a heading but in the same line as the checkbox. Edit forms.py to use the label attribute for the caption. Original patch modified by Sebastian Spaeth to 1) not translate the checkbox label in the template, it is translated in forms.py already. 2) Simplify the HTML, manually constructing the
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 delta 7371 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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 b8673f51..c24c7004 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -4,13 +4,13 @@ # # Translators: # , 2011. -# Harry Chen , 2011, 2012. +# Harry Chen , 2011-2012. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-09-24 14:01-0500\n" -"PO-Revision-Date: 2012-09-24 18:57+0000\n" +"POT-Creation-Date: 2012-12-03 13:23-0600\n" +"PO-Revision-Date: 2012-12-03 19:18+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -30,11 +30,11 @@ msgstr "密碼" #: mediagoblin/auth/forms.py:34 msgid "Email address" -msgstr "電子郵件位置" +msgstr "Email 位址" #: mediagoblin/auth/forms.py:51 msgid "Username or email" -msgstr "使用者名稱或是電子郵件" +msgstr "使用者名稱或 email" #: mediagoblin/auth/forms.py:58 msgid "Incorrect input" @@ -42,48 +42,48 @@ msgstr "輸入錯誤" #: mediagoblin/auth/views.py:55 msgid "Sorry, registration is disabled on this instance." -msgstr "抱歉, 這個項目已經被暫停註冊." +msgstr "抱歉，本站已經暫停註冊。" #: mediagoblin/auth/views.py:75 msgid "Sorry, a user with that name already exists." -msgstr "抱歉, 這個使用者名稱已經存在." +msgstr "抱歉，這個使用者名稱已經存在。" #: mediagoblin/auth/views.py:79 msgid "Sorry, a user with that email address already exists." -msgstr "抱歉，此電子郵件已被註冊了。" +msgstr "抱歉，此 email 位置已經被註冊了。" #: mediagoblin/auth/views.py:182 msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" -msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且遞交照片!" +msgstr "您的 email 位址已被認證。您已經可以登入，編輯您的個人檔案並上傳圖片！" #: mediagoblin/auth/views.py:188 msgid "The verification key or user id is incorrect" -msgstr "認證碼或是使用者帳號錯誤" +msgstr "認證碼或是使用者 ID 錯誤" #: mediagoblin/auth/views.py:206 msgid "You must be logged in so we know who to send the email to!" -msgstr "你必須登入，我們才知道信要送給誰！" +msgstr "您必須登入，我們才知道信要送給誰！" #: mediagoblin/auth/views.py:214 msgid "You've already verified your email address!" -msgstr "你的電子郵件已經確認了！" +msgstr "您的電子郵件已經確認了！" #: mediagoblin/auth/views.py:227 msgid "Resent your verification email." -msgstr "重送認證信." +msgstr "重送認證信。" #: mediagoblin/auth/views.py:263 msgid "" "An email has been sent with instructions on how to change your password." -msgstr "修改密碼的指示已經由電子郵件寄送到你的信箱。" +msgstr "修改密碼的指示已經由電子郵件寄送到您的信箱。" #: mediagoblin/auth/views.py:273 msgid "" "Could not send password recovery email as your username is inactive or your " "account's email address has not been verified." -msgstr "無法傳送密碼回復信件，因為你的使用者名稱已失效或是帳號尚未認證。" +msgstr "無法傳送密碼回復信件，因為您的使用者名稱已失效或是帳號尚未認證。" #: mediagoblin/auth/views.py:285 msgid "Couldn't find someone with that username or email." @@ -91,9 +91,9 @@ msgstr "找不到相關的使用者名稱或是電子郵件。" #: mediagoblin/auth/views.py:333 msgid "You can now log in using your new password." -msgstr "你現在可以用新的密碼登入了！" +msgstr "您現在可以用新的密碼登入了！" -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 #: mediagoblin/user_pages/forms.py:40 msgid "Title" @@ -104,13 +104,13 @@ msgid "Description of this work" msgstr "這個作品的描述" #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32 +#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 #: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44 msgid "" "You can use\n" " \n" " Markdown for formatting." -msgstr "你可以用\n \n Markdown 來排版." +msgstr "您可以用 Markdown 來排版。" #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36 msgid "Tags" @@ -120,19 +120,19 @@ msgstr "標籤" msgid "Separate tags by commas." msgstr "用逗號分隔標籤。" -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 msgid "Slug" -msgstr "自訂字串" +msgstr "簡稱" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 msgid "The slug can't be empty" -msgstr "自訂字串不能空白" +msgstr "簡稱不能為空白" #: mediagoblin/edit/forms.py:40 msgid "" "The title part of this media's address. You usually don't need to change " "this." -msgstr "此媒體網址的名稱。你通常不需要變動這個的。" +msgstr "此媒體網址的標題部份。通常不需要修改。" #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 @@ -149,7 +149,7 @@ msgstr "網站" #: mediagoblin/edit/forms.py:58 msgid "This address contains errors" -msgstr "網址是不是打錯了? " +msgstr "本網址出錯了" #: mediagoblin/edit/forms.py:63 msgid "Old password" @@ -157,80 +157,85 @@ msgstr "舊的密碼" #: mediagoblin/edit/forms.py:64 msgid "Enter your old password to prove you own this account." -msgstr "輸入你的舊密碼來證明你擁有這個帳號。" +msgstr "輸入您的舊密碼來證明您擁有這個帳號。" #: mediagoblin/edit/forms.py:67 msgid "New password" msgstr "新密碼" -#: mediagoblin/edit/forms.py:72 +#: mediagoblin/edit/forms.py:71 msgid "Email me when others comment on my media" -msgstr "" +msgstr "當有人對我的媒體評論時寄信給我" -#: mediagoblin/edit/forms.py:84 +#: mediagoblin/edit/forms.py:83 msgid "The title can't be empty" -msgstr "" +msgstr "標題不能是空的" -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:43 msgid "Description of this collection" -msgstr "" +msgstr "這個蒐藏的描述" -#: mediagoblin/edit/forms.py:93 +#: mediagoblin/edit/forms.py:92 msgid "" "The title part of this collection's address. You usually don't need to " "change this." -msgstr "" +msgstr "此蒐藏網址的標題部份，通常不需要修改。" #: mediagoblin/edit/views.py:65 msgid "An entry with that slug already exists for this user." -msgstr "這個自訂字串已經被其他人用了" +msgstr "這個簡稱已經被其他人用了" #: mediagoblin/edit/views.py:86 msgid "You are editing another user's media. Proceed with caution." -msgstr "你正在編輯他人的媒體檔案. 請謹慎處理." +msgstr "您正在修改別人的媒體，請小心操作。" -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:156 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." -msgstr "你正在編輯一位用戶的檔案. 請謹慎處理." +msgstr "您正在修改別人的個人檔案，請小心操作。" -#: mediagoblin/edit/views.py:198 +#: mediagoblin/edit/views.py:197 msgid "Profile changes saved" -msgstr "修改的檔案已存檔" +msgstr "個人檔案修改已儲存" -#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 msgid "Account settings saved" -msgstr "帳號設定已存檔" +msgstr "帳號設定已儲存" -#: mediagoblin/edit/views.py:252 +#: mediagoblin/edit/views.py:251 msgid "Wrong password" msgstr "密碼錯誤" -#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211 +#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 #: mediagoblin/user_pages/views.py:215 #, python-format msgid "You already have a collection called \"%s\"!" -msgstr "" +msgstr "您已經有一個稱做「%s」的蒐藏了！" -#: mediagoblin/edit/views.py:292 +#: mediagoblin/edit/views.py:291 msgid "A collection with that slug already exists for this user." -msgstr "" +msgstr "這個使用者已經有使用該簡稱的蒐藏了。" -#: mediagoblin/edit/views.py:309 +#: mediagoblin/edit/views.py:308 msgid "You are editing another user's collection. Proceed with caution." -msgstr "" +msgstr "您正在修改別人的蒐藏，請小心操作。" #: mediagoblin/gmg_commands/theme.py:58 msgid "Cannot link theme... no theme set\n" -msgstr "" +msgstr "無法連結佈景…沒有此佈景\n" #: mediagoblin/gmg_commands/theme.py:71 msgid "No asset directory for this theme\n" -msgstr "" +msgstr "此佈景沒有素材目錄\n" #: mediagoblin/gmg_commands/theme.py:74 msgid "However, old link directory symlink found; removed.\n" -msgstr "" +msgstr "但是舊的目錄連結已經找到並移除。\n" #: mediagoblin/media_types/__init__.py:60 #: mediagoblin/media_types/__init__.py:120 @@ -239,45 +244,45 @@ msgstr "抱歉，我不支援這樣的檔案格式 :(" #: mediagoblin/media_types/video/processing.py:35 msgid "Video transcoding failed" -msgstr "" +msgstr "影像轉碼失敗" #: mediagoblin/plugins/oauth/forms.py:26 msgid "Client ID" -msgstr "" +msgstr "客戶 ID" #: mediagoblin/plugins/oauth/forms.py:28 msgid "Next URL" -msgstr "" +msgstr "下一個 URL" #: mediagoblin/plugins/oauth/forms.py:30 msgid "Allow" -msgstr "" +msgstr "允許" #: mediagoblin/plugins/oauth/forms.py:31 msgid "Deny" -msgstr "" +msgstr "拒絕" #: mediagoblin/plugins/oauth/forms.py:35 msgid "Name" -msgstr "" +msgstr "名稱" #: mediagoblin/plugins/oauth/forms.py:36 msgid "The name of the OAuth client" -msgstr "" +msgstr "OAuth client 的名稱" #: mediagoblin/plugins/oauth/forms.py:37 msgid "Description" -msgstr "" +msgstr "描述" #: mediagoblin/plugins/oauth/forms.py:39 msgid "" "This will be visible to users allowing your\n" " application to authenticate as them." -msgstr "" +msgstr "本描述將會被進行應用程式認証的使用者看到。" #: mediagoblin/plugins/oauth/forms.py:41 msgid "Type" -msgstr "" +msgstr "類型" #: mediagoblin/plugins/oauth/forms.py:46 msgid "" @@ -287,25 +292,25 @@ msgid "" " Public - The client can't make confidential\n" " requests to the GNU MediaGoblin instance (e.g. client-side\n" " JavaScript client)." -msgstr "" +msgstr "秘密 — OAuth client 可以對 GNU MediaGoblin 站台發送不被使用者代理攔截的請求 (例如伺服端的 client)。\n公開 — OAuth client 無法對 GNU MediaGoblin 站台發送秘密的請求 (例如客戶端的 JavaScript client)。" #: mediagoblin/plugins/oauth/forms.py:53 msgid "Redirect URI" -msgstr "" +msgstr "重定向 URI" #: mediagoblin/plugins/oauth/forms.py:55 msgid "" "The redirect URI for the applications, this field\n" " is required for public clients." -msgstr "" +msgstr "此應用程式的重定向 URI，本欄位在公開類型的 OAuth client 為必填。" #: mediagoblin/plugins/oauth/forms.py:67 msgid "This field is required for public clients" -msgstr "" +msgstr "本欄位在公開類型的 OAuth client 為必填" #: mediagoblin/plugins/oauth/views.py:59 msgid "The client {0} has been registered!" -msgstr "" +msgstr "OAuth client {0} 註冊完成！" #: mediagoblin/processing/__init__.py:138 msgid "Invalid file given for media type." @@ -317,58 +322,39 @@ msgstr "檔案" #: mediagoblin/submit/views.py:57 msgid "You must provide a file." -msgstr "你必須提供一個檔案" +msgstr "您必須提供一個檔案" #: mediagoblin/submit/views.py:164 msgid "Woohoo! Submitted!" -msgstr "呼呼! 送出去嚕!" +msgstr "啊哈！PO 上去啦！" #: mediagoblin/submit/views.py:215 #, python-format msgid "Collection \"%s\" added!" -msgstr "" - -#: mediagoblin/templates/mediagoblin/404.html:24 -msgid "Image of 404 goblin stressing out" -msgstr "Image of 404 goblin stressing out" - -#: mediagoblin/templates/mediagoblin/404.html:25 -msgid "Oops!" -msgstr "糟糕！" - -#: mediagoblin/templates/mediagoblin/404.html:26 -msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "這個位址似乎沒有網頁。抱歉！" - -#: mediagoblin/templates/mediagoblin/404.html:28 -msgid "" -"If you're sure the address is correct, maybe the page you're looking for has" -" been moved or deleted." -msgstr "如果你確定這個位址是正確的，或許你在找的網頁已經被移除或是刪除了。" +msgstr "蒐藏「%s」新增完成！" #: mediagoblin/templates/mediagoblin/base.html:50 msgid "MediaGoblin logo" msgstr "MediaGoblin 標誌" -#: mediagoblin/templates/mediagoblin/base.html:60 -msgid "Verify your email!" -msgstr "確認你的電子郵件" - -#: mediagoblin/templates/mediagoblin/base.html:66 -msgid "+ Add media" -msgstr "+ 加入媒體" - -#: mediagoblin/templates/mediagoblin/base.html:67 -msgid "+ Add collection" +#: mediagoblin/templates/mediagoblin/base.html:56 +#, python-format +msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:69 -msgid "View your profile" -msgstr "檢視你個人檔案" +#: mediagoblin/templates/mediagoblin/base.html:62 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:64 +#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +msgid "Add media" +msgstr "新增媒體" #: mediagoblin/templates/mediagoblin/base.html:70 -msgid "Log out" -msgstr "登出" +msgid "Verify your email!" +msgstr "確認您的電子郵件" #: mediagoblin/templates/mediagoblin/base.html:75 #: mediagoblin/templates/mediagoblin/auth/login.html:28 @@ -381,7 +367,7 @@ msgstr "登入" msgid "" "Powered by MediaGoblin, a GNU project." -msgstr "由 MediaGoblin製作, 它是一個 GNU 專案" +msgstr "基於 MediaGoblin — 一項 GNU 專案。" #: mediagoblin/templates/mediagoblin/base.html:92 #, python-format @@ -389,44 +375,26 @@ msgid "" "Released under the AGPL. Source code available." -msgstr "基於AGPL授權釋出. 取得原始碼." +msgstr "以 AGPL 授權釋出。備有原始碼。" -#: mediagoblin/templates/mediagoblin/root.html:24 -msgid "Explore" -msgstr "探索" +#: mediagoblin/templates/mediagoblin/error.html:24 +msgid "Image of goblin stressing out" +msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:26 -msgid "Hi there, welcome to this MediaGoblin site!" -msgstr "嘿！歡迎來到 媒體怪獸(MediaGoblin) 網站" - -#: mediagoblin/templates/mediagoblin/root.html:28 -msgid "" -"This site is running MediaGoblin, an " -"extraordinarily great piece of media hosting software." -msgstr "此網站正運行 媒體怪獸(MediaGoblin), 他是一個超讚的媒體分享架站軟體." - -#: mediagoblin/templates/mediagoblin/root.html:29 -msgid "" -"To add your own media, place comments, and more, you can log in with your " -"MediaGoblin account." +#: mediagoblin/templates/mediagoblin/root.html:25 +msgid "Actions" msgstr "" #: mediagoblin/templates/mediagoblin/root.html:31 -msgid "Don't have one yet? It's easy!" -msgstr "還沒有嗎？其實非常簡單！" +msgid "Create new collection" +msgstr "" -#: mediagoblin/templates/mediagoblin/root.html:32 -#, python-format -msgid "" -"Create an account at this site\n" -" or\n" -" Set up MediaGoblin on your own server" -msgstr "在這網站建立帳號\n 或是\n 在你的伺服器上建立一個自己的媒體怪獸(MedaiGoblin)" - -#: mediagoblin/templates/mediagoblin/root.html:40 -msgid "Most recent media" -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 @@ -434,10 +402,46 @@ msgstr "最新的媒體" msgid "Media processing panel" msgstr "媒體處理面板" +#: mediagoblin/templates/mediagoblin/root.html:51 +msgid "Explore" +msgstr "探索" + +#: mediagoblin/templates/mediagoblin/root.html:53 +msgid "Hi there, welcome to this MediaGoblin site!" +msgstr "嘿！歡迎來到 MediaGoblin 站台！ " + +#: mediagoblin/templates/mediagoblin/root.html:55 +msgid "" +"This site is running MediaGoblin, an " +"extraordinarily great piece of media hosting software." +msgstr "本站使用 MediaGoblin — 與眾不同的媒體分享網站。" + +#: 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 "您可以登入您的 MediaGoblin 帳號以進行上傳媒體、張貼評論等等。" + +#: mediagoblin/templates/mediagoblin/root.html:58 +msgid "Don't have one yet? It's easy!" +msgstr "沒有帳號嗎？開帳號很簡單！" + +#: mediagoblin/templates/mediagoblin/root.html:59 +#, python-format +msgid "" +"Create an account at this site\n" +" or\n" +" Set up MediaGoblin on your own server" +msgstr "在這個網站上建立帳號\n 或是\n 在自己的伺服器上建立 MedaiGoblin" + +#: mediagoblin/templates/mediagoblin/root.html:67 +msgid "Most recent media" +msgstr "最新的媒體" + #: mediagoblin/templates/mediagoblin/admin/panel.html:29 msgid "" "Here you can track the state of media being processed on this instance." -msgstr "" +msgstr "此處您可以追蹤本站台處理媒體的狀態。" #: mediagoblin/templates/mediagoblin/admin/panel.html:32 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32 @@ -452,26 +456,26 @@ msgstr "沒有正在處理中的媒體" #: mediagoblin/templates/mediagoblin/admin/panel.html:61 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59 msgid "These uploads failed to process:" -msgstr "無法處理這些更新" +msgstr "無法處理這些上傳內容：" #: mediagoblin/templates/mediagoblin/admin/panel.html:90 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86 msgid "No failed entries!" -msgstr "" +msgstr "沒有失敗的紀錄！" #: mediagoblin/templates/mediagoblin/admin/panel.html:92 msgid "Last 10 successful uploads" -msgstr "" +msgstr "最近 10 次成功上傳的紀錄" #: mediagoblin/templates/mediagoblin/admin/panel.html:112 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107 msgid "No processed entries, yet!" -msgstr "" +msgstr "現在還沒有處理的紀錄！" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:28 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:36 msgid "Set your new password" -msgstr "設定你的新密碼" +msgstr "設定您的新密碼" #: mediagoblin/templates/mediagoblin/auth/change_fp.html:39 msgid "Set password" @@ -498,7 +502,7 @@ msgid "" "\n" "If you think this is an error, just ignore this email and continue being\n" "a happy goblin!" -msgstr "嗨 %(username)s,\n\n要更改 GNU MediaGoblin的密碼，在瀏覽器中打開下面的網址:\n\n%(verification_url)s\n\n如果你認為這個是個誤會，請忽略此封信件，繼續當個快樂的goblin!" +msgstr "%(username)s 您好：\n\n要修改 GNU MediaGoblin 的密碼，請在您的瀏覽器中打開下面的網址：\n\n%(verification_url)s\n\n如果您認為這個是個誤會，請忽略此封信件，繼續當個快樂的哥布林！" #: mediagoblin/templates/mediagoblin/auth/login.html:39 msgid "Logging in failed!" @@ -506,11 +510,11 @@ msgstr "登入失敗！" #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "還沒有帳號嗎?" +msgstr "還沒有帳號嗎？" #: mediagoblin/templates/mediagoblin/auth/login.html:45 msgid "Create one here!" -msgstr "在這裡建立一個吧!" +msgstr "在這裡建立一個吧！" #: mediagoblin/templates/mediagoblin/auth/login.html:51 msgid "Forgot your password?" @@ -519,7 +523,7 @@ msgstr "忘了密碼嗎？" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "建立一個帳號!" +msgstr "建立一個帳號！" #: mediagoblin/templates/mediagoblin/auth/register.html:40 msgid "Create" @@ -534,52 +538,65 @@ msgid "" "your web browser:\n" "\n" "%(verification_url)s" -msgstr "嗨 %(username)s,\n\n啟動 GNU MediaGoblin 帳號, 在你的瀏覽器中打開下面的網址:\n\n%(verification_url)s" +msgstr "%(username)s 您好：\n\n要啟動 GNU MediaGoblin 帳號，請在您的瀏覽器中打開下面的網址:\n\n%(verification_url)s" #: mediagoblin/templates/mediagoblin/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 #, python-format msgid "Editing attachments for %(media_title)s" -msgstr "" +msgstr "編輯 %(media_title)s 的附件" -#: mediagoblin/templates/mediagoblin/edit/edit.html:23 -#: mediagoblin/templates/mediagoblin/edit/edit.html:35 -#, python-format -msgid "Editing %(media_title)s" -msgstr "編輯 %(media_title)s 中" +#: mediagoblin/templates/mediagoblin/edit/attachments.html:43 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 +msgid "Attachments" +msgstr "附件" -#: mediagoblin/templates/mediagoblin/edit/edit.html:42 +#: mediagoblin/templates/mediagoblin/edit/attachments.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +msgid "Add attachment" +msgstr "新增附件" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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:53 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 +#: 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_confirm_delete.html:48 msgid "Cancel" msgstr "取消" -#: mediagoblin/templates/mediagoblin/edit/edit.html:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 +#: 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_collection.html:33 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 msgid "Save changes" msgstr "儲存變更" +#: mediagoblin/templates/mediagoblin/edit/edit.html:23 +#: mediagoblin/templates/mediagoblin/edit/edit.html:35 +#, python-format +msgid "Editing %(media_title)s" +msgstr "編輯 %(media_title)s" + #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" -msgstr "正在改變 %(username)s的帳號設定" +msgstr "正在改變 %(username)s 的帳號設定" #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:29 #, python-format msgid "Editing %(collection_title)s" -msgstr "" +msgstr "編輯 %(collection_title)s" #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:23 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35 #, python-format msgid "Editing %(username)s's profile" -msgstr "編輯 %(username)s'的檔案中" +msgstr "編輯 %(username)s 的個人檔案" #: mediagoblin/templates/mediagoblin/listings/collection.html:30 #: mediagoblin/templates/mediagoblin/listings/collection.html:35 @@ -587,85 +604,83 @@ msgstr "編輯 %(username)s'的檔案中" #: mediagoblin/templates/mediagoblin/listings/tag.html:35 #, python-format msgid "Media tagged with: %(tag_name)s" -msgstr "此媒體被標識為：%(tag_name)s" +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/image.html:23 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Download" msgstr "下載" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 -#: mediagoblin/templates/mediagoblin/media_displays/image.html:27 msgid "Original" -msgstr "原始的" +msgstr "原始檔" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:44 msgid "" "Sorry, this audio will not work because \n" "\tyour web browser does not support HTML5 \n" "\taudio." -msgstr "抱歉，此聲音檔案無法播放，因為你的瀏覽器不支援HTML5音訊。" +msgstr "抱歉，此聲音無法播放，因為您的瀏覽器不支援 HTML5 音訊。" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:47 msgid "" "You can get a modern web browser that \n" "\tcan play the audio at \n" "\t http://getfirefox.com!" -msgstr "你可以在此取得可以播放音樂的瀏覽器 \n\t http://getfirefox.com!" +msgstr "您可以在 http://getfirefox.com 取得可以播放此聲音的瀏覽器！" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60 #: mediagoblin/templates/mediagoblin/media_displays/video.html:56 msgid "Original file" -msgstr "" +msgstr "原始檔案" #: mediagoblin/templates/mediagoblin/media_displays/audio.html:63 msgid "WebM file (Vorbis codec)" -msgstr "WebM 檔案 (Vorbis codec)" +msgstr "WebM 檔案 (Vorbis 編碼)" #: 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» 你的瀏覽器不支援 HTML5 \n» 的影片." +msgstr "抱歉，此影片無法使用，因為您的瀏覽器不支援 HTML5 的影片." #: mediagoblin/templates/mediagoblin/media_displays/video.html:43 msgid "" "You can get a modern web browser that \n" "\t can play this video at \n" "\t http://getfirefox.com!" -msgstr "你可以取得\n» 播放這樣檔案的最新瀏覽器 \n» http://getfirefox.com!" +msgstr "您可以在 http://getfirefox.com 取得可以播放此影片的瀏覽器！" #: mediagoblin/templates/mediagoblin/media_displays/video.html:59 msgid "WebM file (640p; VP8/Vorbis)" -msgstr "" +msgstr "WebM 檔案 (640p; VP8/Vorbis)" #: mediagoblin/templates/mediagoblin/submit/collection.html:26 msgid "Add a collection" -msgstr "" +msgstr "新增蒐藏" #: mediagoblin/templates/mediagoblin/submit/collection.html:30 #: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83 +#: 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" -msgstr "加入你的媒體" +msgstr "加入您的媒體" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:30 #, python-format msgid "%(collection_title)s (%(username)s's collection)" -msgstr "" +msgstr "%(collection_title)s (%(username)s 的蒐藏)" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:39 #, python-format msgid "%(collection_title)s by %(username)s" -msgstr "" +msgstr "%(collection_title)s by %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/collection.html:52 #: mediagoblin/templates/mediagoblin/user_pages/media.html:87 @@ -683,7 +698,7 @@ msgid "" "

\n" " %(collection_description)s\n" "

" -msgstr "" +msgstr "

\n %(collection_description)s\n

" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 @@ -692,25 +707,25 @@ 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:50 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 msgid "Delete permanently" -msgstr "永遠刪除" +msgstr "永久刪除" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format msgid "Really remove %(media_title)s from %(collection_title)s?" -msgstr "" +msgstr "確定要從 %(collection_title)s 移除 %(media_title)s 嗎？" -#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" -msgstr "" +msgstr "移除" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format msgid "" "Hi %(username)s,\n" "%(comment_author)s commented on your post (%(comment_url)s) at %(instance_name)s\n" -msgstr "" +msgstr "%(username)s 您好：\n%(comment_author)s 在 %(instance_name)s 對您的內容 (%(comment_url)s) 張貼評論\n" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30 #, python-format @@ -720,18 +735,18 @@ msgstr "%(username)s的媒體" #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37 #, python-format msgid "%(username)s's media" -msgstr "%(username)s的媒體檔案" +msgstr "%(username)s 的媒體" #: mediagoblin/templates/mediagoblin/user_pages/media.html:46 #, python-format msgid "❖ Browsing media by %(username)s" -msgstr "❖ 由 %(username)s瀏覽媒體檔案" +msgstr "❖ 瀏覽 %(username)s 的媒體" #: mediagoblin/templates/mediagoblin/user_pages/media.html:67 #: mediagoblin/templates/mediagoblin/user_pages/media.html:73 #, python-format msgid "Image for %(media_title)s" -msgstr " %(media_title)s的照片" +msgstr " %(media_title)s 的照片" #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" @@ -742,11 +757,11 @@ msgid "" "You can use Markdown for" " formatting." -msgstr "你可以用 Markdown 來排版." +msgstr "您可以用 Markdown 來排版。" #: mediagoblin/templates/mediagoblin/user_pages/media.html:113 msgid "Add this comment" -msgstr "增加此評論" +msgstr "增加評論" #: mediagoblin/templates/mediagoblin/user_pages/media.html:132 msgid "at" @@ -759,46 +774,41 @@ msgid "" "

%(date)s

" msgstr "

加入日期

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 -msgid "Attachments" -msgstr "" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add attachment" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +msgid "Add media to collection" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" -msgstr "" +msgstr "新增 %(title)s 到蒐藏" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" -msgstr "" +msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" -msgstr "" +msgstr "新增新的蒐藏" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "針對你的展示區，你可以在這裡追蹤媒體處理的狀態。" +msgstr "您可以在這裡追蹤您的藝廊中媒體處理的狀態。" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" -msgstr "" +msgstr "您的最近 10 次成功上傳的紀錄" #: mediagoblin/templates/mediagoblin/user_pages/user.html:31 #: mediagoblin/templates/mediagoblin/user_pages/user.html:89 #, python-format msgid "%(username)s's profile" -msgstr "%(username)s的個人檔案" +msgstr "%(username)s 的個人檔案" #: mediagoblin/templates/mediagoblin/user_pages/user.html:43 msgid "Sorry, no such user found." -msgstr "抱歉，找不到這個使用者." +msgstr "抱歉，找不到這個使用者。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 @@ -807,16 +817,16 @@ msgstr "需要認證電子郵件" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." -msgstr "幾乎完成了！但你的帳號仍然需要被啟用。" +msgstr "快完成了！但您需要啟用您的帳號。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:58 msgid "" "An email should arrive in a few moments with instructions on how to do so." -msgstr "馬上會有一封電子郵件告訴你如何做." +msgstr "啟用步驟的 email 將會寄到您的信箱。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "In case it doesn't:" -msgstr "如果仍然無法認證，你可以:" +msgstr "如果仍然無法認證，您可以：" #: mediagoblin/templates/mediagoblin/user_pages/user.html:65 msgid "Resend verification email" @@ -826,18 +836,18 @@ msgstr "重送認證信" msgid "" "Someone has registered an account with this username, but it still has to be" " activated." -msgstr "有人用了這個帳號登錄了，但是這個帳號仍需要被啟用。" +msgstr "有人用了這個帳號登錄了，但是這個帳號需要被啟用。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:79 #, python-format msgid "" "If you are that person but you've lost your verification email, you can log in and resend it." -msgstr "如果你就是那個人, 但是遺失了認證信, 你可以登入 然後重送一次." +msgstr "如果您就是本人但是掉了認證信，您可以 登入 然後重送一次。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:96 msgid "Here's a spot to tell others about yourself." -msgstr "這個地方能讓你向他人介紹自己。" +msgstr "這個地方能讓您向他人介紹自己。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:101 #: mediagoblin/templates/mediagoblin/user_pages/user.html:118 @@ -846,53 +856,37 @@ msgstr "編輯個人檔案" #: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "This user hasn't filled in their profile (yet)." -msgstr "這個使用者還沒(來得及)填寫個人檔案。" +msgstr "這個使用者(還)沒有填寫個人檔案。" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:125 -msgid "Change account settings" -msgstr "更改帳號設定" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 #, python-format msgid "View all of %(username)s's media" -msgstr "查看%(username)s的全部媒體檔案" +msgstr "查看 %(username)s 的全部媒體" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 msgid "" "This is where your media will appear, but you don't seem to have added " "anything yet." -msgstr "這個地方是你的媒體檔案會出現的地方，但是你似乎還沒有加入任何東西。" +msgstr "此處是您的媒體會出現的地方，但是似乎還沒有加入任何東西。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -msgid "Add media" -msgstr "新增媒體檔案" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:163 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." -msgstr "似乎還沒有任何的媒體檔案..." +msgstr "那裡好像還沒有任何的媒體…" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39 -#, python-format -msgid "" -"
\n" -" %(note)s" -msgstr "" - -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47 -#, python-format -msgid "
(remove)" +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +msgid "(remove)" msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format msgid "In collections (%(collected)s)" -msgstr "" +msgstr "在蒐藏 (%(collected)s)" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:21 msgid "feed icon" -msgstr "feed圖示" +msgstr "feed 圖示" #: mediagoblin/templates/mediagoblin/utils/feed_link.html:23 msgid "Atom feed" @@ -902,10 +896,10 @@ msgstr "Atom feed" msgid "Location" msgstr "位置" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38 +#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 #, python-format msgid "View on OpenStreetMap" -msgstr "在 OpenStreetMap上觀看" +msgstr "在 OpenStreetMap 上觀看" #: mediagoblin/templates/mediagoblin/utils/license.html:25 msgid "All rights reserved" @@ -913,11 +907,11 @@ msgstr "版權所有" #: mediagoblin/templates/mediagoblin/utils/pagination.html:39 msgid "← Newer" -msgstr "← 更新" +msgstr "← 更新的" #: mediagoblin/templates/mediagoblin/utils/pagination.html:45 msgid "Older →" -msgstr "更舊 →" +msgstr "更舊的 →" #: mediagoblin/templates/mediagoblin/utils/pagination.html:48 msgid "Go to page:" @@ -926,109 +920,135 @@ msgstr "跳到頁數：" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:28 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:33 msgid "newer" -msgstr "更新" +msgstr "更新的" #: mediagoblin/templates/mediagoblin/utils/prev_next.html:39 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:44 msgid "older" -msgstr "更舊" +msgstr "更舊的" #: mediagoblin/templates/mediagoblin/utils/tags.html:20 msgid "Tagged with" -msgstr "標籤為" +msgstr "標籤" #: mediagoblin/tools/exif.py:78 msgid "Could not read the image file." -msgstr "無法讀取影像檔案。" +msgstr "無法讀取圖片檔案。" + +#: mediagoblin/tools/response.py:29 +msgid "Oops!" +msgstr "糟糕！" + +#: mediagoblin/tools/response.py:30 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:44 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:45 +msgid "" +"Sorry Dave, I can't let you do that!

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

If you're sure" +" the address is correct, maybe the page you're looking for has been moved or" +" deleted." +msgstr "" #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" -msgstr "我確定我想要刪除" +msgstr "我確定我要刪除這個媒體" #: mediagoblin/user_pages/forms.py:32 msgid "I am sure I want to remove this item from the collection" -msgstr "" +msgstr "我確定我要從蒐藏中移除此項目" #: mediagoblin/user_pages/forms.py:35 msgid "-- Select --" -msgstr "" +msgstr "— 請選擇 —" #: mediagoblin/user_pages/forms.py:37 msgid "Include a note" -msgstr "" +msgstr "加註" #: mediagoblin/user_pages/lib.py:56 msgid "commented on your post" -msgstr "" +msgstr "在您的內容張貼評論" #: mediagoblin/user_pages/views.py:161 msgid "Oops, your comment was empty." -msgstr "啊，你的留言是空的。" +msgstr "啊，您的留言是空的。" #: mediagoblin/user_pages/views.py:167 msgid "Your comment has been posted!" -msgstr "你的留言已經刊登！" +msgstr "您的留言已經張貼完成！" #: mediagoblin/user_pages/views.py:235 msgid "You have to select or add a collection" -msgstr "" +msgstr "您需要選擇或是新增一個蒐藏" #: mediagoblin/user_pages/views.py:243 #, python-format msgid "\"%s\" already in collection \"%s\"" -msgstr "" +msgstr "「%s」已經在「%s」蒐藏" #: mediagoblin/user_pages/views.py:258 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "" +msgstr "「%s」加入「%s」蒐藏" #: mediagoblin/user_pages/views.py:266 msgid "Please check your entries and try again." -msgstr "" +msgstr "請檢查項目並重試。" #: mediagoblin/user_pages/views.py:297 msgid "" "Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "" +msgstr "在此項目中有些檔案好像不見了，已先行刪除。" #: mediagoblin/user_pages/views.py:302 msgid "You deleted the media." -msgstr "你已刪除此媒體檔案。" +msgstr "您已經刪除此媒體。" #: mediagoblin/user_pages/views.py:309 msgid "The media was not deleted because you didn't check that you were sure." -msgstr "此媒體檔案尚未被刪除因為你還沒有確認你真的要刪除。" +msgstr "由於您沒有勾選確認，該媒體沒有被移除。" #: mediagoblin/user_pages/views.py:317 msgid "You are about to delete another user's media. Proceed with caution." -msgstr "你在刪除其他人的媒體檔案。請小心處理喔。" +msgstr "您正在刪除別人的媒體，請小心操作。" #: mediagoblin/user_pages/views.py:379 msgid "You deleted the item from the collection." -msgstr "" +msgstr "您已經從該蒐藏中刪除該項目。" #: mediagoblin/user_pages/views.py:383 msgid "The item was not removed because you didn't check that you were sure." -msgstr "" +msgstr "由於您沒有勾選確認，該項目沒有被移除。" #: mediagoblin/user_pages/views.py:393 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." -msgstr "" +msgstr "您正在從別人的蒐藏中刪除項目，請小心操作。" #: mediagoblin/user_pages/views.py:426 #, python-format msgid "You deleted the collection \"%s\"" -msgstr "" +msgstr "您已經刪除「%s」蒐藏。" #: mediagoblin/user_pages/views.py:433 msgid "" "The collection was not deleted because you didn't check that you were sure." -msgstr "" +msgstr "由於您沒有勾選確認，該蒐藏沒有被移除。" #: mediagoblin/user_pages/views.py:443 msgid "" "You are about to delete another user's collection. Proceed with caution." -msgstr "" +msgstr "您正在刪除別人的蒐藏，請小心操作。" From 47cd2f66b6a4e4caa078927738b89d68624c32a6 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 01:33:38 -0500 Subject: [PATCH 073/140] Added the thingiview.js library. --- mediagoblin/static/js/thingiview.js/Three.js | 202 ++++ .../static/js/thingiview.js/binaryReader.js | 126 +++ mediagoblin/static/js/thingiview.js/plane.js | 62 ++ mediagoblin/static/js/thingiview.js/stats.js | 2 + .../static/js/thingiview.js/thingiloader.js | 318 +++++++ .../static/js/thingiview.js/thingiview.js | 894 ++++++++++++++++++ 6 files changed, 1604 insertions(+) create mode 100644 mediagoblin/static/js/thingiview.js/Three.js create mode 100644 mediagoblin/static/js/thingiview.js/binaryReader.js create mode 100644 mediagoblin/static/js/thingiview.js/plane.js create mode 100644 mediagoblin/static/js/thingiview.js/stats.js create mode 100644 mediagoblin/static/js/thingiview.js/thingiloader.js create mode 100644 mediagoblin/static/js/thingiview.js/thingiview.js diff --git a/mediagoblin/static/js/thingiview.js/Three.js b/mediagoblin/static/js/thingiview.js/Three.js new file mode 100644 index 00000000..5c21380c --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/Three.js @@ -0,0 +1,202 @@ +// Three.js r32 - http://github.com/mrdoob/three.js +var THREE=THREE||{};THREE.Color=function(a){this.autoUpdate=true;this.setHex(a)}; +THREE.Color.prototype={setRGB:function(a,c,d){this.r=a;this.g=c;this.b=d;if(this.autoUpdate){this.updateHex();this.updateStyleString()}},setHex:function(a){this.hex=~~a&16777215;if(this.autoUpdate){this.updateRGBA();this.updateStyleString()}},updateHex:function(){this.hex=~~(this.r*255)<<16^~~(this.g*255)<<8^~~(this.b*255)},updateRGBA:function(){this.r=(this.hex>>16&255)/255;this.g=(this.hex>>8&255)/255;this.b=(this.hex&255)/255},updateStyleString:function(){this.__styleString="rgb("+~~(this.r*255)+ +","+~~(this.g*255)+","+~~(this.b*255)+")"},clone:function(){return new THREE.Color(this.hex)},toString:function(){return"THREE.Color ( r: "+this.r+", g: "+this.g+", b: "+this.b+", hex: "+this.hex+" )"}};THREE.Vector2=function(a,c){this.x=a||0;this.y=c||0}; +THREE.Vector2.prototype={set:function(a,c){this.x=a;this.y=c;return this},copy:function(a){this.x=a.x;this.y=a.y;return this},addSelf:function(a){this.x+=a.x;this.y+=a.y;return this},add:function(a,c){this.x=a.x+c.x;this.y=a.y+c.y;return this},subSelf:function(a){this.x-=a.x;this.y-=a.y;return this},sub:function(a,c){this.x=a.x-c.x;this.y=a.y-c.y;return this},multiplyScalar:function(a){this.x*=a;this.y*=a;return this},unit:function(){this.multiplyScalar(1/this.length());return this},length:function(){return Math.sqrt(this.x* +this.x+this.y*this.y)},lengthSq:function(){return this.x*this.x+this.y*this.y},negate:function(){this.x=-this.x;this.y=-this.y;return this},clone:function(){return new THREE.Vector2(this.x,this.y)},toString:function(){return"THREE.Vector2 ("+this.x+", "+this.y+")"}};THREE.Vector3=function(a,c,d){this.x=a||0;this.y=c||0;this.z=d||0}; +THREE.Vector3.prototype={set:function(a,c,d){this.x=a;this.y=c;this.z=d;return this},copy:function(a){this.x=a.x;this.y=a.y;this.z=a.z;return this},add:function(a,c){this.x=a.x+c.x;this.y=a.y+c.y;this.z=a.z+c.z;return this},addSelf:function(a){this.x+=a.x;this.y+=a.y;this.z+=a.z;return this},addScalar:function(a){this.x+=a;this.y+=a;this.z+=a;return this},sub:function(a,c){this.x=a.x-c.x;this.y=a.y-c.y;this.z=a.z-c.z;return this},subSelf:function(a){this.x-=a.x;this.y-=a.y;this.z-=a.z;return this}, +cross:function(a,c){this.x=a.y*c.z-a.z*c.y;this.y=a.z*c.x-a.x*c.z;this.z=a.x*c.y-a.y*c.x;return this},crossSelf:function(a){var c=this.x,d=this.y,e=this.z;this.x=d*a.z-e*a.y;this.y=e*a.x-c*a.z;this.z=c*a.y-d*a.x;return this},multiply:function(a,c){this.x=a.x*c.x;this.y=a.y*c.y;this.z=a.z*c.z;return this},multiplySelf:function(a){this.x*=a.x;this.y*=a.y;this.z*=a.z;return this},multiplyScalar:function(a){this.x*=a;this.y*=a;this.z*=a;return this},divideSelf:function(a){this.x/=a.x;this.y/=a.y;this.z/= +a.z;return this},divideScalar:function(a){this.x/=a;this.y/=a;this.z/=a;return this},dot:function(a){return this.x*a.x+this.y*a.y+this.z*a.z},distanceTo:function(a){var c=this.x-a.x,d=this.y-a.y;a=this.z-a.z;return Math.sqrt(c*c+d*d+a*a)},distanceToSquared:function(a){var c=this.x-a.x,d=this.y-a.y;a=this.z-a.z;return c*c+d*d+a*a},length:function(){return Math.sqrt(this.x*this.x+this.y*this.y+this.z*this.z)},lengthSq:function(){return this.x*this.x+this.y*this.y+this.z*this.z},negate:function(){this.x= +-this.x;this.y=-this.y;this.z=-this.z;return this},normalize:function(){var a=Math.sqrt(this.x*this.x+this.y*this.y+this.z*this.z);a>0?this.multiplyScalar(1/a):this.set(0,0,0);return this},setLength:function(a){return this.normalize().multiplyScalar(a)},isZero:function(){return Math.abs(this.x)<1.0E-4&&Math.abs(this.y)<1.0E-4&&Math.abs(this.z)<1.0E-4},clone:function(){return new THREE.Vector3(this.x,this.y,this.z)},toString:function(){return"THREE.Vector3 ( "+this.x+", "+this.y+", "+this.z+" )"}}; +THREE.Vector4=function(a,c,d,e){this.x=a||0;this.y=c||0;this.z=d||0;this.w=e||1}; +THREE.Vector4.prototype={set:function(a,c,d,e){this.x=a;this.y=c;this.z=d;this.w=e;return this},copy:function(a){this.x=a.x;this.y=a.y;this.z=a.z;this.w=a.w||1;return this},add:function(a,c){this.x=a.x+c.x;this.y=a.y+c.y;this.z=a.z+c.z;this.w=a.w+c.w;return this},addSelf:function(a){this.x+=a.x;this.y+=a.y;this.z+=a.z;this.w+=a.w;return this},sub:function(a,c){this.x=a.x-c.x;this.y=a.y-c.y;this.z=a.z-c.z;this.w=a.w-c.w;return this},subSelf:function(a){this.x-=a.x;this.y-=a.y;this.z-=a.z;this.w-=a.w; +return this},multiplyScalar:function(a){this.x*=a;this.y*=a;this.z*=a;this.w*=a;return this},divideScalar:function(a){this.x/=a;this.y/=a;this.z/=a;this.w/=a;return this},lerpSelf:function(a,c){this.x+=(a.x-this.x)*c;this.y+=(a.y-this.y)*c;this.z+=(a.z-this.z)*c;this.w+=(a.w-this.w)*c},clone:function(){return new THREE.Vector4(this.x,this.y,this.z,this.w)},toString:function(){return"THREE.Vector4 ("+this.x+", "+this.y+", "+this.z+", "+this.w+")"}}; +THREE.Ray=function(a,c){this.origin=a||new THREE.Vector3;this.direction=c||new THREE.Vector3}; +THREE.Ray.prototype={intersectScene:function(a){var c,d,e=a.objects,g=[];a=0;for(c=e.length;a0&&K>0&&j+K<1}var d,e,g,h,o,b,i,k,y,z, +u,x=a.geometry,H=x.vertices,J=[];d=0;for(e=x.faces.length;di?e:i;g=g>k? +g:k}a()};this.add3Points=function(i,k,y,z,u,x){if(b){b=false;c=iy?i>u?i:u:y>u?y:u;g=k>z?k>x?k:x:z>x?z:x}else{c=iy?i>u?i>e?i:e:u>e?u:e:y>u?y>e?y:e:u>e?u:e;g=k>z?k>x?k>g?k:g:x>g?x:g:z>x?z>g?z:g:x>g?x:g}a()};this.addRectangle=function(i){if(b){b=false;c=i.getLeft();d=i.getTop();e=i.getRight();g=i.getBottom()}else{c=ci.getRight()?e:i.getRight();g=g>i.getBottom()?g:i.getBottom()}a()};this.inflate=function(i){c-=i;d-=i;e+=i;g+=i;a()};this.minSelf=function(i){c=c>i.getLeft()?c:i.getLeft();d=d>i.getTop()?d:i.getTop();e=e=0&&Math.min(g,i.getBottom())-Math.max(d,i.getTop())>=0};this.empty=function(){b=true;g=e=d=c=0;a()};this.isEmpty=function(){return b};this.toString= +function(){return"THREE.Rectangle ( left: "+c+", right: "+e+", top: "+d+", bottom: "+g+", width: "+h+", height: "+o+" )"}};THREE.Matrix3=function(){this.m=[]};THREE.Matrix3.prototype={transpose:function(){var a,c=this.m;a=c[1];c[1]=c[3];c[3]=a;a=c[2];c[2]=c[6];c[6]=a;a=c[5];c[5]=c[7];c[7]=a;return this}}; +THREE.Matrix4=function(a,c,d,e,g,h,o,b,i,k,y,z,u,x,H,J){this.n11=a||1;this.n12=c||0;this.n13=d||0;this.n14=e||0;this.n21=g||0;this.n22=h||1;this.n23=o||0;this.n24=b||0;this.n31=i||0;this.n32=k||0;this.n33=y||1;this.n34=z||0;this.n41=u||0;this.n42=x||0;this.n43=H||0;this.n44=J||1;this.flat=Array(16);this.m33=new THREE.Matrix3}; +THREE.Matrix4.prototype={identity:function(){this.n11=1;this.n21=this.n14=this.n13=this.n12=0;this.n22=1;this.n32=this.n31=this.n24=this.n23=0;this.n33=1;this.n43=this.n42=this.n41=this.n34=0;this.n44=1;return this},set:function(a,c,d,e,g,h,o,b,i,k,y,z,u,x,H,J){this.n11=a;this.n12=c;this.n13=d;this.n14=e;this.n21=g;this.n22=h;this.n23=o;this.n24=b;this.n31=i;this.n32=k;this.n33=y;this.n34=z;this.n41=u;this.n42=x;this.n43=H;this.n44=J;return this},copy:function(a){this.n11=a.n11;this.n12=a.n12;this.n13= +a.n13;this.n14=a.n14;this.n21=a.n21;this.n22=a.n22;this.n23=a.n23;this.n24=a.n24;this.n31=a.n31;this.n32=a.n32;this.n33=a.n33;this.n34=a.n34;this.n41=a.n41;this.n42=a.n42;this.n43=a.n43;this.n44=a.n44;return this},lookAt:function(a,c,d){var e=THREE.Matrix4.__tmpVec1,g=THREE.Matrix4.__tmpVec2,h=THREE.Matrix4.__tmpVec3;h.sub(a,c).normalize();e.cross(d,h).normalize();g.cross(h,e).normalize();this.n11=e.x;this.n12=e.y;this.n13=e.z;this.n14=-e.dot(a);this.n21=g.x;this.n22=g.y;this.n23=g.z;this.n24=-g.dot(a); +this.n31=h.x;this.n32=h.y;this.n33=h.z;this.n34=-h.dot(a);this.n43=this.n42=this.n41=0;this.n44=1;return this},multiplyVector3:function(a){var c=a.x,d=a.y,e=a.z,g=1/(this.n41*c+this.n42*d+this.n43*e+this.n44);a.x=(this.n11*c+this.n12*d+this.n13*e+this.n14)*g;a.y=(this.n21*c+this.n22*d+this.n23*e+this.n24)*g;a.z=(this.n31*c+this.n32*d+this.n33*e+this.n34)*g;return a},multiplyVector4:function(a){var c=a.x,d=a.y,e=a.z,g=a.w;a.x=this.n11*c+this.n12*d+this.n13*e+this.n14*g;a.y=this.n21*c+this.n22*d+this.n23* +e+this.n24*g;a.z=this.n31*c+this.n32*d+this.n33*e+this.n34*g;a.w=this.n41*c+this.n42*d+this.n43*e+this.n44*g;return a},crossVector:function(a){var c=new THREE.Vector4;c.x=this.n11*a.x+this.n12*a.y+this.n13*a.z+this.n14*a.w;c.y=this.n21*a.x+this.n22*a.y+this.n23*a.z+this.n24*a.w;c.z=this.n31*a.x+this.n32*a.y+this.n33*a.z+this.n34*a.w;c.w=a.w?this.n41*a.x+this.n42*a.y+this.n43*a.z+this.n44*a.w:1;return c},multiply:function(a,c){var d=a.n11,e=a.n12,g=a.n13,h=a.n14,o=a.n21,b=a.n22,i=a.n23,k=a.n24,y=a.n31, +z=a.n32,u=a.n33,x=a.n34,H=a.n41,J=a.n42,K=a.n43,p=a.n44,U=c.n11,F=c.n12,f=c.n13,j=c.n14,q=c.n21,l=c.n22,r=c.n23,C=c.n24,m=c.n31,t=c.n32,v=c.n33,s=c.n34,n=c.n41,E=c.n42,A=c.n43,O=c.n44;this.n11=d*U+e*q+g*m+h*n;this.n12=d*F+e*l+g*t+h*E;this.n13=d*f+e*r+g*v+h*A;this.n14=d*j+e*C+g*s+h*O;this.n21=o*U+b*q+i*m+k*n;this.n22=o*F+b*l+i*t+k*E;this.n23=o*f+b*r+i*v+k*A;this.n24=o*j+b*C+i*s+k*O;this.n31=y*U+z*q+u*m+x*n;this.n32=y*F+z*l+u*t+x*E;this.n33=y*f+z*r+u*v+x*A;this.n34=y*j+z*C+u*s+x*O;this.n41=H*U+J*q+ +K*m+p*n;this.n42=H*F+J*l+K*t+p*E;this.n43=H*f+J*r+K*v+p*A;this.n44=H*j+J*C+K*s+p*O;return this},multiplySelf:function(a){var c=this.n11,d=this.n12,e=this.n13,g=this.n14,h=this.n21,o=this.n22,b=this.n23,i=this.n24,k=this.n31,y=this.n32,z=this.n33,u=this.n34,x=this.n41,H=this.n42,J=this.n43,K=this.n44,p=a.n11,U=a.n21,F=a.n31,f=a.n41,j=a.n12,q=a.n22,l=a.n32,r=a.n42,C=a.n13,m=a.n23,t=a.n33,v=a.n43,s=a.n14,n=a.n24,E=a.n34;a=a.n44;this.n11=c*p+d*U+e*F+g*f;this.n12=c*j+d*q+e*l+g*r;this.n13=c*C+d*m+e*t+g* +v;this.n14=c*s+d*n+e*E+g*a;this.n21=h*p+o*U+b*F+i*f;this.n22=h*j+o*q+b*l+i*r;this.n23=h*C+o*m+b*t+i*v;this.n24=h*s+o*n+b*E+i*a;this.n31=k*p+y*U+z*F+u*f;this.n32=k*j+y*q+z*l+u*r;this.n33=k*C+y*m+z*t+u*v;this.n34=k*s+y*n+z*E+u*a;this.n41=x*p+H*U+J*F+K*f;this.n42=x*j+H*q+J*l+K*r;this.n43=x*C+H*m+J*t+K*v;this.n44=x*s+H*n+J*E+K*a;return this},multiplyScalar:function(a){this.n11*=a;this.n12*=a;this.n13*=a;this.n14*=a;this.n21*=a;this.n22*=a;this.n23*=a;this.n24*=a;this.n31*=a;this.n32*=a;this.n33*=a;this.n34*= +a;this.n41*=a;this.n42*=a;this.n43*=a;this.n44*=a;return this},determinant:function(){var a=this.n11,c=this.n12,d=this.n13,e=this.n14,g=this.n21,h=this.n22,o=this.n23,b=this.n24,i=this.n31,k=this.n32,y=this.n33,z=this.n34,u=this.n41,x=this.n42,H=this.n43,J=this.n44;return e*o*k*u-d*b*k*u-e*h*y*u+c*b*y*u+d*h*z*u-c*o*z*u-e*o*i*x+d*b*i*x+e*g*y*x-a*b*y*x-d*g*z*x+a*o*z*x+e*h*i*H-c*b*i*H-e*g*k*H+a*b*k*H+c*g*z*H-a*h*z*H-d*h*i*J+c*o*i*J+d*g*k*J-a*o*k*J-c*g*y*J+a*h*y*J},transpose:function(){function a(c,d, +e){var g=c[d];c[d]=c[e];c[e]=g}a(this,"n21","n12");a(this,"n31","n13");a(this,"n32","n23");a(this,"n41","n14");a(this,"n42","n24");a(this,"n43","n34");return this},clone:function(){var a=new THREE.Matrix4;a.n11=this.n11;a.n12=this.n12;a.n13=this.n13;a.n14=this.n14;a.n21=this.n21;a.n22=this.n22;a.n23=this.n23;a.n24=this.n24;a.n31=this.n31;a.n32=this.n32;a.n33=this.n33;a.n34=this.n34;a.n41=this.n41;a.n42=this.n42;a.n43=this.n43;a.n44=this.n44;return a},flatten:function(){var a=this.flat;a[0]=this.n11; +a[1]=this.n21;a[2]=this.n31;a[3]=this.n41;a[4]=this.n12;a[5]=this.n22;a[6]=this.n32;a[7]=this.n42;a[8]=this.n13;a[9]=this.n23;a[10]=this.n33;a[11]=this.n43;a[12]=this.n14;a[13]=this.n24;a[14]=this.n34;a[15]=this.n44;return a},setTranslation:function(a,c,d){this.set(1,0,0,a,0,1,0,c,0,0,1,d,0,0,0,1);return this},setScale:function(a,c,d){this.set(a,0,0,0,0,c,0,0,0,0,d,0,0,0,0,1);return this},setRotX:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(1,0,0,0,0,c,-a,0,0,a,c,0,0,0,0,1);return this},setRotY:function(a){var c= +Math.cos(a);a=Math.sin(a);this.set(c,0,a,0,0,1,0,0,-a,0,c,0,0,0,0,1);return this},setRotZ:function(a){var c=Math.cos(a);a=Math.sin(a);this.set(c,-a,0,0,a,c,0,0,0,0,1,0,0,0,0,1);return this},setRotAxis:function(a,c){var d=Math.cos(c),e=Math.sin(c),g=1-d,h=a.x,o=a.y,b=a.z,i=g*h,k=g*o;this.set(i*h+d,i*o-e*b,i*b+e*o,0,i*o+e*b,k*o+d,k*b-e*h,0,i*b-e*o,k*b+e*h,g*b*b+d,0,0,0,0,1);return this},toString:function(){return"| "+this.n11+" "+this.n12+" "+this.n13+" "+this.n14+" |\n| "+this.n21+" "+this.n22+" "+ +this.n23+" "+this.n24+" |\n| "+this.n31+" "+this.n32+" "+this.n33+" "+this.n34+" |\n| "+this.n41+" "+this.n42+" "+this.n43+" "+this.n44+" |"}};THREE.Matrix4.translationMatrix=function(a,c,d){var e=new THREE.Matrix4;e.setTranslation(a,c,d);return e};THREE.Matrix4.scaleMatrix=function(a,c,d){var e=new THREE.Matrix4;e.setScale(a,c,d);return e};THREE.Matrix4.rotationXMatrix=function(a){var c=new THREE.Matrix4;c.setRotX(a);return c}; +THREE.Matrix4.rotationYMatrix=function(a){var c=new THREE.Matrix4;c.setRotY(a);return c};THREE.Matrix4.rotationZMatrix=function(a){var c=new THREE.Matrix4;c.setRotZ(a);return c};THREE.Matrix4.rotationAxisAngleMatrix=function(a,c){var d=new THREE.Matrix4;d.setRotAxis(a,c);return d}; +THREE.Matrix4.makeInvert=function(a){var c=a.n11,d=a.n12,e=a.n13,g=a.n14,h=a.n21,o=a.n22,b=a.n23,i=a.n24,k=a.n31,y=a.n32,z=a.n33,u=a.n34,x=a.n41,H=a.n42,J=a.n43,K=a.n44,p=new THREE.Matrix4;p.n11=b*u*H-i*z*H+i*y*J-o*u*J-b*y*K+o*z*K;p.n12=g*z*H-e*u*H-g*y*J+d*u*J+e*y*K-d*z*K;p.n13=e*i*H-g*b*H+g*o*J-d*i*J-e*o*K+d*b*K;p.n14=g*b*y-e*i*y-g*o*z+d*i*z+e*o*u-d*b*u;p.n21=i*z*x-b*u*x-i*k*J+h*u*J+b*k*K-h*z*K;p.n22=e*u*x-g*z*x+g*k*J-c*u*J-e*k*K+c*z*K;p.n23=g*b*x-e*i*x-g*h*J+c*i*J+e*h*K-c*b*K;p.n24=e*i*k-g*b*k+ +g*h*z-c*i*z-e*h*u+c*b*u;p.n31=o*u*x-i*y*x+i*k*H-h*u*H-o*k*K+h*y*K;p.n32=g*y*x-d*u*x-g*k*H+c*u*H+d*k*K-c*y*K;p.n33=e*i*x-g*o*x+g*h*H-c*i*H-d*h*K+c*o*K;p.n34=g*o*k-d*i*k-g*h*y+c*i*y+d*h*u-c*o*u;p.n41=b*y*x-o*z*x-b*k*H+h*z*H+o*k*J-h*y*J;p.n42=d*z*x-e*y*x+e*k*H-c*z*H-d*k*J+c*y*J;p.n43=e*o*x-d*b*x-e*h*H+c*b*H+d*h*J-c*o*J;p.n44=d*b*k-e*o*k+e*h*y-c*b*y-d*h*z+c*o*z;p.multiplyScalar(1/a.determinant());return p}; +THREE.Matrix4.makeInvert3x3=function(a){var c=a.flatten();a=a.m33;var d=a.m,e=c[10]*c[5]-c[6]*c[9],g=-c[10]*c[1]+c[2]*c[9],h=c[6]*c[1]-c[2]*c[5],o=-c[10]*c[4]+c[6]*c[8],b=c[10]*c[0]-c[2]*c[8],i=-c[6]*c[0]+c[2]*c[4],k=c[9]*c[4]-c[5]*c[8],y=-c[9]*c[0]+c[1]*c[8],z=c[5]*c[0]-c[1]*c[4];c=c[0]*e+c[1]*o+c[2]*k;if(c==0)throw"matrix not invertible";c=1/c;d[0]=c*e;d[1]=c*g;d[2]=c*h;d[3]=c*o;d[4]=c*b;d[5]=c*i;d[6]=c*k;d[7]=c*y;d[8]=c*z;return a}; +THREE.Matrix4.makeFrustum=function(a,c,d,e,g,h){var o,b,i;o=new THREE.Matrix4;b=2*g/(c-a);i=2*g/(e-d);a=(c+a)/(c-a);d=(e+d)/(e-d);e=-(h+g)/(h-g);g=-2*h*g/(h-g);o.n11=b;o.n12=0;o.n13=a;o.n14=0;o.n21=0;o.n22=i;o.n23=d;o.n24=0;o.n31=0;o.n32=0;o.n33=e;o.n34=g;o.n41=0;o.n42=0;o.n43=-1;o.n44=0;return o};THREE.Matrix4.makePerspective=function(a,c,d,e){var g;a=d*Math.tan(a*Math.PI/360);g=-a;return THREE.Matrix4.makeFrustum(g*c,a*c,g,a,d,e)}; +THREE.Matrix4.makeOrtho=function(a,c,d,e,g,h){var o,b,i,k;o=new THREE.Matrix4;b=c-a;i=d-e;k=h-g;a=(c+a)/b;d=(d+e)/i;g=(h+g)/k;o.n11=2/b;o.n12=0;o.n13=0;o.n14=-a;o.n21=0;o.n22=2/i;o.n23=0;o.n24=-d;o.n31=0;o.n32=0;o.n33=-2/k;o.n34=-g;o.n41=0;o.n42=0;o.n43=0;o.n44=1;return o};THREE.Matrix4.__tmpVec1=new THREE.Vector3;THREE.Matrix4.__tmpVec2=new THREE.Vector3;THREE.Matrix4.__tmpVec3=new THREE.Vector3; +THREE.Vertex=function(a,c){this.position=a||new THREE.Vector3;this.positionWorld=new THREE.Vector3;this.positionScreen=new THREE.Vector4;this.normal=c||new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.normalScreen=new THREE.Vector3;this.tangent=new THREE.Vector4;this.__visible=true};THREE.Vertex.prototype={toString:function(){return"THREE.Vertex ( position: "+this.position+", normal: "+this.normal+" )"}}; +THREE.Face3=function(a,c,d,e,g){this.a=a;this.b=c;this.c=d;this.centroid=new THREE.Vector3;this.normal=e instanceof THREE.Vector3?e:new THREE.Vector3;this.vertexNormals=e instanceof Array?e:[];this.materials=g instanceof Array?g:[g]};THREE.Face3.prototype={toString:function(){return"THREE.Face3 ( "+this.a+", "+this.b+", "+this.c+" )"}}; +THREE.Face4=function(a,c,d,e,g,h){this.a=a;this.b=c;this.c=d;this.d=e;this.centroid=new THREE.Vector3;this.normal=g instanceof THREE.Vector3?g:new THREE.Vector3;this.vertexNormals=g instanceof Array?g:[];this.materials=h instanceof Array?h:[h]};THREE.Face4.prototype={toString:function(){return"THREE.Face4 ( "+this.a+", "+this.b+", "+this.c+" "+this.d+" )"}};THREE.UV=function(a,c){this.u=a||0;this.v=c||0}; +THREE.UV.prototype={copy:function(a){this.u=a.u;this.v=a.v},toString:function(){return"THREE.UV ("+this.u+", "+this.v+")"}};THREE.Geometry=function(){this.vertices=[];this.faces=[];this.uvs=[];this.boundingSphere=this.boundingBox=null;this.geometryChunks={};this.hasTangents=false}; +THREE.Geometry.prototype={computeCentroids:function(){var a,c,d;a=0;for(c=this.faces.length;a0){this.boundingBox={x:[this.vertices[0].position.x,this.vertices[0].position.x],y:[this.vertices[0].position.y,this.vertices[0].position.y], +z:[this.vertices[0].position.z,this.vertices[0].position.z]};for(var c=1,d=this.vertices.length;cthis.boundingBox.x[1])this.boundingBox.x[1]=a.position.x;if(a.position.ythis.boundingBox.y[1])this.boundingBox.y[1]=a.position.y;if(a.position.z +this.boundingBox.z[1])this.boundingBox.z[1]=a.position.z}}},computeBoundingSphere:function(){for(var a=this.boundingSphere===null?0:this.boundingSphere.radius,c=0,d=this.vertices.length;c65535){k[b].counter+=1;i=k[b].hash+"_"+k[b].counter;if(this.geometryChunks[i]==undefined)this.geometryChunks[i]={faces:[],materials:o,vertices:0}}this.geometryChunks[i].faces.push(e);this.geometryChunks[i].vertices+=h}},toString:function(){return"THREE.Geometry ( vertices: "+ +this.vertices+", faces: "+this.faces+", uvs: "+this.uvs+" )"}}; +THREE.Camera=function(a,c,d,e){this.fov=a;this.aspect=c;this.near=d;this.far=e;this.position=new THREE.Vector3;this.target={position:new THREE.Vector3};this.autoUpdateMatrix=true;this.projectionMatrix=null;this.matrix=new THREE.Matrix4;this.up=new THREE.Vector3(0,1,0);this.tmpVec=new THREE.Vector3;this.translateX=function(g){this.tmpVec.sub(this.target.position,this.position).normalize().multiplyScalar(g);this.tmpVec.crossSelf(this.up);this.position.addSelf(this.tmpVec);this.target.position.addSelf(this.tmpVec)}; +this.translateZ=function(g){this.tmpVec.sub(this.target.position,this.position).normalize().multiplyScalar(g);this.position.subSelf(this.tmpVec);this.target.position.subSelf(this.tmpVec)};this.updateMatrix=function(){this.matrix.lookAt(this.position,this.target.position,this.up)};this.updateProjectionMatrix=function(){this.projectionMatrix=THREE.Matrix4.makePerspective(this.fov,this.aspect,this.near,this.far)};this.updateProjectionMatrix()}; +THREE.Camera.prototype={toString:function(){return"THREE.Camera ( "+this.position+", "+this.target.position+" )"}};THREE.Light=function(a){this.color=new THREE.Color(a)};THREE.AmbientLight=function(a){THREE.Light.call(this,a)};THREE.AmbientLight.prototype=new THREE.Light;THREE.AmbientLight.prototype.constructor=THREE.AmbientLight;THREE.DirectionalLight=function(a,c){THREE.Light.call(this,a);this.position=new THREE.Vector3(0,1,0);this.intensity=c||1};THREE.DirectionalLight.prototype=new THREE.Light; +THREE.DirectionalLight.prototype.constructor=THREE.DirectionalLight;THREE.PointLight=function(a,c){THREE.Light.call(this,a);this.position=new THREE.Vector3;this.intensity=c||1};THREE.PointLight.prototype=new THREE.Light;THREE.PointLight.prototype.constructor=THREE.PointLight; +THREE.Object3D=function(){this.id=THREE.Object3DCounter.value++;this.position=new THREE.Vector3;this.rotation=new THREE.Vector3;this.scale=new THREE.Vector3(1,1,1);this.matrix=new THREE.Matrix4;this.rotationMatrix=new THREE.Matrix4;this.tmpMatrix=new THREE.Matrix4;this.screen=new THREE.Vector3;this.visible=this.autoUpdateMatrix=true}; +THREE.Object3D.prototype={updateMatrix:function(){var a=this.position,c=this.rotation,d=this.scale,e=this.tmpMatrix;this.matrix.setTranslation(a.x,a.y,a.z);this.rotationMatrix.setRotX(c.x);if(c.y!=0){e.setRotY(c.y);this.rotationMatrix.multiplySelf(e)}if(c.z!=0){e.setRotZ(c.z);this.rotationMatrix.multiplySelf(e)}this.matrix.multiplySelf(this.rotationMatrix);if(d.x!=0||d.y!=0||d.z!=0){e.setScale(d.x,d.y,d.z);this.matrix.multiplySelf(e)}}};THREE.Object3DCounter={value:0}; +THREE.Particle=function(a){THREE.Object3D.call(this);this.materials=a instanceof Array?a:[a];this.autoUpdateMatrix=false};THREE.Particle.prototype=new THREE.Object3D;THREE.Particle.prototype.constructor=THREE.Particle;THREE.ParticleSystem=function(a,c){THREE.Object3D.call(this);this.geometry=a;this.materials=c instanceof Array?c:[c];this.autoUpdateMatrix=false};THREE.ParticleSystem.prototype=new THREE.Object3D;THREE.ParticleSystem.prototype.constructor=THREE.ParticleSystem; +THREE.Line=function(a,c,d){THREE.Object3D.call(this);this.geometry=a;this.materials=c instanceof Array?c:[c];this.type=d!=undefined?d:THREE.LineStrip};THREE.LineStrip=0;THREE.LinePieces=1;THREE.Line.prototype=new THREE.Object3D;THREE.Line.prototype.constructor=THREE.Line;THREE.Mesh=function(a,c){THREE.Object3D.call(this);this.geometry=a;this.materials=c instanceof Array?c:[c];this.overdraw=this.doubleSided=this.flipSided=false;this.geometry.boundingSphere||this.geometry.computeBoundingSphere()}; +THREE.Mesh.prototype=new THREE.Object3D;THREE.Mesh.prototype.constructor=THREE.Mesh;THREE.FlatShading=0;THREE.SmoothShading=1;THREE.NormalBlending=0;THREE.AdditiveBlending=1;THREE.SubtractiveBlending=2; +THREE.LineBasicMaterial=function(a){this.color=new THREE.Color(16777215);this.opacity=1;this.blending=THREE.NormalBlending;this.linewidth=1;this.linejoin=this.linecap="round";if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending;if(a.linewidth!==undefined)this.linewidth=a.linewidth;if(a.linecap!==undefined)this.linecap=a.linecap;if(a.linejoin!==undefined)this.linejoin=a.linejoin}}; +THREE.LineBasicMaterial.prototype={toString:function(){return"THREE.LineBasicMaterial (
color: "+this.color+"
opacity: "+this.opacity+"
blending: "+this.blending+"
linewidth: "+this.linewidth+"
linecap: "+this.linecap+"
linejoin: "+this.linejoin+"
)"}}; +THREE.MeshBasicMaterial=function(a){this.id=THREE.MeshBasicMaterialCounter.value++;this.color=new THREE.Color(16777215);this.env_map=this.map=null;this.combine=THREE.MultiplyOperation;this.reflectivity=1;this.refraction_ratio=0.98;this.fog=true;this.opacity=1;this.shading=THREE.SmoothShading;this.blending=THREE.NormalBlending;this.wireframe=false;this.wireframe_linewidth=1;this.wireframe_linejoin=this.wireframe_linecap="round";if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.map!==undefined)this.map= +a.map;if(a.env_map!==undefined)this.env_map=a.env_map;if(a.combine!==undefined)this.combine=a.combine;if(a.reflectivity!==undefined)this.reflectivity=a.reflectivity;if(a.refraction_ratio!==undefined)this.refraction_ratio=a.refraction_ratio;if(a.fog!==undefined)this.fog=a.fog;if(a.opacity!==undefined)this.opacity=a.opacity;if(a.shading!==undefined)this.shading=a.shading;if(a.blending!==undefined)this.blending=a.blending;if(a.wireframe!==undefined)this.wireframe=a.wireframe;if(a.wireframe_linewidth!== +undefined)this.wireframe_linewidth=a.wireframe_linewidth;if(a.wireframe_linecap!==undefined)this.wireframe_linecap=a.wireframe_linecap;if(a.wireframe_linejoin!==undefined)this.wireframe_linejoin=a.wireframe_linejoin}}; +THREE.MeshBasicMaterial.prototype={toString:function(){return"THREE.MeshBasicMaterial (
id: "+this.id+"
color: "+this.color+"
map: "+this.map+"
env_map: "+this.env_map+"
combine: "+this.combine+"
reflectivity: "+this.reflectivity+"
refraction_ratio: "+this.refraction_ratio+"
opacity: "+this.opacity+"
blending: "+this.blending+"
wireframe: "+this.wireframe+"
wireframe_linewidth: "+this.wireframe_linewidth+"
wireframe_linecap: "+this.wireframe_linecap+ +"
wireframe_linejoin: "+this.wireframe_linejoin+"
)"}};THREE.MeshBasicMaterialCounter={value:0}; +THREE.MeshLambertMaterial=function(a){this.id=THREE.MeshLambertMaterialCounter.value++;this.color=new THREE.Color(16777215);this.env_map=this.map=null;this.combine=THREE.MultiplyOperation;this.reflectivity=1;this.refraction_ratio=0.98;this.fog=true;this.opacity=1;this.shading=THREE.SmoothShading;this.blending=THREE.NormalBlending;this.wireframe=false;this.wireframe_linewidth=1;this.wireframe_linejoin=this.wireframe_linecap="round";if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.map!==undefined)this.map= +a.map;if(a.env_map!==undefined)this.env_map=a.env_map;if(a.combine!==undefined)this.combine=a.combine;if(a.reflectivity!==undefined)this.reflectivity=a.reflectivity;if(a.refraction_ratio!==undefined)this.refraction_ratio=a.refraction_ratio;if(a.fog!==undefined)this.fog=a.fog;if(a.opacity!==undefined)this.opacity=a.opacity;if(a.shading!==undefined)this.shading=a.shading;if(a.blending!==undefined)this.blending=a.blending;if(a.wireframe!==undefined)this.wireframe=a.wireframe;if(a.wireframe_linewidth!== +undefined)this.wireframe_linewidth=a.wireframe_linewidth;if(a.wireframe_linecap!==undefined)this.wireframe_linecap=a.wireframe_linecap;if(a.wireframe_linejoin!==undefined)this.wireframe_linejoin=a.wireframe_linejoin}}; +THREE.MeshLambertMaterial.prototype={toString:function(){return"THREE.MeshLambertMaterial (
id: "+this.id+"
color: "+this.color+"
map: "+this.map+"
env_map: "+this.env_map+"
combine: "+this.combine+"
reflectivity: "+this.reflectivity+"
refraction_ratio: "+this.refraction_ratio+"
opacity: "+this.opacity+"
shading: "+this.shading+"
blending: "+this.blending+"
wireframe: "+this.wireframe+"
wireframe_linewidth: "+this.wireframe_linewidth+"
wireframe_linecap: "+ +this.wireframe_linecap+"
wireframe_linejoin: "+this.wireframe_linejoin+"
)"}};THREE.MeshLambertMaterialCounter={value:0}; +THREE.MeshPhongMaterial=function(a){this.id=THREE.MeshPhongMaterialCounter.value++;this.color=new THREE.Color(16777215);this.ambient=new THREE.Color(328965);this.specular=new THREE.Color(1118481);this.shininess=30;this.env_map=this.specular_map=this.map=null;this.combine=THREE.MultiplyOperation;this.reflectivity=1;this.refraction_ratio=0.98;this.fog=true;this.opacity=1;this.shading=THREE.SmoothShading;this.blending=THREE.NormalBlending;this.wireframe=false;this.wireframe_linewidth=1;this.wireframe_linejoin= +this.wireframe_linecap="round";if(a){if(a.color!==undefined)this.color=new THREE.Color(a.color);if(a.ambient!==undefined)this.ambient=new THREE.Color(a.ambient);if(a.specular!==undefined)this.specular=new THREE.Color(a.specular);if(a.shininess!==undefined)this.shininess=a.shininess;if(a.map!==undefined)this.map=a.map;if(a.specular_map!==undefined)this.specular_map=a.specular_map;if(a.env_map!==undefined)this.env_map=a.env_map;if(a.combine!==undefined)this.combine=a.combine;if(a.reflectivity!==undefined)this.reflectivity= +a.reflectivity;if(a.refraction_ratio!==undefined)this.refraction_ratio=a.refraction_ratio;if(a.fog!==undefined)this.fog=a.fog;if(a.opacity!==undefined)this.opacity=a.opacity;if(a.shading!==undefined)this.shading=a.shading;if(a.blending!==undefined)this.blending=a.blending;if(a.wireframe!==undefined)this.wireframe=a.wireframe;if(a.wireframe_linewidth!==undefined)this.wireframe_linewidth=a.wireframe_linewidth;if(a.wireframe_linecap!==undefined)this.wireframe_linecap=a.wireframe_linecap;if(a.wireframe_linejoin!== +undefined)this.wireframe_linejoin=a.wireframe_linejoin}}; +THREE.MeshPhongMaterial.prototype={toString:function(){return"THREE.MeshPhongMaterial (
id: "+this.id+"
color: "+this.color+"
ambient: "+this.ambient+"
specular: "+this.specular+"
shininess: "+this.shininess+"
map: "+this.map+"
specular_map: "+this.specular_map+"
env_map: "+this.env_map+"
combine: "+this.combine+"
reflectivity: "+this.reflectivity+"
refraction_ratio: "+this.refraction_ratio+"
opacity: "+this.opacity+"
shading: "+this.shading+"
wireframe: "+ +this.wireframe+"
wireframe_linewidth: "+this.wireframe_linewidth+"
wireframe_linecap: "+this.wireframe_linecap+"
wireframe_linejoin: "+this.wireframe_linejoin+"
)"}};THREE.MeshPhongMaterialCounter={value:0}; +THREE.MeshDepthMaterial=function(a){this.opacity=1;this.shading=THREE.SmoothShading;this.blending=THREE.NormalBlending;this.wireframe=false;this.wireframe_linewidth=1;this.wireframe_linejoin=this.wireframe_linecap="round";if(a){if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending}};THREE.MeshDepthMaterial.prototype={toString:function(){return"THREE.MeshDepthMaterial"}}; +THREE.MeshNormalMaterial=function(a){this.opacity=1;this.shading=THREE.FlatShading;this.blending=THREE.NormalBlending;if(a){if(a.opacity!==undefined)this.opacity=a.opacity;if(a.shading!==undefined)this.shading=a.shading;if(a.blending!==undefined)this.blending=a.blending}};THREE.MeshNormalMaterial.prototype={toString:function(){return"THREE.MeshNormalMaterial"}};THREE.MeshFaceMaterial=function(){};THREE.MeshFaceMaterial.prototype={toString:function(){return"THREE.MeshFaceMaterial"}}; +THREE.MeshShaderMaterial=function(a){this.id=THREE.MeshShaderMaterialCounter.value++;this.vertex_shader=this.fragment_shader="void main() {}";this.uniforms={};this.opacity=1;this.shading=THREE.SmoothShading;this.blending=THREE.NormalBlending;this.wireframe=false;this.wireframe_linewidth=1;this.wireframe_linejoin=this.wireframe_linecap="round";if(a){if(a.fragment_shader!==undefined)this.fragment_shader=a.fragment_shader;if(a.vertex_shader!==undefined)this.vertex_shader=a.vertex_shader;if(a.uniforms!== +undefined)this.uniforms=a.uniforms;if(a.shading!==undefined)this.shading=a.shading;if(a.blending!==undefined)this.blending=a.blending;if(a.wireframe!==undefined)this.wireframe=a.wireframe;if(a.wireframe_linewidth!==undefined)this.wireframe_linewidth=a.wireframe_linewidth;if(a.wireframe_linecap!==undefined)this.wireframe_linecap=a.wireframe_linecap;if(a.wireframe_linejoin!==undefined)this.wireframe_linejoin=a.wireframe_linejoin}}; +THREE.MeshShaderMaterial.prototype={toString:function(){return"THREE.MeshShaderMaterial (
id: "+this.id+"
blending: "+this.blending+"
wireframe: "+this.wireframe+"
wireframe_linewidth: "+this.wireframe_linewidth+"
wireframe_linecap: "+this.wireframe_linecap+"
wireframe_linejoin: "+this.wireframe_linejoin+"
)"}};THREE.MeshShaderMaterialCounter={value:0}; +THREE.ParticleBasicMaterial=function(a){this.color=new THREE.Color(16777215);this.map=null;this.opacity=1;this.blending=THREE.NormalBlending;this.offset=new THREE.Vector2;if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.map!==undefined)this.map=a.map;if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending}}; +THREE.ParticleBasicMaterial.prototype={toString:function(){return"THREE.ParticleBasicMaterial (
color: "+this.color+"
map: "+this.map+"
opacity: "+this.opacity+"
blending: "+this.blending+"
)"}};THREE.ParticleCircleMaterial=function(a){this.color=new THREE.Color(16777215);this.opacity=1;this.blending=THREE.NormalBlending;if(a){a.color!==undefined&&this.color.setHex(a.color);if(a.opacity!==undefined)this.opacity=a.opacity;if(a.blending!==undefined)this.blending=a.blending}}; +THREE.ParticleCircleMaterial.prototype={toString:function(){return"THREE.ParticleCircleMaterial (
color: "+this.color+"
opacity: "+this.opacity+"
blending: "+this.blending+"
)"}};THREE.ParticleDOMMaterial=function(a){this.domElement=a};THREE.ParticleDOMMaterial.prototype={toString:function(){return"THREE.ParticleDOMMaterial ( domElement: "+this.domElement+" )"}}; +THREE.Texture=function(a,c,d,e,g,h){this.image=a;this.mapping=c!==undefined?c:new THREE.UVMapping;this.wrap_s=d!==undefined?d:THREE.ClampToEdgeWrapping;this.wrap_t=e!==undefined?e:THREE.ClampToEdgeWrapping;this.mag_filter=g!==undefined?g:THREE.LinearFilter;this.min_filter=h!==undefined?h:THREE.LinearMipMapLinearFilter}; +THREE.Texture.prototype={clone:function(){return new THREE.Texture(this.image,this.mapping,this.wrap_s,this.wrap_t,this.mag_filter,this.min_filter)},toString:function(){return"THREE.Texture (
image: "+this.image+"
wrap_s: "+this.wrap_s+"
wrap_t: "+this.wrap_t+"
mag_filter: "+this.mag_filter+"
min_filter: "+this.min_filter+"
)"}};THREE.MultiplyOperation=0;THREE.MixOperation=1;THREE.RepeatWrapping=0;THREE.ClampToEdgeWrapping=1;THREE.MirroredRepeatWrapping=2; +THREE.NearestFilter=3;THREE.NearestMipMapNearestFilter=4;THREE.NearestMipMapLinearFilter=5;THREE.LinearFilter=6;THREE.LinearMipMapNearestFilter=7;THREE.LinearMipMapLinearFilter=8;THREE.ByteType=9;THREE.UnsignedByteType=10;THREE.ShortType=11;THREE.UnsignedShortType=12;THREE.IntType=13;THREE.UnsignedIntType=14;THREE.FloatType=15;THREE.AlphaFormat=16;THREE.RGBFormat=17;THREE.RGBAFormat=18;THREE.LuminanceFormat=19;THREE.LuminanceAlphaFormat=20; +THREE.RenderTarget=function(a,c,d){this.width=a;this.height=c;d=d||{};this.wrap_s=d.wrap_s!==undefined?d.wrap_s:THREE.ClampToEdgeWrapping;this.wrap_t=d.wrap_t!==undefined?d.wrap_t:THREE.ClampToEdgeWrapping;this.mag_filter=d.mag_filter!==undefined?d.mag_filter:THREE.LinearFilter;this.min_filter=d.min_filter!==undefined?d.min_filter:THREE.LinearMipMapLinearFilter;this.format=d.format!==undefined?d.format:THREE.RGBFormat;this.type=d.type!==undefined?d.type:THREE.UnsignedByteType}; +var Uniforms={clone:function(a){var c,d,e,g={};for(c in a){g[c]={};for(d in a[c]){e=a[c][d];g[c][d]=e instanceof THREE.Color||e instanceof THREE.Vector3||e instanceof THREE.Texture?e.clone():e}}return g},merge:function(a){var c,d,e,g={};for(c=0;c=0&&v>=0&&s>=0&&n>=0)return true;else if(t<0&&v<0||s<0&&n<0)return false;else{if(t<0)C=Math.max(C,t/(t-v));else if(v<0)m=Math.min(m,t/(t-v));if(s<0)C=Math.max(C,s/(s-n));else if(n<0)m=Math.min(m,s/(s-n));if(mt&&A.z0&&K.z<1){u=H[x]=H[x]||new THREE.RenderableParticle;u.x=K.x/K.w;u.y=K.y/K.w;u.z=K.z;u.rotation=G.rotation.z;u.scale.x=G.scale.x*Math.abs(u.x-(K.x+r.projectionMatrix.n11)/(K.w+r.projectionMatrix.n14)); +u.scale.y=G.scale.y*Math.abs(u.y-(K.y+r.projectionMatrix.n22)/(K.w+r.projectionMatrix.n24));u.materials=G.materials;m.push(u);x++}}}}C&&m.sort(a);return m};this.unprojectVector=function(l,r){var C=THREE.Matrix4.makeInvert(r.matrix);C.multiplySelf(THREE.Matrix4.makeInvert(r.projectionMatrix));C.multiplyVector3(l);return l}}; +THREE.DOMRenderer=function(){THREE.Renderer.call(this);var a=null,c=new THREE.Projector,d,e,g,h;this.domElement=document.createElement("div");this.setSize=function(o,b){d=o;e=b;g=d/2;h=e/2};this.render=function(o,b){var i,k,y,z,u,x,H,J;a=c.projectScene(o,b);i=0;for(k=a.length;i0){D.r+=ca.r*$;D.g+=ca.g*$;D.b+=ca.b*$}}else if($ instanceof THREE.PointLight){Y.sub($.position,X);Y.normalize();$=T.dot(Y)*ga;if($>0){D.r+=ca.r*$;D.g+=ca.g*$;D.b+=ca.b*$}}}}function Na(B,X,T){if(T.opacity!=0){a(T.opacity);c(T.blending);var D, +R,$,ca,ga,ia;if(T instanceof THREE.ParticleBasicMaterial){if(T.map){ca=T.map;ga=ca.width>>1;ia=ca.height>>1;R=X.scale.x*b;$=X.scale.y*i;T=R*ga;D=$*ia;w.set(B.x-T,B.y-D,B.x+T,B.y+D);if(V.instersects(w)){k.save();k.translate(B.x,B.y);k.rotate(-X.rotation);k.scale(R,-$);k.translate(-ga,-ia);k.drawImage(ca,0,0);k.restore()}}}else if(T instanceof THREE.ParticleCircleMaterial){if(M){Q.r=da.r+ba.r+Z.r;Q.g=da.g+ba.g+Z.g;Q.b=da.b+ba.b+Z.b;m.r=T.color.r*Q.r;m.g=T.color.g*Q.g;m.b=T.color.b*Q.b;m.updateStyleString()}else m.__styleString= +T.color.__styleString;T=X.scale.x*b;D=X.scale.y*i;w.set(B.x-T,B.y-D,B.x+T,B.y+D);if(V.instersects(w)){R=m.__styleString;if(J!=R)k.fillStyle=J=R;k.save();k.translate(B.x,B.y);k.rotate(-X.rotation);k.scale(T,D);k.beginPath();k.arc(0,0,1,0,ja,true);k.closePath();k.fill();k.restore()}}}}function Oa(B,X,T,D){if(D.opacity!=0){a(D.opacity);c(D.blending);k.beginPath();k.moveTo(B.positionScreen.x,B.positionScreen.y);k.lineTo(X.positionScreen.x,X.positionScreen.y);k.closePath();if(D instanceof THREE.LineBasicMaterial){m.__styleString= +D.color.__styleString;B=D.linewidth;if(K!=B)k.lineWidth=K=B;B=m.__styleString;if(H!=B)k.strokeStyle=H=B;k.stroke();w.inflate(D.linewidth*2)}}}function Ia(B,X,T,D,R,$){if(R.opacity!=0){a(R.opacity);c(R.blending);f=B.positionScreen.x;j=B.positionScreen.y;q=X.positionScreen.x;l=X.positionScreen.y;r=T.positionScreen.x;C=T.positionScreen.y;k.beginPath();k.moveTo(f,j);k.lineTo(q,l);k.lineTo(r,C);k.lineTo(f,j);k.closePath();if(R instanceof THREE.MeshBasicMaterial)if(R.map)R.map.image.loaded&&R.map.mapping instanceof +THREE.UVMapping&&xa(f,j,q,l,r,C,R.map.image,D.uvs[0].u,D.uvs[0].v,D.uvs[1].u,D.uvs[1].v,D.uvs[2].u,D.uvs[2].v);else if(R.env_map){if(R.env_map.image.loaded)if(R.env_map.mapping instanceof THREE.SphericalReflectionMapping){B=ra.matrix;Y.copy(D.vertexNormalsWorld[0]);N=(Y.x*B.n11+Y.y*B.n12+Y.z*B.n13)*0.5+0.5;G=-(Y.x*B.n21+Y.y*B.n22+Y.z*B.n23)*0.5+0.5;Y.copy(D.vertexNormalsWorld[1]);W=(Y.x*B.n11+Y.y*B.n12+Y.z*B.n13)*0.5+0.5;P=-(Y.x*B.n21+Y.y*B.n22+Y.z*B.n23)*0.5+0.5;Y.copy(D.vertexNormalsWorld[2]);I= +(Y.x*B.n11+Y.y*B.n12+Y.z*B.n13)*0.5+0.5;L=-(Y.x*B.n21+Y.y*B.n22+Y.z*B.n23)*0.5+0.5;xa(f,j,q,l,r,C,R.env_map.image,N,G,W,P,I,L)}}else R.wireframe?Ba(R.color.__styleString,R.wireframe_linewidth):Ca(R.color.__styleString);else if(R instanceof THREE.MeshLambertMaterial){if(R.map&&!R.wireframe){R.map.mapping instanceof THREE.UVMapping&&xa(f,j,q,l,r,C,R.map.image,D.uvs[0].u,D.uvs[0].v,D.uvs[1].u,D.uvs[1].v,D.uvs[2].u,D.uvs[2].v);c(THREE.SubtractiveBlending)}if(M)if(!R.wireframe&&R.shading==THREE.SmoothShading&& +D.vertexNormalsWorld.length==3){t.r=v.r=s.r=da.r;t.g=v.g=s.g=da.g;t.b=v.b=s.b=da.b;Aa($,D.v1.positionWorld,D.vertexNormalsWorld[0],t);Aa($,D.v2.positionWorld,D.vertexNormalsWorld[1],v);Aa($,D.v3.positionWorld,D.vertexNormalsWorld[2],s);n.r=(v.r+s.r)*0.5;n.g=(v.g+s.g)*0.5;n.b=(v.b+s.b)*0.5;O=Ja(t,v,s,n);xa(f,j,q,l,r,C,O,0,0,1,0,0,1)}else{Q.r=da.r;Q.g=da.g;Q.b=da.b;Aa($,D.centroidWorld,D.normalWorld,Q);m.r=R.color.r*Q.r;m.g=R.color.g*Q.g;m.b=R.color.b*Q.b;m.updateStyleString();R.wireframe?Ba(m.__styleString, +R.wireframe_linewidth):Ca(m.__styleString)}else R.wireframe?Ba(R.color.__styleString,R.wireframe_linewidth):Ca(R.color.__styleString)}else if(R instanceof THREE.MeshDepthMaterial){E=ra.near;A=ra.far;t.r=t.g=t.b=1-Ea(B.positionScreen.z,E,A);v.r=v.g=v.b=1-Ea(X.positionScreen.z,E,A);s.r=s.g=s.b=1-Ea(T.positionScreen.z,E,A);n.r=(v.r+s.r)*0.5;n.g=(v.g+s.g)*0.5;n.b=(v.b+s.b)*0.5;O=Ja(t,v,s,n);xa(f,j,q,l,r,C,O,0,0,1,0,0,1)}else if(R instanceof THREE.MeshNormalMaterial){m.r=Fa(D.normalWorld.x);m.g=Fa(D.normalWorld.y); +m.b=Fa(D.normalWorld.z);m.updateStyleString();R.wireframe?Ba(m.__styleString,R.wireframe_linewidth):Ca(m.__styleString)}}}function Ba(B,X){if(H!=B)k.strokeStyle=H=B;if(K!=X)k.lineWidth=K=X;k.stroke();w.inflate(X*2)}function Ca(B){if(J!=B)k.fillStyle=J=B;k.fill()}function xa(B,X,T,D,R,$,ca,ga,ia,na,la,oa,ya){var ta,pa;ta=ca.width-1;pa=ca.height-1;ga*=ta;ia*=pa;na*=ta;la*=pa;oa*=ta;ya*=pa;T-=B;D-=X;R-=B;$-=X;na-=ga;la-=ia;oa-=ga;ya-=ia;pa=1/(na*ya-oa*la);ta=(ya*T-la*R)*pa;la=(ya*D-la*$)*pa;T=(na*R- +oa*T)*pa;D=(na*$-oa*D)*pa;B=B-ta*ga-T*ia;X=X-la*ga-D*ia;k.save();k.transform(ta,la,T,D,B,X);k.clip();k.drawImage(ca,0,0);k.restore()}function Ja(B,X,T,D){var R=~~(B.r*255),$=~~(B.g*255);B=~~(B.b*255);var ca=~~(X.r*255),ga=~~(X.g*255);X=~~(X.b*255);var ia=~~(T.r*255),na=~~(T.g*255);T=~~(T.b*255);var la=~~(D.r*255),oa=~~(D.g*255);D=~~(D.b*255);ha[0]=R<0?0:R>255?255:R;ha[1]=$<0?0:$>255?255:$;ha[2]=B<0?0:B>255?255:B;ha[4]=ca<0?0:ca>255?255:ca;ha[5]=ga<0?0:ga>255?255:ga;ha[6]=X<0?0:X>255?255:X;ha[8]=ia< +0?0:ia>255?255:ia;ha[9]=na<0?0:na>255?255:na;ha[10]=T<0?0:T>255?255:T;ha[12]=la<0?0:la>255?255:la;ha[13]=oa<0?0:oa>255?255:oa;ha[14]=D<0?0:D>255?255:D;ka.putImageData(fa,0,0);ua.drawImage(qa,0,0);return sa}function Ea(B,X,T){B=(B-X)/(T-X);return B*B*(3-2*B)}function Fa(B){B=(B+1)*0.5;return B<0?0:B>1?1:B}function Ga(B,X){var T=X.x-B.x,D=X.y-B.y,R=1/Math.sqrt(T*T+D*D);T*=R;D*=R;X.x+=T;X.y+=D;B.x-=T;B.y-=D}var Da,Ka,aa,ma,wa,Ha,La,za;k.setTransform(1,0,0,-1,b,i);this.autoClear&&this.clear();d=e.projectScene(ea, +ra,this.sortElements);(M=ea.lights.length>0)&&Ma(ea);Da=0;for(Ka=d.length;Da0){W.r+=L.color.r*V;W.g+=L.color.g*V;W.b+=L.color.b*V}}else if(L instanceof THREE.PointLight){C.sub(L.position,G.centroidWorld);C.normalize();V=G.normalWorld.dot(C)*L.intensity;if(V>0){W.r+=L.color.r*V;W.g+=L.color.g*V;W.b+=L.color.b*V}}}}function c(N,G,W,P,I,L){s=e(n++);s.setAttribute("d","M "+N.positionScreen.x+ +" "+N.positionScreen.y+" L "+G.positionScreen.x+" "+G.positionScreen.y+" L "+W.positionScreen.x+","+W.positionScreen.y+"z");if(I instanceof THREE.MeshBasicMaterial)F.__styleString=I.color.__styleString;else if(I instanceof THREE.MeshLambertMaterial)if(U){f.r=j.r;f.g=j.g;f.b=j.b;a(L,P,f);F.r=I.color.r*f.r;F.g=I.color.g*f.g;F.b=I.color.b*f.b;F.updateStyleString()}else F.__styleString=I.color.__styleString;else if(I instanceof THREE.MeshDepthMaterial){r=1-I.__2near/(I.__farPlusNear-P.z*I.__farMinusNear); +F.setRGB(r,r,r)}else I instanceof THREE.MeshNormalMaterial&&F.setRGB(g(P.normalWorld.x),g(P.normalWorld.y),g(P.normalWorld.z));I.wireframe?s.setAttribute("style","fill: none; stroke: "+F.__styleString+"; stroke-width: "+I.wireframe_linewidth+"; stroke-opacity: "+I.opacity+"; stroke-linecap: "+I.wireframe_linecap+"; stroke-linejoin: "+I.wireframe_linejoin):s.setAttribute("style","fill: "+F.__styleString+"; fill-opacity: "+I.opacity);b.appendChild(s)}function d(N,G,W,P,I,L,V){s=e(n++);s.setAttribute("d", +"M "+N.positionScreen.x+" "+N.positionScreen.y+" L "+G.positionScreen.x+" "+G.positionScreen.y+" L "+W.positionScreen.x+","+W.positionScreen.y+" L "+P.positionScreen.x+","+P.positionScreen.y+"z");if(L instanceof THREE.MeshBasicMaterial)F.__styleString=L.color.__styleString;else if(L instanceof THREE.MeshLambertMaterial)if(U){f.r=j.r;f.g=j.g;f.b=j.b;a(V,I,f);F.r=L.color.r*f.r;F.g=L.color.g*f.g;F.b=L.color.b*f.b;F.updateStyleString()}else F.__styleString=L.color.__styleString;else if(L instanceof THREE.MeshDepthMaterial){r= +1-L.__2near/(L.__farPlusNear-I.z*L.__farMinusNear);F.setRGB(r,r,r)}else L instanceof THREE.MeshNormalMaterial&&F.setRGB(g(I.normalWorld.x),g(I.normalWorld.y),g(I.normalWorld.z));L.wireframe?s.setAttribute("style","fill: none; stroke: "+F.__styleString+"; stroke-width: "+L.wireframe_linewidth+"; stroke-opacity: "+L.opacity+"; stroke-linecap: "+L.wireframe_linecap+"; stroke-linejoin: "+L.wireframe_linejoin):s.setAttribute("style","fill: "+F.__styleString+"; fill-opacity: "+L.opacity);b.appendChild(s)} +function e(N){if(m[N]==null){m[N]=document.createElementNS("http://www.w3.org/2000/svg","path");O==0&&m[N].setAttribute("shape-rendering","crispEdges");return m[N]}return m[N]}function g(N){return N<0?Math.min((1+N)*0.5,0.5):0.5+Math.min(N*0.5,0.5)}var h=null,o=new THREE.Projector,b=document.createElementNS("http://www.w3.org/2000/svg","svg"),i,k,y,z,u,x,H,J,K=new THREE.Rectangle,p=new THREE.Rectangle,U=false,F=new THREE.Color(16777215),f=new THREE.Color(16777215),j=new THREE.Color(0),q=new THREE.Color(0), +l=new THREE.Color(0),r,C=new THREE.Vector3,m=[],t=[],v=[],s,n,E,A,O=1;this.domElement=b;this.sortElements=this.sortObjects=this.autoClear=true;this.setQuality=function(N){switch(N){case "high":O=1;break;case "low":O=0}};this.setSize=function(N,G){i=N;k=G;y=i/2;z=k/2;b.setAttribute("viewBox",-y+" "+-z+" "+i+" "+k);b.setAttribute("width",i);b.setAttribute("height",k);K.set(-y,-z,y,z)};this.clear=function(){for(;b.childNodes.length>0;)b.removeChild(b.childNodes[0])};this.render=function(N,G){var W,P, +I,L,V,S,w,M;this.autoClear&&this.clear();h=o.projectScene(N,G,this.sortElements);A=E=n=0;if(U=N.lights.length>0){w=N.lights;j.setRGB(0,0,0);q.setRGB(0,0,0);l.setRGB(0,0,0);W=0;for(P=w.length;W0){b.bindBuffer(b.ARRAY_BUFFER,f.__webGLUVBuffer);b.bufferData(b.ARRAY_BUFFER,da,q)}if(r){b.bindBuffer(b.ELEMENT_ARRAY_BUFFER, +f.__webGLFaceBuffer);b.bufferData(b.ELEMENT_ARRAY_BUFFER,ja,q);b.bindBuffer(b.ELEMENT_ARRAY_BUFFER,f.__webGLLineBuffer);b.bufferData(b.ELEMENT_ARRAY_BUFFER,Y,q)}};this.setLineBuffers=function(f,j,q,l){var r,C,m=f.vertices,t=m.length,v=f.__vertexArray,s=f.__lineArray;if(q)for(q=0;q0?"#define VERTEX_TEXTURES":"","#define MAX_DIR_LIGHTS "+s.maxDirLights,"#define MAX_POINT_LIGHTS "+s.maxPointLights, +s.map?"#define USE_MAP":"",s.env_map?"#define USE_ENVMAP":"","uniform mat4 objectMatrix;\nuniform mat4 modelViewMatrix;\nuniform mat4 projectionMatrix;\nuniform mat4 viewMatrix;\nuniform mat3 normalMatrix;\nuniform vec3 cameraPosition;\nattribute vec3 position;\nattribute vec3 normal;\nattribute vec2 uv;\n"].join("\n");b.attachShader(E,g("fragment",A+t));b.attachShader(E,g("vertex",s+n));b.linkProgram(E);b.getProgramParameter(E,b.LINK_STATUS)||alert("Could not initialise shaders\nVALIDATE_STATUS: "+ +b.getProgramParameter(E,b.VALIDATE_STATUS)+", gl error ["+b.getError()+"]");E.uniforms={};E.attributes={};l.program=E;t=["viewMatrix","modelViewMatrix","projectionMatrix","normalMatrix","objectMatrix","cameraPosition"];for(m in l.uniforms)t.push(m);m=l.program;n=0;for(E=t.length;n=0){b.bindBuffer(b.ARRAY_BUFFER,r.__webGLNormalBuffer);b.vertexAttribPointer(v.normal,3,b.FLOAT,false,0,0);b.enableVertexAttribArray(v.normal)}if(v.tangent>=0){b.bindBuffer(b.ARRAY_BUFFER,r.__webGLTangentBuffer); +b.vertexAttribPointer(v.tangent,4,b.FLOAT,false,0,0);b.enableVertexAttribArray(v.tangent)}if(v.uv>=0)if(r.__webGLUVBuffer){b.bindBuffer(b.ARRAY_BUFFER,r.__webGLUVBuffer);b.vertexAttribPointer(v.uv,2,b.FLOAT,false,0,0);b.enableVertexAttribArray(v.uv)}else b.disableVertexAttribArray(v.uv);if(l.wireframe||l instanceof THREE.LineBasicMaterial){v=l.wireframe_linewidth!==undefined?l.wireframe_linewidth:l.linewidth!==undefined?l.linewidth:1;l=l instanceof THREE.LineBasicMaterial&&C.type==THREE.LineStrip? +b.LINE_STRIP:b.LINES;b.lineWidth(v);b.bindBuffer(b.ELEMENT_ARRAY_BUFFER,r.__webGLLineBuffer);b.drawElements(l,r.__webGLLineCount,b.UNSIGNED_SHORT,0)}else{b.bindBuffer(b.ELEMENT_ARRAY_BUFFER,r.__webGLFaceBuffer);b.drawElements(b.TRIANGLES,r.__webGLFaceCount,b.UNSIGNED_SHORT,0)}};this.renderPass=function(f,j,q,l,r,C,m){var t,v,s,n,E;s=0;for(n=l.materials.length;s=0;q--){l=f.__webGLObjects[q].object;j==l&&f.__webGLObjects.splice(q,1)}};this.setupMatrices=function(f,j){f.autoUpdateMatrix&& +f.updateMatrix();y.multiply(j.matrix,f.matrix);x.set(y.flatten());z=THREE.Matrix4.makeInvert3x3(y).transpose();J.set(z.m);K.set(f.matrix.flatten())};this.loadMatrices=function(f){b.uniformMatrix4fv(f.uniforms.viewMatrix,false,u);b.uniformMatrix4fv(f.uniforms.modelViewMatrix,false,x);b.uniformMatrix4fv(f.uniforms.projectionMatrix,false,H);b.uniformMatrix3fv(f.uniforms.normalMatrix,false,J);b.uniformMatrix4fv(f.uniforms.objectMatrix,false,K)};this.loadCamera=function(f,j){b.uniform3f(f.uniforms.cameraPosition, +j.position.x,j.position.y,j.position.z)};this.setBlending=function(f){switch(f){case THREE.AdditiveBlending:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE);break;case THREE.SubtractiveBlending:b.blendFunc(b.DST_COLOR,b.ZERO);break;default:b.blendEquation(b.FUNC_ADD);b.blendFunc(b.ONE,b.ONE_MINUS_SRC_ALPHA)}};this.setFaceCulling=function(f,j){if(f){!j||j=="ccw"?b.frontFace(b.CCW):b.frontFace(b.CW);if(f=="back")b.cullFace(b.BACK);else f=="front"?b.cullFace(b.FRONT):b.cullFace(b.FRONT_AND_BACK); +b.enable(b.CULL_FACE)}else b.disable(b.CULL_FACE)};this.supportsVertexTextures=function(){return b.getParameter(b.MAX_VERTEX_TEXTURE_IMAGE_UNITS)>0}}; +THREE.Snippets={fog_pars_fragment:"#ifdef USE_FOG\nuniform vec3 fogColor;\n#ifdef FOG_EXP2\nuniform float fogDensity;\n#else\nuniform float fogNear;\nuniform float fogFar;\n#endif\n#endif",fog_fragment:"#ifdef USE_FOG\nfloat depth = gl_FragCoord.z / gl_FragCoord.w;\n#ifdef FOG_EXP2\nconst float LOG2 = 1.442695;\nfloat fogFactor = exp2( - fogDensity * fogDensity * depth * depth * LOG2 );\nfogFactor = 1.0 - clamp( fogFactor, 0.0, 1.0 );\n#else\nfloat fogFactor = smoothstep( fogNear, fogFar, depth );\n#endif\ngl_FragColor = mix( gl_FragColor, vec4( fogColor, 1.0 ), fogFactor );\n#endif",envmap_pars_fragment:"#ifdef USE_ENVMAP\nvarying vec3 vReflect;\nuniform float reflectivity;\nuniform samplerCube env_map;\nuniform int combine;\n#endif", +envmap_fragment:"#ifdef USE_ENVMAP\ncubeColor = textureCube( env_map, vec3( -vReflect.x, vReflect.yz ) );\nif ( combine == 1 ) {\ngl_FragColor = mix( gl_FragColor, cubeColor, reflectivity );\n} else {\ngl_FragColor = gl_FragColor * cubeColor;\n}\n#endif",envmap_pars_vertex:"#ifdef USE_ENVMAP\nvarying vec3 vReflect;\nuniform float refraction_ratio;\nuniform bool useRefract;\n#endif",envmap_vertex:"#ifdef USE_ENVMAP\nvec4 mPosition = objectMatrix * vec4( position, 1.0 );\nvec3 nWorld = mat3( objectMatrix[0].xyz, objectMatrix[1].xyz, objectMatrix[2].xyz ) * normal;\nif ( useRefract ) {\nvReflect = refract( normalize( mPosition.xyz - cameraPosition ), normalize( nWorld.xyz ), refraction_ratio );\n} else {\nvReflect = reflect( normalize( mPosition.xyz - cameraPosition ), normalize( nWorld.xyz ) );\n}\n#endif", +map_pars_fragment:"#ifdef USE_MAP\nvarying vec2 vUv;\nuniform sampler2D map;\n#endif",map_pars_vertex:"#ifdef USE_MAP\nvarying vec2 vUv;\n#endif",map_fragment:"#ifdef USE_MAP\nmapColor = texture2D( map, vUv );\n#endif",map_vertex:"#ifdef USE_MAP\nvUv = uv;\n#endif",lights_pars_vertex:"uniform bool enableLighting;\nuniform vec3 ambientLightColor;\n#if MAX_DIR_LIGHTS > 0\nuniform vec3 directionalLightColor[ MAX_DIR_LIGHTS ];\nuniform vec3 directionalLightDirection[ MAX_DIR_LIGHTS ];\n#endif\n#if MAX_POINT_LIGHTS > 0\nuniform vec3 pointLightColor[ MAX_POINT_LIGHTS ];\nuniform vec3 pointLightPosition[ MAX_POINT_LIGHTS ];\n#ifdef PHONG\nvarying vec3 vPointLightVector[ MAX_POINT_LIGHTS ];\n#endif\n#endif", +lights_vertex:"if ( !enableLighting ) {\nvLightWeighting = vec3( 1.0 );\n} else {\nvLightWeighting = ambientLightColor;\n#if MAX_DIR_LIGHTS > 0\nfor( int i = 0; i < MAX_DIR_LIGHTS; i++ ) {\nvec4 lDirection = viewMatrix * vec4( directionalLightDirection[ i ], 0.0 );\nfloat directionalLightWeighting = max( dot( transformedNormal, normalize( lDirection.xyz ) ), 0.0 );\nvLightWeighting += directionalLightColor[ i ] * directionalLightWeighting;\n}\n#endif\n#if MAX_POINT_LIGHTS > 0\nfor( int i = 0; i < MAX_POINT_LIGHTS; i++ ) {\nvec4 lPosition = viewMatrix * vec4( pointLightPosition[ i ], 1.0 );\nvec3 pointLightVector = normalize( lPosition.xyz - mvPosition.xyz );\nfloat pointLightWeighting = max( dot( transformedNormal, pointLightVector ), 0.0 );\nvLightWeighting += pointLightColor[ i ] * pointLightWeighting;\n#ifdef PHONG\nvPointLightVector[ i ] = pointLightVector;\n#endif\n}\n#endif\n}", +lights_pars_fragment:"#if MAX_DIR_LIGHTS > 0\nuniform vec3 directionalLightDirection[ MAX_DIR_LIGHTS ];\n#endif\n#if MAX_POINT_LIGHTS > 0\nvarying vec3 vPointLightVector[ MAX_POINT_LIGHTS ];\n#endif\nvarying vec3 vViewPosition;\nvarying vec3 vNormal;",lights_fragment:"vec3 normal = normalize( vNormal );\nvec3 viewPosition = normalize( vViewPosition );\nvec4 mSpecular = vec4( specular, opacity );\n#if MAX_POINT_LIGHTS > 0\nvec4 pointDiffuse = vec4( 0.0 );\nvec4 pointSpecular = vec4( 0.0 );\nfor( int i = 0; i < MAX_POINT_LIGHTS; i++ ) {\nvec3 pointVector = normalize( vPointLightVector[ i ] );\nvec3 pointHalfVector = normalize( vPointLightVector[ i ] + vViewPosition );\nfloat pointDotNormalHalf = dot( normal, pointHalfVector );\nfloat pointDiffuseWeight = max( dot( normal, pointVector ), 0.0 );\nfloat pointSpecularWeight = 0.0;\nif ( pointDotNormalHalf >= 0.0 )\npointSpecularWeight = pow( pointDotNormalHalf, shininess );\npointDiffuse += mColor * pointDiffuseWeight;\npointSpecular += mSpecular * pointSpecularWeight;\n}\n#endif\n#if MAX_DIR_LIGHTS > 0\nvec4 dirDiffuse = vec4( 0.0 );\nvec4 dirSpecular = vec4( 0.0 );\nfor( int i = 0; i < MAX_DIR_LIGHTS; i++ ) {\nvec4 lDirection = viewMatrix * vec4( directionalLightDirection[ i ], 0.0 );\nvec3 dirVector = normalize( lDirection.xyz );\nvec3 dirHalfVector = normalize( lDirection.xyz + vViewPosition );\nfloat dirDotNormalHalf = dot( normal, dirHalfVector );\nfloat dirDiffuseWeight = max( dot( normal, dirVector ), 0.0 );\nfloat dirSpecularWeight = 0.0;\nif ( dirDotNormalHalf >= 0.0 )\ndirSpecularWeight = pow( dirDotNormalHalf, shininess );\ndirDiffuse += mColor * dirDiffuseWeight;\ndirSpecular += mSpecular * dirSpecularWeight;\n}\n#endif\nvec4 totalLight = vec4( ambient, opacity );\n#if MAX_DIR_LIGHTS > 0\ntotalLight += dirDiffuse + dirSpecular;\n#endif\n#if MAX_POINT_LIGHTS > 0\ntotalLight += pointDiffuse + pointSpecular;\n#endif"}; +THREE.UniformsLib={common:{color:{type:"c",value:new THREE.Color(15658734)},opacity:{type:"f",value:1},map:{type:"t",value:0,texture:null},env_map:{type:"t",value:1,texture:null},useRefract:{type:"i",value:0},reflectivity:{type:"f",value:1},refraction_ratio:{type:"f",value:0.98},combine:{type:"i",value:0},fogDensity:{type:"f",value:2.5E-4},fogNear:{type:"f",value:1},fogFar:{type:"f",value:2E3},fogColor:{type:"c",value:new THREE.Color(16777215)}},lights:{enableLighting:{type:"i",value:1},ambientLightColor:{type:"fv", +value:[]},directionalLightDirection:{type:"fv",value:[]},directionalLightColor:{type:"fv",value:[]},pointLightPosition:{type:"fv",value:[]},pointLightColor:{type:"fv",value:[]}}}; +THREE.ShaderLib={depth:{uniforms:{mNear:{type:"f",value:1},mFar:{type:"f",value:2E3}},fragment_shader:"uniform float mNear;\nuniform float mFar;\nvoid main() {\nfloat depth = gl_FragCoord.z / gl_FragCoord.w;\nfloat color = 1.0 - smoothstep( mNear, mFar, depth );\ngl_FragColor = vec4( vec3( color ), 1.0 );\n}",vertex_shader:"void main() {\ngl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );\n}"},normal:{uniforms:{},fragment_shader:"varying vec3 vNormal;\nvoid main() {\ngl_FragColor = vec4( 0.5 * normalize( vNormal ) + 0.5, 1.0 );\n}", +vertex_shader:"varying vec3 vNormal;\nvoid main() {\nvec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );\nvNormal = normalize( normalMatrix * normal );\ngl_Position = projectionMatrix * mvPosition;\n}"},basic:{uniforms:THREE.UniformsLib.common,fragment_shader:["uniform vec3 color;\nuniform float opacity;",THREE.Snippets.map_pars_fragment,THREE.Snippets.envmap_pars_fragment,THREE.Snippets.fog_pars_fragment,"void main() {\nvec4 mColor = vec4( color, opacity );\nvec4 mapColor = vec4( 1.0 );\nvec4 cubeColor = vec4( 1.0 );", +THREE.Snippets.map_fragment,"gl_FragColor = mColor * mapColor;",THREE.Snippets.envmap_fragment,THREE.Snippets.fog_fragment,"}"].join("\n"),vertex_shader:[THREE.Snippets.map_pars_vertex,THREE.Snippets.envmap_pars_vertex,"void main() {\nvec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",THREE.Snippets.map_vertex,THREE.Snippets.envmap_vertex,"gl_Position = projectionMatrix * mvPosition;\n}"].join("\n")},lambert:{uniforms:Uniforms.merge([THREE.UniformsLib.common,THREE.UniformsLib.lights]),fragment_shader:["uniform vec3 color;\nuniform float opacity;\nvarying vec3 vLightWeighting;", +THREE.Snippets.map_pars_fragment,THREE.Snippets.envmap_pars_fragment,THREE.Snippets.fog_pars_fragment,"void main() {\nvec4 mColor = vec4( color, opacity );\nvec4 mapColor = vec4( 1.0 );\nvec4 cubeColor = vec4( 1.0 );",THREE.Snippets.map_fragment,"gl_FragColor = mColor * mapColor * vec4( vLightWeighting, 1.0 );",THREE.Snippets.envmap_fragment,THREE.Snippets.fog_fragment,"}"].join("\n"),vertex_shader:["varying vec3 vLightWeighting;",THREE.Snippets.map_pars_vertex,THREE.Snippets.envmap_pars_vertex, +THREE.Snippets.lights_pars_vertex,"void main() {\nvec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",THREE.Snippets.map_vertex,THREE.Snippets.envmap_vertex,"vec3 transformedNormal = normalize( normalMatrix * normal );",THREE.Snippets.lights_vertex,"gl_Position = projectionMatrix * mvPosition;\n}"].join("\n")},phong:{uniforms:Uniforms.merge([THREE.UniformsLib.common,THREE.UniformsLib.lights,{ambient:{type:"c",value:new THREE.Color(328965)},specular:{type:"c",value:new THREE.Color(1118481)}, +shininess:{type:"f",value:30}}]),fragment_shader:["uniform vec3 color;\nuniform float opacity;\nuniform vec3 ambient;\nuniform vec3 specular;\nuniform float shininess;\nvarying vec3 vLightWeighting;",THREE.Snippets.map_pars_fragment,THREE.Snippets.envmap_pars_fragment,THREE.Snippets.fog_pars_fragment,THREE.Snippets.lights_pars_fragment,"void main() {\nvec4 mColor = vec4( color, opacity );\nvec4 mapColor = vec4( 1.0 );\nvec4 cubeColor = vec4( 1.0 );",THREE.Snippets.map_fragment,THREE.Snippets.lights_fragment, +"gl_FragColor = mapColor * totalLight * vec4( vLightWeighting, 1.0 );",THREE.Snippets.envmap_fragment,THREE.Snippets.fog_fragment,"}"].join("\n"),vertex_shader:["#define PHONG\nvarying vec3 vLightWeighting;\nvarying vec3 vViewPosition;\nvarying vec3 vNormal;",THREE.Snippets.map_pars_vertex,THREE.Snippets.envmap_pars_vertex,THREE.Snippets.lights_pars_vertex,"void main() {\nvec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",THREE.Snippets.map_vertex,THREE.Snippets.envmap_vertex,"#ifndef USE_ENVMAP\nvec4 mPosition = objectMatrix * vec4( position, 1.0 );\n#endif\nvViewPosition = cameraPosition - mPosition.xyz;\nvec3 transformedNormal = normalize( normalMatrix * normal );\nvNormal = transformedNormal;", +THREE.Snippets.lights_vertex,"gl_Position = projectionMatrix * mvPosition;\n}"].join("\n")}};THREE.RenderableObject=function(){this.z=this.object=null};THREE.RenderableFace3=function(){this.z=null;this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.v3=new THREE.Vertex;this.centroidWorld=new THREE.Vector3;this.centroidScreen=new THREE.Vector3;this.normalWorld=new THREE.Vector3;this.vertexNormalsWorld=[];this.faceMaterials=this.meshMaterials=null;this.overdraw=false;this.uvs=[null,null,null]}; +THREE.RenderableParticle=function(){this.rotation=this.z=this.y=this.x=null;this.scale=new THREE.Vector2;this.materials=null};THREE.RenderableLine=function(){this.z=null;this.v1=new THREE.Vertex;this.v2=new THREE.Vertex;this.materials=null}; diff --git a/mediagoblin/static/js/thingiview.js/binaryReader.js b/mediagoblin/static/js/thingiview.js/binaryReader.js new file mode 100644 index 00000000..f99a2379 --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/binaryReader.js @@ -0,0 +1,126 @@ +// BinaryReader +// Refactored by Vjeux +// http://blog.vjeux.com/2010/javascript/javascript-binary-reader.html + +// Original +//+ Jonas Raoni Soares Silva +//@ http://jsfromhell.com/classes/binary-parser [rev. #1] + +BinaryReader = function (data) { + this._buffer = data; + this._pos = 0; +}; + +BinaryReader.prototype = { + + /* Public */ + + readInt8: function (){ return this._decodeInt(8, true); }, + readUInt8: function (){ return this._decodeInt(8, false); }, + readInt16: function (){ return this._decodeInt(16, true); }, + readUInt16: function (){ return this._decodeInt(16, false); }, + readInt32: function (){ return this._decodeInt(32, true); }, + readUInt32: function (){ return this._decodeInt(32, false); }, + + readFloat: function (){ return this._decodeFloat(23, 8); }, + readDouble: function (){ return this._decodeFloat(52, 11); }, + + readChar: function () { return this.readString(1); }, + readString: function (length) { + this._checkSize(length * 8); + var result = this._buffer.substr(this._pos, length); + this._pos += length; + return result; + }, + + seek: function (pos) { + this._pos = pos; + this._checkSize(0); + }, + + getPosition: function () { + return this._pos; + }, + + getSize: function () { + return this._buffer.length; + }, + + + /* Private */ + + _decodeFloat: function(precisionBits, exponentBits){ + var length = precisionBits + exponentBits + 1; + var size = length >> 3; + this._checkSize(length); + + var bias = Math.pow(2, exponentBits - 1) - 1; + var signal = this._readBits(precisionBits + exponentBits, 1, size); + var exponent = this._readBits(precisionBits, exponentBits, size); + var significand = 0; + var divisor = 2; + // var curByte = length + (-precisionBits >> 3) - 1; + var curByte = 0; + do { + var byteValue = this._readByte(++curByte, size); + var startBit = precisionBits % 8 || 8; + var mask = 1 << startBit; + while (mask >>= 1) { + if (byteValue & mask) { + significand += 1 / divisor; + } + divisor *= 2; + } + } while (precisionBits -= startBit); + + this._pos += size; + + return exponent == (bias << 1) + 1 ? significand ? NaN : signal ? -Infinity : +Infinity + : (1 + signal * -2) * (exponent || significand ? !exponent ? Math.pow(2, -bias + 1) * significand + : Math.pow(2, exponent - bias) * (1 + significand) : 0); + }, + + _decodeInt: function(bits, signed){ + var x = this._readBits(0, bits, bits / 8), max = Math.pow(2, bits); + var result = signed && x >= max / 2 ? x - max : x; + + this._pos += bits / 8; + return result; + }, + + //shl fix: Henri Torgemane ~1996 (compressed by Jonas Raoni) + _shl: function (a, b){ + for (++b; --b; a = ((a %= 0x7fffffff + 1) & 0x40000000) == 0x40000000 ? a * 2 : (a - 0x40000000) * 2 + 0x7fffffff + 1); + return a; + }, + + _readByte: function (i, size) { + return this._buffer.charCodeAt(this._pos + size - i - 1) & 0xff; + }, + + _readBits: function (start, length, size) { + var offsetLeft = (start + length) % 8; + var offsetRight = start % 8; + var curByte = size - (start >> 3) - 1; + var lastByte = size + (-(start + length) >> 3); + var diff = curByte - lastByte; + + var sum = (this._readByte(curByte, size) >> offsetRight) & ((1 << (diff ? 8 - offsetRight : length)) - 1); + + if (diff && offsetLeft) { + sum += (this._readByte(lastByte++, size) & ((1 << offsetLeft) - 1)) << (diff-- << 3) - offsetRight; + } + + while (diff) { + sum += this._shl(this._readByte(lastByte++, size), (diff-- << 3) - offsetRight); + } + + return sum; + }, + + _checkSize: function (neededBits) { + if (!(this._pos + Math.ceil(neededBits / 8) < this._buffer.length)) { + throw new Error("Index out of bound"); + } + } +}; \ No newline at end of file diff --git a/mediagoblin/static/js/thingiview.js/plane.js b/mediagoblin/static/js/thingiview.js/plane.js new file mode 100644 index 00000000..9f970be0 --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/plane.js @@ -0,0 +1,62 @@ +/** + * @author mr.doob / http://mrdoob.com/ + * based on http://papervision3d.googlecode.com/svn/trunk/as3/trunk/src/org/papervision3d/objects/primitives/Plane.as + */ + +var Plane = function ( width, height, segments_width, segments_height ) { + + THREE.Geometry.call( this ); + + var ix, iy, + width_half = width / 2, + height_half = height / 2, + gridX = segments_width || 1, + gridY = segments_height || 1, + gridX1 = gridX + 1, + gridY1 = gridY + 1, + segment_width = width / gridX, + segment_height = height / gridY; + + + for( iy = 0; iy < gridY1; iy++ ) { + + for( ix = 0; ix < gridX1; ix++ ) { + + var x = ix * segment_width - width_half; + var y = iy * segment_height - height_half; + + this.vertices.push( new THREE.Vertex( new THREE.Vector3( x, - y, 0 ) ) ); + + } + + } + + for( iy = 0; iy < gridY; iy++ ) { + + for( ix = 0; ix < gridX; ix++ ) { + + var a = ix + gridX1 * iy; + var b = ix + gridX1 * ( iy + 1 ); + var c = ( ix + 1 ) + gridX1 * ( iy + 1 ); + var d = ( ix + 1 ) + gridX1 * iy; + + this.faces.push( new THREE.Face4( a, b, c, d ) ); + this.uvs.push( [ + new THREE.UV( ix / gridX, iy / gridY ), + new THREE.UV( ix / gridX, ( iy + 1 ) / gridY ), + new THREE.UV( ( ix + 1 ) / gridX, ( iy + 1 ) / gridY ), + new THREE.UV( ( ix + 1 ) / gridX, iy / gridY ) + ] ); + + } + + } + + this.computeCentroids(); + this.computeFaceNormals(); + this.sortFacesByMaterial(); + +}; + +Plane.prototype = new THREE.Geometry(); +Plane.prototype.constructor = Plane; diff --git a/mediagoblin/static/js/thingiview.js/stats.js b/mediagoblin/static/js/thingiview.js/stats.js new file mode 100644 index 00000000..270d1ce3 --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/stats.js @@ -0,0 +1,2 @@ +// stats.js r5 - http://github.com/mrdoob/stats.js +var Stats=function(){var j=0,u=2,r,C=0,E=new Date().getTime(),w=E,f=E,m=0,e=1000,i=0,F,q,c,d,B,k=0,G=1000,a=0,A,t,p,D,l,v=0,o=1000,s=0,h,n,z,g,b,y={fps:{bg:{r:16,g:16,b:48},fg:{r:0,g:255,b:255}},ms:{bg:{r:16,g:48,b:16},fg:{r:0,g:255,b:0}},mem:{bg:{r:48,g:16,b:26},fg:{r:255,g:0,b:128}}};r=document.createElement("div");r.style.fontFamily="Helvetica, Arial, sans-serif";r.style.textAlign="left";r.style.fontSize="9px";r.style.opacity="0.9";r.style.width="80px";r.style.cursor="pointer";r.addEventListener("click",H,false);F=document.createElement("div");F.style.backgroundColor="rgb("+Math.floor(y.fps.bg.r/2)+","+Math.floor(y.fps.bg.g/2)+","+Math.floor(y.fps.bg.b/2)+")";F.style.padding="2px 0px 3px 0px";r.appendChild(F);q=document.createElement("div");q.innerHTML="FPS";q.style.color="rgb("+y.fps.fg.r+","+y.fps.fg.g+","+y.fps.fg.b+")";q.style.margin="0px 0px 1px 3px";F.appendChild(q);c=document.createElement("canvas");c.width=74;c.height=30;c.style.display="block";c.style.marginLeft="3px";F.appendChild(c);d=c.getContext("2d");d.fillStyle="rgb("+y.fps.bg.r+","+y.fps.bg.g+","+y.fps.bg.b+")";d.fillRect(0,0,c.width,c.height);B=d.getImageData(0,0,c.width,c.height);A=document.createElement("div");A.style.backgroundColor="rgb("+Math.floor(y.ms.bg.r/2)+","+Math.floor(y.ms.bg.g/2)+","+Math.floor(y.ms.bg.b/2)+")";A.style.padding="2px 0px 3px 0px";A.style.display="none";r.appendChild(A);t=document.createElement("div");t.innerHTML="MS";t.style.color="rgb("+y.ms.fg.r+","+y.ms.fg.g+","+y.ms.fg.b+")";t.style.margin="0px 0px 1px 3px";A.appendChild(t);p=document.createElement("canvas");p.width=74;p.height=30;p.style.display="block";p.style.marginLeft="3px";A.appendChild(p);D=p.getContext("2d");D.fillStyle="rgb("+y.ms.bg.r+","+y.ms.bg.g+","+y.ms.bg.b+")";D.fillRect(0,0,p.width,p.height);l=D.getImageData(0,0,p.width,p.height);try{if(webkitPerformance&&webkitPerformance.memory.totalJSHeapSize){u=3}}catch(x){}h=document.createElement("div");h.style.backgroundColor="rgb("+Math.floor(y.mem.bg.r/2)+","+Math.floor(y.mem.bg.g/2)+","+Math.floor(y.mem.bg.b/2)+")";h.style.padding="2px 0px 3px 0px";h.style.display="none";r.appendChild(h);n=document.createElement("div");n.innerHTML="MEM";n.style.color="rgb("+y.mem.fg.r+","+y.mem.fg.g+","+y.mem.fg.b+")";n.style.margin="0px 0px 1px 3px";h.appendChild(n);z=document.createElement("canvas");z.width=74;z.height=30;z.style.display="block";z.style.marginLeft="3px";h.appendChild(z);g=z.getContext("2d");g.fillStyle="#301010";g.fillRect(0,0,z.width,z.height);b=g.getImageData(0,0,z.width,z.height);function I(N,M,K){var J,O,L;for(O=0;O<30;O++){for(J=0;J<73;J++){L=(J+O*74)*4;N[L]=N[L+4];N[L+1]=N[L+5];N[L+2]=N[L+6]}}for(O=0;O<30;O++){L=(73+O*74)*4;if(O"+k+" MS ("+G+"-"+a+")";D.putImageData(l,0,0);w=E;if(E>f+1000){m=Math.round((C*1000)/(E-f));e=Math.min(e,m);i=Math.max(i,m);I(B.data,Math.min(30,30-(m/100)*30),"fps");q.innerHTML=""+m+" FPS ("+e+"-"+i+")";d.putImageData(B,0,0);if(u==3){v=webkitPerformance.memory.usedJSHeapSize*9.54e-7;o=Math.min(o,v);s=Math.max(s,v);I(b.data,Math.min(30,30-(v/2)),"mem");n.innerHTML=""+Math.round(v)+" MEM ("+Math.round(o)+"-"+Math.round(s)+")";g.putImageData(b,0,0)}f=E;C=0}}}}; \ No newline at end of file diff --git a/mediagoblin/static/js/thingiview.js/thingiloader.js b/mediagoblin/static/js/thingiview.js/thingiloader.js new file mode 100644 index 00000000..3791a49c --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/thingiloader.js @@ -0,0 +1,318 @@ +Thingiloader = function(event) { + // Code from https://developer.mozilla.org/En/Using_XMLHttpRequest#Receiving_binary_data + this.load_binary_resource = function(url) { + var req = new XMLHttpRequest(); + req.open('GET', url, false); + // The following line says we want to receive data as Binary and not as Unicode + req.overrideMimeType('text/plain; charset=x-user-defined'); + req.send(null); + if (req.status != 200) return ''; + + return req.responseText; + }; + + this.loadSTL = function(url) { + var looksLikeBinary = function(reader) { + // STL files don't specify a way to distinguish ASCII from binary. + // The usual way is checking for "solid" at the start of the file -- + // but Thingiverse has seen at least one binary STL file in the wild + // that breaks this. + + // The approach here is different: binary STL files contain a triangle + // count early in the file. If this correctly predicts the file's length, + // it is most probably a binary STL file. + + reader.seek(80); // skip the header + var count = reader.readUInt32(); + + var predictedSize = 80 /* header */ + 4 /* count */ + 50 * count; + return reader.getSize() == predictedSize; + }; + + workerFacadeMessage({'status':'message', 'content':'Downloading ' + url}); + var file = this.load_binary_resource(url); + var reader = new BinaryReader(file); + + if (looksLikeBinary(reader)) { + this.loadSTLBinary(reader); + } else { + this.loadSTLString(file); + } + }; + + this.loadOBJ = function(url) { + workerFacadeMessage({'status':'message', 'content':'Downloading ' + url}); + var file = this.load_binary_resource(url); + this.loadOBJString(file); + }; + + this.loadJSON = function(url) { + workerFacadeMessage({'status':'message', 'content':'Downloading ' + url}); + var file = this.load_binary_resource(url); + this.loadJSONString(file); + }; + + this.loadPLY = function(url) { + workerFacadeMessage({'status':'message', 'content':'Downloading ' + url}); + + var file = this.load_binary_resource(url); + + if (file.match(/format ascii/i)) { + this.loadPLYString(file); + } else { + this.loadPLYBinary(file); + } + }; + + this.loadSTLString = function(STLString) { + workerFacadeMessage({'status':'message', 'content':'Parsing STL String...'}); + workerFacadeMessage({'status':'complete', 'content':this.ParseSTLString(STLString)}); + }; + + this.loadSTLBinary = function(STLBinary) { + workerFacadeMessage({'status':'message', 'content':'Parsing STL Binary...'}); + workerFacadeMessage({'status':'complete', 'content':this.ParseSTLBinary(STLBinary)}); + }; + + this.loadOBJString = function(OBJString) { + workerFacadeMessage({'status':'message', 'content':'Parsing OBJ String...'}); + workerFacadeMessage({'status':'complete', 'content':this.ParseOBJString(OBJString)}); + }; + + this.loadJSONString = function(JSONString) { + workerFacadeMessage({'status':'message', 'content':'Parsing JSON String...'}); + workerFacadeMessage({'status':'complete', 'content':eval(JSONString)}); + }; + + this.loadPLYString = function(PLYString) { + workerFacadeMessage({'status':'message', 'content':'Parsing PLY String...'}); + workerFacadeMessage({'status':'complete_points', 'content':this.ParsePLYString(PLYString)}); + }; + + this.loadPLYBinary = function(PLYBinary) { + workerFacadeMessage({'status':'message', 'content':'Parsing PLY Binary...'}); + workerFacadeMessage({'status':'complete_points', 'content':this.ParsePLYBinary(PLYBinary)}); + }; + + this.ParsePLYString = function(input) { + var properties = []; + var vertices = []; + var colors = []; + + var vertex_count = 0; + + var header = /ply\n([\s\S]+)\nend_header/ig.exec(input)[1]; + var data = /end_header\n([\s\S]+)$/ig.exec(input)[1]; + + // workerFacadeMessage({'status':'message', 'content':'header:\n' + header}); + // workerFacadeMessage({'status':'message', 'content':'data:\n' + data}); + + header_parts = header.split("\n"); + + for (i in header_parts) { + if (/element vertex/i.test(header_parts[i])) { + vertex_count = /element vertex (\d+)/i.exec(header_parts[i])[1]; + } else if (/property/i.test(header_parts[i])) { + properties.push(/property (.*) (.*)/i.exec(header_parts[i])[2]); + } + } + + // workerFacadeMessage({'status':'message', 'content':'properties: ' + properties}); + + data_parts = data.split("\n"); + + for (i in data_parts) { + data_line = data_parts[i]; + data_line_parts = data_line.split(" "); + + vertices.push([ + parseFloat(data_line_parts[properties.indexOf("x")]), + parseFloat(data_line_parts[properties.indexOf("y")]), + parseFloat(data_line_parts[properties.indexOf("z")]) + ]); + + colors.push([ + parseInt(data_line_parts[properties.indexOf("red")]), + parseInt(data_line_parts[properties.indexOf("green")]), + parseInt(data_line_parts[properties.indexOf("blue")]) + ]); + } + + // workerFacadeMessage({'status':'message', 'content':'vertices: ' + vertices}); + + return [vertices, colors]; + }; + + this.ParsePLYBinary = function(input) { + return false; + }; + + this.ParseSTLBinary = function(input) { + // Skip the header. + input.seek(80); + + // Load the number of vertices. + var count = input.readUInt32(); + + // During the parse loop we maintain the following data structures: + var vertices = []; // Append-only list of all unique vertices. + var vert_hash = {}; // Mapping from vertex to index in 'vertices', above. + var faces = []; // List of triangle descriptions, each a three-element + // list of indices in 'vertices', above. + + for (var i = 0; i < count; i++) { + if (i % 100 == 0) { + workerFacadeMessage({ + 'status':'message', + 'content':'Parsing ' + (i+1) + ' of ' + count + ' polygons...' + }); + workerFacadeMessage({ + 'status':'progress', + 'content':parseInt(i / count * 100) + '%' + }); + } + + // Skip the normal (3 single-precision floats) + input.seek(input.getPosition() + 12); + + var face_indices = []; + for (var x = 0; x < 3; x++) { + var vertex = [input.readFloat(), input.readFloat(), input.readFloat()]; + + var vertexIndex = vert_hash[vertex]; + if (vertexIndex == null) { + vertexIndex = vertices.length; + vertices.push(vertex); + vert_hash[vertex] = vertexIndex; + } + + face_indices.push(vertexIndex); + } + faces.push(face_indices); + + // Skip the "attribute" field (unused in common models) + input.readUInt16(); + } + + return [vertices, faces]; + }; + + // build stl's vertex and face arrays + this.ParseSTLString = function(STLString) { + var vertexes = []; + var faces = []; + + var face_vertexes = []; + var vert_hash = {} + + // console.log(STLString); + + // strip out extraneous stuff + STLString = STLString.replace(/\r/, "\n"); + STLString = STLString.replace(/^solid[^\n]*/, ""); + STLString = STLString.replace(/\n/g, " "); + STLString = STLString.replace(/facet normal /g,""); + STLString = STLString.replace(/outer loop/g,""); + STLString = STLString.replace(/vertex /g,""); + STLString = STLString.replace(/endloop/g,""); + STLString = STLString.replace(/endfacet/g,""); + STLString = STLString.replace(/endsolid[^\n]*/, ""); + STLString = STLString.replace(/\s+/g, " "); + STLString = STLString.replace(/^\s+/, ""); + + // console.log(STLString); + + var facet_count = 0; + var block_start = 0; + + var points = STLString.split(" "); + + workerFacadeMessage({'status':'message', 'content':'Parsing vertices...'}); + for (var i=0; i 0) { + // up + scope.setCameraZoom(+10); + } else { + // down + scope.setCameraZoom(-10); + } + } + + onRendererGestureChange = function(event) { + event.preventDefault(); + + if (event.scale > 1) { + scope.setCameraZoom(+5); + } else { + scope.setCameraZoom(-5); + } + } + + onRendererMouseOver = function(event) { + mouseOver = true; + // targetRotation = object.rotation.z; + if (timer == null) { + // log('starting loop'); + timer = setInterval(sceneLoop, 1000/60); + } + } + + onRendererMouseDown = function(event) { + // log("down"); + + event.preventDefault(); + mouseDown = true; + + if(scope.getRotation()){ + wasRotating = true; + scope.setRotation(false); + } else { + wasRotating = false; + } + + mouseXOnMouseDown = event.clientX - windowHalfX; + mouseYOnMouseDown = event.clientY - windowHalfY; + + targetXRotationOnMouseDown = targetXRotation; + targetYRotationOnMouseDown = targetYRotation; + } + + onRendererMouseMove = function(event) { + // log("move"); + + if (mouseDown) { + mouseX = event.clientX - windowHalfX; + // targetXRotation = targetXRotationOnMouseDown + (mouseX - mouseXOnMouseDown) * 0.02; + xrot = targetXRotationOnMouseDown + (mouseX - mouseXOnMouseDown) * 0.02; + + mouseY = event.clientY - windowHalfY; + // targetYRotation = targetYRotationOnMouseDown + (mouseY - mouseYOnMouseDown) * 0.02; + yrot = targetYRotationOnMouseDown + (mouseY - mouseYOnMouseDown) * 0.02; + + targetXRotation = xrot; + targetYRotation = yrot; + } + } + + onRendererMouseUp = function(event) { + // log("up"); + if (mouseDown) { + mouseDown = false; + if (!mouseOver) { + clearInterval(timer); + timer = null; + } + if (wasRotating) { + scope.setRotation(true); + } + } + } + + onRendererMouseOut = function(event) { + if (!mouseDown) { + clearInterval(timer); + timer = null; + } + mouseOver = false; + } + + onRendererTouchStart = function(event) { + targetXRotation = object.rotation.z; + targetYRotation = object.rotation.x; + + timer = setInterval(sceneLoop, 1000/60); + + if (event.touches.length == 1) { + event.preventDefault(); + + mouseXOnMouseDown = event.touches[0].pageX - windowHalfX; + targetXRotationOnMouseDown = targetXRotation; + + mouseYOnMouseDown = event.touches[0].pageY - windowHalfY; + targetYRotationOnMouseDown = targetYRotation; + } + } + + onRendererTouchEnd = function(event) { + clearInterval(timer); + timer = null; + // targetXRotation = object.rotation.z; + // targetYRotation = object.rotation.x; + } + + onRendererTouchMove = function(event) { + if (event.touches.length == 1) { + event.preventDefault(); + + mouseX = event.touches[0].pageX - windowHalfX; + targetXRotation = targetXRotationOnMouseDown + (mouseX - mouseXOnMouseDown) * 0.05; + + mouseY = event.touches[0].pageY - windowHalfY; + targetYRotation = targetYRotationOnMouseDown + (mouseY - mouseYOnMouseDown) * 0.05; + } + } + + sceneLoop = function() { + if (object) { + // if (view == 'bottom') { + // if (showPlane) { + // plane.rotation.z = object.rotation.z -= (targetRotation + object.rotation.z) * 0.05; + // } else { + // object.rotation.z -= (targetRotation + object.rotation.z) * 0.05; + // } + // } else { + // if (showPlane) { + // plane.rotation.z = object.rotation.z += (targetRotation - object.rotation.z) * 0.05; + // } else { + // object.rotation.z += (targetRotation - object.rotation.z) * 0.05; + // } + // } + + if (showPlane) { + plane.rotation.z = object.rotation.z = (targetXRotation - object.rotation.z) * 0.2; + plane.rotation.x = object.rotation.x = (targetYRotation - object.rotation.x) * 0.2; + } else { + object.rotation.z = (targetXRotation - object.rotation.z) * 0.2; + object.rotation.x = (targetYRotation - object.rotation.x) * 0.2; + } + + // log(object.rotation.x); + + camera.updateMatrix(); + object.updateMatrix(); + + if (showPlane) { + plane.updateMatrix(); + } + + renderer.render(scene, camera); + // stats.update(); + } + } + + rotateLoop = function() { + // targetRotation += 0.01; + targetXRotation += 0.05; + sceneLoop(); + } + + this.getShowPlane = function(){ + return showPlane; + } + + this.setShowPlane = function(show) { + showPlane = show; + + if (show) { + if (scene && !plane) { + loadPlaneGeometry(); + } + plane.material[0].opacity = 1; + // plane.updateMatrix(); + } else { + if (scene && plane) { + // alert(plane.material[0].opacity); + plane.material[0].opacity = 0; + // plane.updateMatrix(); + } + } + + sceneLoop(); + } + + this.getRotation = function() { + return rotateTimer !== null; + } + + this.setRotation = function(rotate) { + rotation = rotate; + + if (rotate) { + rotateTimer = setInterval(rotateLoop, 1000/60); + } else { + clearInterval(rotateTimer); + rotateTimer = null; + } + + scope.onSetRotation(); + } + + this.onSetRotation = function(callback) { + if(callback === undefined){ + if(rotateListener !== null){ + try{ + rotateListener(scope.getRotation()); + } catch(ignored) {} + } + } else { + rotateListener = callback; + } + } + + this.setCameraView = function(dir) { + cameraView = dir; + + targetXRotation = 0; + targetYRotation = 0; + + if (object) { + object.rotation.x = 0; + object.rotation.y = 0; + object.rotation.z = 0; + } + + if (showPlane && object) { + plane.rotation.x = object.rotation.x; + plane.rotation.y = object.rotation.y; + plane.rotation.z = object.rotation.z; + } + + if (dir == 'top') { + // camera.position.y = 0; + // camera.position.z = 100; + // camera.target.position.z = 0; + if (showPlane) { + plane.flipSided = false; + } + } else if (dir == 'side') { + // camera.position.y = -70; + // camera.position.z = 70; + // camera.target.position.z = 0; + targetYRotation = -4.5; + if (showPlane) { + plane.flipSided = false; + } + } else if (dir == 'bottom') { + // camera.position.y = 0; + // camera.position.z = -100; + // camera.target.position.z = 0; + if (showPlane) { + plane.flipSided = true; + } + } else { + // camera.position.y = -70; + // camera.position.z = 70; + // camera.target.position.z = 0; + if (showPlane) { + plane.flipSided = false; + } + } + + mouseX = targetXRotation; + mouseXOnMouseDown = targetXRotation; + + mouseY = targetYRotation; + mouseYOnMouseDown = targetYRotation; + + scope.centerCamera(); + + sceneLoop(); + } + + this.setCameraZoom = function(factor) { + cameraZoom = factor; + + if (cameraView == 'bottom') { + if (camera.position.z + factor > 0) { + factor = 0; + } + } else { + if (camera.position.z - factor < 0) { + factor = 0; + } + } + + if (cameraView == 'top') { + camera.position.z -= factor; + } else if (cameraView == 'bottom') { + camera.position.z += factor; + } else if (cameraView == 'side') { + camera.position.y += factor; + camera.position.z -= factor; + } else { + camera.position.y += factor; + camera.position.z -= factor; + } + + sceneLoop(); + } + + this.getObjectMaterial = function() { + return objectMaterial; + } + + this.setObjectMaterial = function(type) { + objectMaterial = type; + + loadObjectGeometry(); + } + + this.setBackgroundColor = function(color) { + backgroundColor = color + + if (renderer) { + renderer.domElement.style.backgroundColor = color; + } + } + + this.setObjectColor = function(color) { + objectColor = parseInt(color.replace(/\#/g, ''), 16); + + loadObjectGeometry(); + } + + this.loadSTL = function(url) { + scope.newWorker('loadSTL', url); + } + + this.loadOBJ = function(url) { + scope.newWorker('loadOBJ', url); + } + + this.loadSTLString = function(STLString) { + scope.newWorker('loadSTLString', STLString); + } + + this.loadSTLBinary = function(STLBinary) { + scope.newWorker('loadSTLBinary', STLBinary); + } + + this.loadOBJString = function(OBJString) { + scope.newWorker('loadOBJString', OBJString); + } + + this.loadJSON = function(url) { + scope.newWorker('loadJSON', url); + } + + this.loadPLY = function(url) { + scope.newWorker('loadPLY', url); + } + + this.loadPLYString = function(PLYString) { + scope.newWorker('loadPLYString', PLYString); + } + + this.loadPLYBinary = function(PLYBinary) { + scope.newWorker('loadPLYBinary', PLYBinary); + } + + this.centerCamera = function() { + if (geometry) { + // Using method from http://msdn.microsoft.com/en-us/library/bb197900(v=xnagamestudio.10).aspx + // log("bounding sphere radius = " + geometry.boundingSphere.radius); + + // look at the center of the object + camera.target.position.x = geometry.center_x; + camera.target.position.y = geometry.center_y; + camera.target.position.z = geometry.center_z; + + // set camera position to center of sphere + camera.position.x = geometry.center_x; + camera.position.y = geometry.center_y; + camera.position.z = geometry.center_z; + + // find distance to center + distance = geometry.boundingSphere.radius / Math.sin((camera.fov/2) * (Math.PI / 180)); + + // zoom backwards about half that distance, I don't think I'm doing the math or backwards vector calculation correctly? + // scope.setCameraZoom(-distance/1.8); + // scope.setCameraZoom(-distance/1.5); + scope.setCameraZoom(-distance/1.9); + + directionalLight.position.x = geometry.min_y * 2; + directionalLight.position.y = geometry.min_y * 2; + directionalLight.position.z = geometry.max_z * 2; + + pointLight.position.x = geometry.center_y; + pointLight.position.y = geometry.center_y; + pointLight.position.z = geometry.max_z * 2; + } else { + // set to any valid position so it doesn't fail before geometry is available + camera.position.y = -70; + camera.position.z = 70; + camera.target.position.z = 0; + } + } + + this.loadArray = function(array) { + log("loading array..."); + geometry = new STLGeometry(array); + loadObjectGeometry(); + scope.setRotation(false); + scope.setRotation(true); + scope.centerCamera(); + log("finished loading " + geometry.faces.length + " faces."); + } + + this.newWorker = function(cmd, param) { + scope.setRotation(false); + + var worker = new WorkerFacade(thingiurlbase + '/thingiloader.js'); + + worker.onmessage = function(event) { + if (event.data.status == "complete") { + progressBar.innerHTML = 'Initializing geometry...'; + // scene.removeObject(object); + geometry = new STLGeometry(event.data.content); + loadObjectGeometry(); + progressBar.innerHTML = ''; + progressBar.style.display = 'none'; + + scope.setRotation(false); + scope.setRotation(true); + log("finished loading " + geometry.faces.length + " faces."); + scope.centerCamera(); + } else if (event.data.status == "complete_points") { + progressBar.innerHTML = 'Initializing points...'; + + geometry = new THREE.Geometry(); + + var material = new THREE.ParticleBasicMaterial( { color: 0xff0000, opacity: 1 } ); + + // material = new THREE.ParticleBasicMaterial( { size: 35, sizeAttenuation: false} ); + // material.color.setHSV( 1.0, 0.2, 0.8 ); + + for (i in event.data.content[0]) { + // for (var i=0; i<10; i++) { + vector = new THREE.Vector3( event.data.content[0][i][0], event.data.content[0][i][1], event.data.content[0][i][2] ); + geometry.vertices.push( new THREE.Vertex( vector ) ); + } + + particles = new THREE.ParticleSystem( geometry, material ); + particles.sortParticles = true; + particles.updateMatrix(); + scene.addObject( particles ); + + camera.updateMatrix(); + renderer.render(scene, camera); + + progressBar.innerHTML = ''; + progressBar.style.display = 'none'; + + scope.setRotation(false); + scope.setRotation(true); + log("finished loading " + event.data.content[0].length + " points."); + // scope.centerCamera(); + } else if (event.data.status == "progress") { + progressBar.style.display = 'block'; + progressBar.style.width = event.data.content; + // log(event.data.content); + } else if (event.data.status == "message") { + progressBar.style.display = 'block'; + progressBar.innerHTML = event.data.content; + log(event.data.content); + } else if (event.data.status == "alert") { + scope.displayAlert(event.data.content); + } else { + alert('Error: ' + event.data); + log('Unknown Worker Message: ' + event.data); + } + } + + worker.onerror = function(error) { + log(error); + error.preventDefault(); + } + + worker.postMessage({'cmd':cmd, 'param':param}); + } + + this.displayAlert = function(msg) { + msg = msg + "

" + + alertBox.innerHTML = msg; + alertBox.style.display = 'block'; + + // log(msg); + } + + function loadPlaneGeometry() { + // TODO: switch to lines instead of the Plane object so we can get rid of the horizontal lines in canvas renderer... + plane = new THREE.Mesh(new Plane(100, 100, 10, 10), new THREE.MeshBasicMaterial({color:0xafafaf,wireframe:true})); + scene.addObject(plane); + } + + function loadObjectGeometry() { + if (scene && geometry) { + if (objectMaterial == 'wireframe') { + // material = new THREE.MeshColorStrokeMaterial(objectColor, 1, 1); + material = new THREE.MeshBasicMaterial({color:objectColor,wireframe:true}); + } else { + if (isWebGl) { + // material = new THREE.MeshPhongMaterial(objectColor, objectColor, 0xffffff, 50, 1.0); + // material = new THREE.MeshColorFillMaterial(objectColor); + // material = new THREE.MeshLambertMaterial({color:objectColor}); + material = new THREE.MeshLambertMaterial({color:objectColor, shading: THREE.FlatShading}); + } else { + // material = new THREE.MeshColorFillMaterial(objectColor); + material = new THREE.MeshLambertMaterial({color:objectColor, shading: THREE.FlatShading}); + } + } + + // scene.removeObject(object); + + if (object) { + // shouldn't be needed, but this fixes a bug with webgl not removing previous object when loading a new one dynamically + object.materials = [new THREE.MeshBasicMaterial({color:0xffffff, opacity:0})]; + scene.removeObject(object); + // object.geometry = geometry; + // object.materials = [material]; + } + + object = new THREE.Mesh(geometry, material); + scene.addObject(object); + + if (objectMaterial != 'wireframe') { + object.overdraw = true; + object.doubleSided = true; + } + + object.updateMatrix(); + + targetXRotation = 0; + targetYRotation = 0; + + sceneLoop(); + } + } + +}; + +var STLGeometry = function(stlArray) { + // log("building geometry..."); + THREE.Geometry.call(this); + + var scope = this; + + // var vertexes = stlArray[0]; + // var normals = stlArray[1]; + // var faces = stlArray[2]; + + for (var i=0; i 0){ + theworker.postToWorkerFunction(callings[0]); + callings.shift(); + } + }; + document.body.appendChild(scr); + + var binaryscr = document.createElement("SCRIPT"); + binaryscr.src = thingiurlbase + '/binaryReader.js'; + binaryscr.type = "text/javascript"; + document.body.appendChild(binaryscr); + + return theworker; + }; + that.fake = true; + that.add = function(pth, worker){ + workers[pth] = worker; + return function(param){ + masters[pth].onmessage({"data": param}); + }; + }; + that.toString = function(){ + return "FakeWorker('"+path+"')"; + }; + return that; + }()); +} + +/* Then just use WorkerFacade instead of Worker (or alias it) + +The Worker code must should use a custom function (name it how you want) instead of postMessage. +Put this at the end of the Worker: + +if(typeof(window) === "undefined"){ + onmessage = nameOfWorkerFunction; + customPostMessage = postMessage; +} else { + customPostMessage = WorkerFacade.add("path/to/thisworker.js", nameOfWorkerFunction); +} + +*/ From 2b19fd5135bbc28ffc73db69cabc169e8747015a Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 01:34:11 -0500 Subject: [PATCH 074/140] Added the thingiview.js library. --- mediagoblin/static/js/thingiview.js/LICENSE | 165 ++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 mediagoblin/static/js/thingiview.js/LICENSE diff --git a/mediagoblin/static/js/thingiview.js/LICENSE b/mediagoblin/static/js/thingiview.js/LICENSE new file mode 100644 index 00000000..65c5ca88 --- /dev/null +++ b/mediagoblin/static/js/thingiview.js/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. From 62cc81fb99c6302c15a5843cf9e8727d3f7048c4 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 01:35:59 -0500 Subject: [PATCH 075/140] Added a rudimentary template for the stl/obj viewer. --- .../mediagoblin/media_displays/stl.html | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 mediagoblin/templates/mediagoblin/media_displays/stl.html diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html new file mode 100644 index 00000000..30e1a0bb --- /dev/null +++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html @@ -0,0 +1,63 @@ +{# +# 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 . +#} + +{% extends 'mediagoblin/user_pages/media.html' %} + + +{% block mediagoblin_media %} + + +test... +{% set display_media = request.app.public_store.file_url( + media.get_display_media(media.media_files)) %} + + + + + + + + +
+ +stl model + + + +{% endblock %} + +{% block mediagoblin_sidebar %} +{# + # + #
    + #
  • {% trans %}width:{% endtrans %} {{media.media_data.width}} mm
    • + #
  • {% trans %}depth:{% endtrans %} {{media.media_data.depth}} mm
    • + #
  • {% trans %}height:{% endtrans %} {{media.media_data.height}} mm
    • + #
+ #} +{% endblock %} From 76918e52e078a1b313ce650b4b11e4178dfa8453 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 01:36:26 -0500 Subject: [PATCH 076/140] Added the stl/obj mediatype. --- mediagoblin/media_types/stl/__init__.py | 27 ++++ mediagoblin/media_types/stl/migrations.py | 17 +++ mediagoblin/media_types/stl/model_loader.py | 153 ++++++++++++++++++++ mediagoblin/media_types/stl/models.py | 44 ++++++ mediagoblin/media_types/stl/processing.py | 107 ++++++++++++++ 5 files changed, 348 insertions(+) create mode 100644 mediagoblin/media_types/stl/__init__.py create mode 100644 mediagoblin/media_types/stl/migrations.py create mode 100644 mediagoblin/media_types/stl/model_loader.py create mode 100644 mediagoblin/media_types/stl/models.py create mode 100644 mediagoblin/media_types/stl/processing.py diff --git a/mediagoblin/media_types/stl/__init__.py b/mediagoblin/media_types/stl/__init__.py new file mode 100644 index 00000000..edffc633 --- /dev/null +++ b/mediagoblin/media_types/stl/__init__.py @@ -0,0 +1,27 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +from mediagoblin.media_types.stl.processing import process_stl, \ + sniff_handler + + +MEDIA_MANAGER = { + "human_readable": "stereo lithographics", + "processor": process_stl, + "sniff_handler": sniff_handler, + "display_template": "mediagoblin/media_displays/stl.html", + "default_thumb": "images/media_thumbs/video.jpg", + "accepted_extensions": ["obj", "stl"]} diff --git a/mediagoblin/media_types/stl/migrations.py b/mediagoblin/media_types/stl/migrations.py new file mode 100644 index 00000000..f54c23ea --- /dev/null +++ b/mediagoblin/media_types/stl/migrations.py @@ -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 . + +MIGRATIONS = {} diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py new file mode 100644 index 00000000..12a400e2 --- /dev/null +++ b/mediagoblin/media_types/stl/model_loader.py @@ -0,0 +1,153 @@ +# 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 . + + +import struct + + +class ThreeDeeParseError(Exception): + pass + + +class ThreeDee(): + """ + 3D model parser base class. Derrived classes are used for basic + analysis of 3D models, and are not intended to be used for 3D + rendering. + """ + + def __init__(self, fileob): + self.verts = [] + self.average = [0, 0, 0] + self.min = [None, None, None] + self.max = [None, None, None] + self.width = 0 # x axis + self.depth = 0 # y axis + self.height = 0 # z axis + + self.load(fileob) + if not len(self.verts): + raise ThreeDeeParseError("Empyt model.") + + for vector in self.verts: + for i in range(3): + num = vector[i] + self.average[i] += num + if not self.min[i]: + self.min[i] = num + self.max[i] = num + else: + if self.min[i] > num: + self.min[i] = num + if self.max[i] < num: + self.max[i] = num + + for i in range(3): + self.average[i]/=len(self.verts) + + self.width = abs(self.min[0] - self.max[0]) + self.depth = abs(self.min[1] - self.max[1]) + self.height = abs(self.min[2] - self.max[2]) + + + def load(self, fileob): + """Override this method in your subclass.""" + pass + + +class ObjModel(ThreeDee): + """ + Parser for textureless wavefront obj files. File format + reference: http://en.wikipedia.org/wiki/Wavefront_.obj_file + """ + + def __vector(self, line, expected=3): + nums = map(float, line.strip().split(" ")[1:]) + return tuple(nums[:expected]) + + def load(self, fileob): + for line in fileob: + if line[0] == "v": + self.verts.append(self.__vector(line)) + + +class BinaryStlModel(ThreeDee): + """ + Parser for ascii-encoded stl files. File format reference: + http://en.wikipedia.org/wiki/STL_%28file_format%29#Binary_STL + """ + + def __num(self, fileob, hint): + assert hint == "uint" or hint == "real" or hint == "short" + form = None + bits = 0 + if hint == "uint": + form = ". + + +from mediagoblin.db.sql.base import Base + +from sqlalchemy import ( + Column, Integer, Float, ForeignKey) +from sqlalchemy.orm import relationship, backref + + +class StlData(Base): + __tablename__ = "stl__mediadata" + + # 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("stl__media_data", cascade="all, delete-orphan")) + + center_x = Column(Float) + center_y = Column(Float) + center_z = Column(Float) + + width = Column(Float) + height = Column(Float) + depth = Column(Float) + + +DATA_MODEL = StlData +MODELS = [StlData] diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py new file mode 100644 index 00000000..0a5a24c1 --- /dev/null +++ b/mediagoblin/media_types/stl/processing.py @@ -0,0 +1,107 @@ +# 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 . + +import os +import logging + +from mediagoblin import mg_globals as mgg +from mediagoblin.processing import create_pub_filepath, \ + FilenameBuilder + +from mediagoblin.media_types.stl import model_loader + + +_log = logging.getLogger(__name__) +SUPPORTED_FILETYPES = ['stl', 'obj'] + + +def sniff_handler(media_file, **kw): + if kw.get('media') is not None: + name, ext = os.path.splitext(kw['media'].filename) + clean_ext = ext[1:].lower() + + if clean_ext in SUPPORTED_FILETYPES: + _log.info('Found file extension in supported filetypes') + return True + else: + _log.debug('Media present, extension not found in {0}'.format( + SUPPORTED_FILETYPES)) + else: + _log.warning('Need additional information (keyword argument \'media\')' + ' to be able to handle sniffing') + + return False + + +def process_stl(entry): + """ + Code to process an stl or obj model. + """ + + workbench = mgg.workbench_manager.create_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') + name_builder = FilenameBuilder(queued_filename) + + ext = queued_filename.lower().strip()[-4:] + if ext.startswith("."): + ext = ext[1:] + else: + ext = None + + # Attempt to parse the model file and divine some useful + # information about it. + with open(queued_filename, 'rb') as model_file: + model = model_loader.auto_detect(model_file, ext) + + # TODO: generate blender previews + + # Save the public file stuffs + model_filepath = create_pub_filepath( + entry, name_builder.fill('{basename}{ext}')) + + with mgg.public_store.get_file(model_filepath, 'wb') as model_file: + with open(queued_filename, 'rb') as queued_file: + model_file.write(queued_file.read()) + + + # Remove queued media file from storage and database + mgg.queue_store.delete_file(queued_filepath) + entry.queued_media_file = [] + + # Insert media file information into database + media_files_dict = entry.setdefault('media_files', {}) + media_files_dict[u'original'] = model_filepath + media_files_dict[u'thumb'] = ["mgoblin_static/images/404.png"] + + # Put model dimensions into the database + dimensions = { + "center_x" : model.average[0], + "center_y" : model.average[1], + "center_z" : model.average[2], + "width" : model.width, + "height" : model.height, + "depth" : model.depth, + } + entry.media_data_init(**dimensions) + + # clean up workbench + workbench.destroy_self() From 171dcbe3a80e13f4114a969f271dae1a1a5b3d7e Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 10:10:04 -0500 Subject: [PATCH 077/140] disabled auto rotate --- .../static/js/thingiview.js/thingiview.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mediagoblin/static/js/thingiview.js/thingiview.js b/mediagoblin/static/js/thingiview.js/thingiview.js index 71511eb2..5eb30335 100644 --- a/mediagoblin/static/js/thingiview.js/thingiview.js +++ b/mediagoblin/static/js/thingiview.js/thingiview.js @@ -391,6 +391,13 @@ Thingiview = function(containerId) { return rotateTimer !== null; } + this.resetRotation = function () { + if (rotate) { + this.setRotation(false); + this.setRotation(true); + } + } + this.setRotation = function(rotate) { rotation = rotate; @@ -606,8 +613,7 @@ Thingiview = function(containerId) { log("loading array..."); geometry = new STLGeometry(array); loadObjectGeometry(); - scope.setRotation(false); - scope.setRotation(true); + scope.resetRotation(); scope.centerCamera(); log("finished loading " + geometry.faces.length + " faces."); } @@ -626,8 +632,7 @@ Thingiview = function(containerId) { progressBar.innerHTML = ''; progressBar.style.display = 'none'; - scope.setRotation(false); - scope.setRotation(true); + scope.resetRotation(); log("finished loading " + geometry.faces.length + " faces."); scope.centerCamera(); } else if (event.data.status == "complete_points") { @@ -657,8 +662,7 @@ Thingiview = function(containerId) { progressBar.innerHTML = ''; progressBar.style.display = 'none'; - scope.setRotation(false); - scope.setRotation(true); + scope.resetRotation(); log("finished loading " + event.data.content[0].length + " points."); // scope.centerCamera(); } else if (event.data.status == "progress") { From 6645c4588b7e7f875aaee5bad89c11ffacde0111 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Mon, 15 Oct 2012 10:10:32 -0500 Subject: [PATCH 078/140] made 3d viewer a little cleaner --- .../mediagoblin/media_displays/stl.html | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html index 30e1a0bb..6fd2b04d 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/stl.html +++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html @@ -33,20 +33,31 @@ test... -
- -stl model - +
+ + {%- trans %}Toggle Rotate{% endtrans -%} + + + {%- trans %}Download{% endtrans -%} + +

{% endblock %} From 1695bdf63efb5a0d232cbfa9b1ac47c9330388dc Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 00:35:09 -0500 Subject: [PATCH 079/140] Added blender renderer --- blender_render.blend | Bin 0 -> 401296 bytes blender_render.py | 84 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 blender_render.blend create mode 100644 blender_render.py diff --git a/blender_render.blend b/blender_render.blend new file mode 100644 index 0000000000000000000000000000000000000000..dd356a0615e110ec5009fb0fe84207685522ac3c GIT binary patch literal 401296 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˩TL_B-6J*gnfMezT8fy==EwJj*k_{5G`D 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 AY5)KL literal 0 HcmV?d00001 diff --git a/blender_render.py b/blender_render.py new file mode 100644 index 00000000..99d5fa31 --- /dev/null +++ b/blender_render.py @@ -0,0 +1,84 @@ +# 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 . + + +import bpy, json, os + + +try: + CONFIG = json.loads(os.environ["RENDER_SETUP"]) + MODEL_EXT = CONFIG["model_ext"] + MODEL_PATH = CONFIG["model_path"] + CAMERA_COORD = CONFIG["camera_coord"] + CAMERA_FOCUS = CONFIG["camera_focus"] + CAMERA_CLIP = CONFIG["camera_clip"] + CAMERA_TYPE = CONFIG["projection"] + CAMERA_ORTHO = CONFIG["greatest"] * 1.5 + RENDER_WIDTH = CONFIG["width"] + RENDER_HEIGHT = CONFIG["height"] + RENDER_FILE = CONFIG["out_file"] +except KeyError: + print("Failed to load RENDER_SETUP environment variable.") + exit(1) + + +# add and setup camera +bpy.ops.object.camera_add(view_align=False, enter_editmode=False, + location = CAMERA_COORD) +camera_ob = bpy.data.objects[0] +camera = bpy.data.cameras[0] +camera.clip_end = CAMERA_CLIP +camera.ortho_scale = CAMERA_ORTHO +camera.type = CAMERA_TYPE + + + +# add an empty for focusing the camera +bpy.ops.object.add(location=CAMERA_FOCUS) +target = bpy.data.objects[1] +bpy.ops.object.select_all(action="SELECT") +bpy.ops.object.track_set(type="TRACKTO") +bpy.ops.object.select_all(action="DESELECT") + + +if MODEL_EXT == 'stl': + # import an stl model + bpy.ops.import_mesh.stl(filepath=MODEL_PATH) + +elif MODEL_EXT == 'obj': + # import an obj model + bpy.ops.import_scene.obj( + filepath=MODEL_PATH, + use_smooth_groups=False, + use_image_search=False, + axis_forward="Y", + axis_up="Z") + + +# rotate the imported objects with meshes in the scene +if CAMERA_TYPE == "PERSP": + for obj in bpy.data.objects[2:]: + obj.rotation_euler[2]=-.3 + + +# attempt to render +scene = bpy.data.scenes.values()[0] +scene.camera = camera_ob +scene.render.filepath = RENDER_FILE +scene.render.resolution_x = RENDER_WIDTH +scene.render.resolution_y = RENDER_HEIGHT +scene.render.resolution_percentage = 100 +bpy.ops.render.render(write_still=True) From 8f496712d04387af1eb9d0127d309c4179da2b10 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 00:35:37 -0500 Subject: [PATCH 080/140] Added script for manually testing the blender renderer. --- render_test.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 render_test.py diff --git a/render_test.py b/render_test.py new file mode 100644 index 00000000..58a5a760 --- /dev/null +++ b/render_test.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python + +import subprocess, json + + +# import the model +#model, ext, gr = ("/home/aeva/library/models/octocat_ascii.stl", "stl", 131.8) +model, ext, gr = ("/home/aeva/library/models/psycho/printme.obj", "obj", 93.4) + + +args = "blender blender_render.blend -F JPEG -P blender_render.py".split(" ") +env = { + "DISPLAY" : ":0", + "RENDER_SETUP" : json.dumps({ + "out_file" : "foo.jpg", + "model_path" : model, + "model_ext" : ext, + "greatest" : gr, + "camera_coord" : [0, gr*-1.5, gr], + "camera_focus" : (0, 0, gr/2.0), + "camera_clip" : gr*10, + "projection" : "PERSP", # "ORTHO" or "PERSP" + "width" : 800, + "height" : 800, + }) + } + +subprocess.call(args, env=env) +#subprocess.call(["eog", "foo.jpg"]) From ecee8d62c16b7f32b44b50ea4af18c94cecdd998 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 00:37:44 -0500 Subject: [PATCH 081/140] Catching ValueError when trying to use ObjModel on binary stl files. --- mediagoblin/media_types/stl/model_loader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py index 12a400e2..a417b04c 100644 --- a/mediagoblin/media_types/stl/model_loader.py +++ b/mediagoblin/media_types/stl/model_loader.py @@ -140,6 +140,8 @@ def auto_detect(fileob, hint): return ObjModel(fileob) except ThreeDeeParseError: pass + except ValueError: + pass try: # It is pretty important that the binary stl model loader # is tried second, because its possible for it to parse From 12a104671d455473e2db106e27762985d48fbba6 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 00:38:08 -0500 Subject: [PATCH 082/140] Added preview rendering for a bunch of different shots. --- mediagoblin/media_types/stl/processing.py | 68 ++++++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index 0a5a24c1..aabfa9a9 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -15,7 +15,9 @@ # along with this program. If not, see . import os +import json import logging +import subprocess from mediagoblin import mg_globals as mgg from mediagoblin.processing import create_pub_filepath, \ @@ -46,6 +48,16 @@ def sniff_handler(media_file, **kw): return False +def blender_render(config): + """ + Called to prerender a model. + """ + arg_string = "blender -b blender_render.blend -F " + arg_string +="JPEG -P blender_render.py" + env = {"RENDER_SETUP" : json.dumps(config), "DISPLAY":":0"} + subprocess.call(arg_string.split(" "), env=env) + + def process_stl(entry): """ Code to process an stl or obj model. @@ -72,7 +84,55 @@ def process_stl(entry): with open(queued_filename, 'rb') as model_file: model = model_loader.auto_detect(model_file, ext) - # TODO: generate blender previews + # generate preview images + greatest = [model.width, model.height, model.depth] + greatest.sort() + greatest = greatest[-1] + + def snap(name, camera, width=640, height=640, project="ORTHO"): + path = create_pub_filepath(entry, name_builder.fill(name)) + render_file = mgg.public_store.get_file(path, "wb") + shot = { + "model_path" : queued_filename, + "model_ext" : ext, + "camera_coord" : camera, + "camera_focus" : model.average, + "camera_clip" : greatest*10, + "greatest" : greatest, + "projection" : project, + "width" : width, + "height" : height, + "out_file" : render_file.name, + } + render_file.close() + blender_render(shot) + return path + + thumb_path = snap( + "{basename}.thumb.jpg", + [0, greatest*-1.5, greatest], + mgg.global_config['media:thumb']['max_width'], + mgg.global_config['media:thumb']['max_height'], + project="PERSP") + + perspective_path = snap( + "{basename}.perspective.jpg", + [0, greatest*-1.5, greatest], project="PERSP") + + topview_path = snap( + "{basename}.top.jpg", + [model.average[0], model.average[1], greatest*2]) + + frontview_path = snap( + "{basename}.front.jpg", + [model.average[0], greatest*-2, model.average[2]]) + + sideview_path = snap( + "{basename}.side.jpg", + [greatest*-2, model.average[1], model.average[2]]) + + + # Save the public file stuffs model_filepath = create_pub_filepath( @@ -90,7 +150,11 @@ def process_stl(entry): # Insert media file information into database media_files_dict = entry.setdefault('media_files', {}) media_files_dict[u'original'] = model_filepath - media_files_dict[u'thumb'] = ["mgoblin_static/images/404.png"] + media_files_dict[u'thumb'] = thumb_path + media_files_dict[u'perspective'] = perspective_path + media_files_dict[u'top'] = topview_path + media_files_dict[u'side'] = sideview_path + media_files_dict[u'front'] = frontview_path # Put model dimensions into the database dimensions = { From 418d1b149b7ab16786cea37f8ef7f66d433fc688 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 00:38:39 -0500 Subject: [PATCH 083/140] Updated the template for viewing stl models. --- .../mediagoblin/media_displays/stl.html | 130 ++++++++++++++---- 1 file changed, 102 insertions(+), 28 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html index 6fd2b04d..2fcca62d 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/stl.html +++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html @@ -22,53 +22,127 @@ {% block mediagoblin_media %} -test... -{% set display_media = request.app.public_store.file_url( +{% set model_download = request.app.public_store.file_url( media.get_display_media(media.media_files)) %} +{% set perspective_view = request.app.public_store.file_url( + media.media_files['perspective']) %} +{% set top_view = request.app.public_store.file_url( + media.media_files['top']) %} +{% set side_view = request.app.public_store.file_url( + media.media_files['side']) %} +{% set front_view = request.app.public_store.file_url( + media.media_files['front']) %} + + - -
- +{% trans media_title=media.title -%} + Image for {{ media_title }}{% endtrans %} +{% trans media_title=media.title -%} + Image for {{ media_title }}{% endtrans %} +{% trans media_title=media.title -%} + Image for {{ media_title }}{% endtrans %} +
+ + + {% endblock %} {% block mediagoblin_sidebar %} -{# - # - #
    - #
  • {% trans %}width:{% endtrans %} {{media.media_data.width}} mm
    • - #
  • {% trans %}depth:{% endtrans %} {{media.media_data.depth}} mm
    • - #
  • {% trans %}height:{% endtrans %} {{media.media_data.height}} mm
    • - #
- #} +

debug info

+
    +
  • width: {{media.media_data.width}} mm
    • +
  • depth: {{media.media_data.depth}} mm
    • +
  • height: {{media.media_data.height}} mm
    • +
  • cx: {{media.media_data.center_x}} mm
    • +
  • cy: {{media.media_data.center_y}} mm
    • +
  • cz: {{media.media_data.center_z}} mm
    • +
{% endblock %} From d25ed5dd4c364ab3c3f6cd28f5c64b55592630a7 Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 01:01:34 -0500 Subject: [PATCH 084/140] Added a table to store the file extension of a model. --- mediagoblin/media_types/stl/models.py | 4 +++- mediagoblin/media_types/stl/processing.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mediagoblin/media_types/stl/models.py b/mediagoblin/media_types/stl/models.py index d0873176..ccb1b9dc 100644 --- a/mediagoblin/media_types/stl/models.py +++ b/mediagoblin/media_types/stl/models.py @@ -18,7 +18,7 @@ from mediagoblin.db.sql.base import Base from sqlalchemy import ( - Column, Integer, Float, ForeignKey) + Column, Integer, Float, String, ForeignKey) from sqlalchemy.orm import relationship, backref @@ -39,6 +39,8 @@ class StlData(Base): height = Column(Float) depth = Column(Float) + file_type = Column(String) + DATA_MODEL = StlData MODELS = [StlData] diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py index aabfa9a9..35ac7ea9 100644 --- a/mediagoblin/media_types/stl/processing.py +++ b/mediagoblin/media_types/stl/processing.py @@ -164,6 +164,7 @@ def process_stl(entry): "width" : model.width, "height" : model.height, "depth" : model.depth, + "file_type" : ext, } entry.media_data_init(**dimensions) From d93eac36fc2bbc10102d682128722c448aca5ded Mon Sep 17 00:00:00 2001 From: Aeva Ntsc Date: Tue, 16 Oct 2012 01:02:05 -0500 Subject: [PATCH 085/140] Disabled thingiview for obj models, since thingiview's support for them seems to be broken. --- mediagoblin/templates/mediagoblin/media_displays/stl.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html index 2fcca62d..ceabbf04 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/stl.html +++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html @@ -119,11 +119,13 @@ window.show_things = function () { title="{%- trans %}Side{% endtrans -%}"> {%- trans %}Side{% endtrans -%} +{% if media.media_data.file_type == "stl" %} {%- trans %}WebGL{% endtrans -%} +{% endif %} Date: Tue, 16 Oct 2012 01:54:27 -0500 Subject: [PATCH 086/140] Fixed the binary stl loader. --- mediagoblin/media_types/stl/model_loader.py | 31 ++++----------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/mediagoblin/media_types/stl/model_loader.py b/mediagoblin/media_types/stl/model_loader.py index a417b04c..b9fbbb06 100644 --- a/mediagoblin/media_types/stl/model_loader.py +++ b/mediagoblin/media_types/stl/model_loader.py @@ -90,35 +90,14 @@ class BinaryStlModel(ThreeDee): http://en.wikipedia.org/wiki/STL_%28file_format%29#Binary_STL """ - def __num(self, fileob, hint): - assert hint == "uint" or hint == "real" or hint == "short" - form = None - bits = 0 - if hint == "uint": - form = " Date: Tue, 16 Oct 2012 01:55:04 -0500 Subject: [PATCH 087/140] tweaking the template --- mediagoblin/templates/mediagoblin/media_displays/stl.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/media_displays/stl.html b/mediagoblin/templates/mediagoblin/media_displays/stl.html index ceabbf04..6cc19b14 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/stl.html +++ b/mediagoblin/templates/mediagoblin/media_displays/stl.html @@ -37,15 +37,20 @@ #top_view, #side_view, #front_view, #thingy_view { display: none; } +.media_image { + cursor: inherit!important; +} + +{% if media.media_data.file_type == "stl" %} +{% endif %} - - + + + {% endif %} @@ -71,7 +71,7 @@ window.show_things = function () { show('thingy_view'); }; window.show("thingy_view"); - thingiurlbase = "{{ request.staticdirect('/js/thingiview.js') }}"; + thingiurlbase = "{{ request.staticdirect('/js/extlib/thingiview.js') }}"; thingiview = new Thingiview("thingy_view"); thingiview.setObjectColor('#821543'); thingiview.initScene(); From c39b9afc83d5e0bfd9312d762a7b16955ba949ca Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 4 Dec 2012 09:44:07 +0100 Subject: [PATCH 095/140] Fallback to "en_US" if browser does not send preferred languages E.g. in our test suite we don't send an "accepted languages" header, which caused the language matching to fail. So we need to explicitely fallback to en_US, in case request.accepted_languages is None. This fixes the tests and all cases where user browsers don't send preferred languages. This also fixes issue #562, the AVAILABLE_LOCALES are already case-normalized and we don't need to fudge the preferred language through the lower_upper_locale thing for each and every request. Signed-off-by: Sebastian Spaeth --- mediagoblin/tools/translate.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index 8c413056..eead6413 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -69,29 +69,26 @@ def locale_to_lower_lower(locale): def get_locale_from_request(request): """ - Figure out what target language is most appropriate based on the - request + Return most appropriate language based on prefs/request request """ - global AVAILABLE_LOCALES - request_form = request.args or request.form + request_args = (request.args, request.form)[request.method=='POST'] - if request_form.has_key('lang'): - # User explicitely demanded a language - target_lang = request_form['lang'] + if request_args.has_key('lang'): + # User explicitely demanded a language, normalize lower_uppercase + target_lang = locale_to_lower_upper(request_args['lang']) elif 'target_lang' in request.session: # TODO: Uh, ohh, this is never ever set anywhere? target_lang = request.session['target_lang'] else: - # Pull the first acceptable language or English - # This picks your favorite browser lingo, falling back to 'en' + # Pull the most acceptable language based on browser preferences + # This returns one of AVAILABLE_LOCALES which is aready case-normalized. + # Note: in our tests request.accept_languages is None, so we need + # to explicitely fallback to en here. + target_lang = request.accept_languages.best_match(AVAILABLE_LOCALES) \ + or "en_US" - # TODO: We need a list of available locales, and match with the list - # of accepted locales, and serve the best available locale rather than - # the most preferred, or fall back to 'en' immediately. - target_lang = request.accept_languages.best_match(AVAILABLE_LOCALES) - - return locale_to_lower_upper(target_lang) + return target_lang SETUP_GETTEXTS = {} From 5f8b4ae895ecb228c5f5d615818ffe0a06a30473 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 4 Dec 2012 09:57:56 +0100 Subject: [PATCH 096/140] make media_manager a property of MediaEntry in mixin.py In all cases where get_media_manager(_media_type_as_string) was called in our code base we ultimately passed in a "MediaEntry().media_type" to get the matching MEDIA_MANAGER. It so makes sense to make this a function of the MediaEntry rather than a global function in mediagoblin.media_types and passing around media_entry.media_type as arguments all the time. It saves a few import statements and arguments. I also made it so the Media_manager property is cached for subsequent calls, although I am not too sure that this is needed (there are other cases for which this would make more sense) Also add a get_media_manager test to the media submission tests. It submits an image and checks that both media.media_type and media.media_manager return the right thing. Not sure if these tests could not be merged with an existing submission test, but it can't hurt to have things explicit. TODO: Right now we iterate through all existing media_managers to find the right one based on the string of its module name. This should be made a simple dict lookup to avoid all the extra work. Signed-off-by: Sebastian Spaeth --- mediagoblin/db/mixin.py | 24 +++++++++++++++++++++--- mediagoblin/media_types/__init__.py | 19 ------------------- mediagoblin/processing/task.py | 5 +---- mediagoblin/tests/test_submission.py | 15 ++++++++++++++- mediagoblin/user_pages/views.py | 4 +--- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index a8436c70..3f395e90 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -27,9 +27,11 @@ These functions now live here and get "mixed in" into the real objects. """ +from werkzeug.utils import cached_property + from mediagoblin import mg_globals from mediagoblin.auth import lib as auth_lib -from mediagoblin.media_types import get_media_manager +from mediagoblin.media_types import get_media_managers, FileTypeNotSupported from mediagoblin.tools import common, licenses from mediagoblin.tools.text import cleaned_markdown_conversion from mediagoblin.tools.url import slugify @@ -99,6 +101,7 @@ class MediaEntryMixin(object): def slug_or_id(self): return (self.slug or self._id) + def url_for_self(self, urlgen, **extra_args): """ Generate an appropriate url for ourselves @@ -125,11 +128,26 @@ class MediaEntryMixin(object): else: # No thumbnail in media available. Get the media's # MEDIA_MANAGER for the fallback icon and return static URL - # Raise FileTypeNotSupported in case no such manager is enabled - manager = get_media_manager(self.media_type) + # Raises FileTypeNotSupported in case no such manager is enabled + manager = self.media_manager thumb_url = mg_globals.app.staticdirector(manager[u'default_thumb']) return thumb_url + @cached_property + def media_manager(self): + """Returns the MEDIA_MANAGER of the media's media_type + + Raises FileTypeNotSupported in case no such manager is enabled + """ + # TODO, we should be able to make this a simple lookup rather + # than iterating through all media managers. + for media_type, manager in get_media_managers(): + if media_type == self.media_type: + return manager + # Not found? Then raise an error + raise FileTypeNotSupported( + "MediaManager not in enabled types. Check media_types in config?") + def get_fail_exception(self): """ Get the exception that's appropriate for this error diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py index 5bf0124c..06763510 100644 --- a/mediagoblin/media_types/__init__.py +++ b/mediagoblin/media_types/__init__.py @@ -78,25 +78,6 @@ def get_media_managers(): yield media_type, sys.modules[media_type].MEDIA_MANAGER -def get_media_manager(_media_type): - ''' - Get the MEDIA_MANAGER based on a media type string - - Example:: - get_media_type('mediagoblin.media_types.image') - ''' - if not _media_type: - return False - - for media_type, manager in get_media_managers(): - if media_type in _media_type: - return manager - - # Nope? Then raise an error - raise FileTypeNotSupported( - "MediaManager not in enabled types. Check media_types in config?") - - def get_media_type_and_manager(filename): ''' Try to find the media type based on the file name, extension diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 187b893d..09abebb5 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -20,7 +20,6 @@ from celery.task import Task from mediagoblin import mg_globals as mgg from mediagoblin.db.util import ObjectId -from mediagoblin.media_types import get_media_manager from mediagoblin.processing import mark_entry_failed, BaseProcessingFail from mediagoblin.tools.processing import json_processing_callback @@ -47,14 +46,12 @@ class ProcessMedia(Task): # Try to process, and handle expected errors. try: - manager = get_media_manager(entry.media_type) - entry.state = u'processing' entry.save() _log.debug('Processing {0}'.format(entry)) - manager['processor'](entry) + entry.media_manager['processor'](entry) entry.state = u'processed' entry.save() diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py index b7b0e574..b6fe0015 100644 --- a/mediagoblin/tests/test_submission.py +++ b/mediagoblin/tests/test_submission.py @@ -28,7 +28,7 @@ from mediagoblin.tests.tools import get_test_app, \ fixture_add_user from mediagoblin import mg_globals from mediagoblin.tools import template - +from mediagoblin.media_types.image import MEDIA_MANAGER as img_MEDIA_MANAGER def resource(filename): return resource_filename('mediagoblin.tests', 'test_submission/' + filename) @@ -197,6 +197,19 @@ class TestSubmission: assert 'Sorry, I don\'t support that file type :(' == \ str(form.file.errors[0]) + + def test_get_media_manager(self): + """Test if the get_media_manger function returns sensible things + """ + response, request = self.do_post({'title': u'Balanced Goblin'}, + *REQUEST_CONTEXT, do_follow=True, + **self.upload_data(GOOD_JPG)) + media = self.check_media(request, {'title': u'Balanced Goblin'}, 1) + + assert_equal(media.media_type, u'mediagoblin.media_types.image') + assert_equal(media.media_manager, img_MEDIA_MANAGER) + + def test_sniffing(self): ''' Test sniffing mechanism to assert that regular uploads work as intended diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index c26bd340..ec159b6e 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -33,7 +33,6 @@ from mediagoblin.decorators import (uses_pagination, get_user_media_entry, from werkzeug.contrib.atom import AtomFeed -from mediagoblin.media_types import get_media_manager _log = logging.getLogger(__name__) _log.setLevel(logging.DEBUG) @@ -128,8 +127,7 @@ def media_home(request, media, page, **kwargs): comment_form = user_forms.MediaCommentForm(request.form) - media_template_name = get_media_manager( - media.media_type)['display_template'] + media_template_name = media.media_manager['display_template'] return render_to_response( request, From 1244ffc8f5c3617bab98b560dcd57d51bc5afbd4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 4 Dec 2012 09:34:41 -0600 Subject: [PATCH 097/140] We arean't using header_dropdown.js anymore because the dropdown is gone! --- mediagoblin/templates/mediagoblin/base.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 745bb6f9..3f5e2c79 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -28,8 +28,6 @@ - From 2222278dcdf70a1dbcba0e5955344259d0697752 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 4 Dec 2012 17:28:53 +0100 Subject: [PATCH 098/140] Remove gridify_* We injected a gridify_list and gridify_cursor function into each jinja2 template that we render. This was used to split the list of media_entries into batches of 5 for nicer table columns. However, jinja2 has a nice |batch filter built in that does the job for us just as well with less code (on our side) Less code=good so let's merge this one. Signed-off-by: Sebastian Spaeth --- .../mediagoblin/utils/collection_gallery.html | 2 +- .../mediagoblin/utils/object_gallery.html | 2 +- mediagoblin/tools/template.py | 31 ------------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index 25def418..af332537 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -20,7 +20,7 @@ {% macro media_grid(request, collection_items, col_number=5) %} - {% for row in gridify_cursor(collection_items, col_number) %} + {% for row in collection_items|batch(col_number) %} diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index b4da5bc1..0cd8cdab 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -20,7 +20,7 @@ {% macro media_grid(request, media_entries, col_number=5) %}
- {% for row in gridify_cursor(media_entries, col_number) %} + {% for row in media_entries|batch(col_number) %} diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index cb556e4c..d9c6e654 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -59,8 +59,6 @@ def get_jinja_env(template_loader, locale): # ... construct a grid of thumbnails or other media # ... have access to the global and app config template_env.globals['fetch_messages'] = messages.fetch_messages - template_env.globals['gridify_list'] = gridify_list - template_env.globals['gridify_cursor'] = gridify_cursor template_env.globals['app_config'] = mg_globals.app_config template_env.globals['global_config'] = mg_globals.global_config @@ -100,32 +98,3 @@ def render_template(request, template_path, context): def clear_test_template_context(): global TEMPLATE_TEST_CONTEXT TEMPLATE_TEST_CONTEXT = {} - - -def gridify_list(this_list, num_cols=5): - """ - Generates a list of lists where each sub-list's length depends on - the number of columns in the list - """ - grid = [] - - # Figure out how many rows we should have - num_rows = int(ceil(float(len(this_list)) / num_cols)) - - for row_num in range(num_rows): - slice_min = row_num * num_cols - slice_max = (row_num + 1) * num_cols - - row = this_list[slice_min:slice_max] - - grid.append(row) - - return grid - - -def gridify_cursor(this_cursor, num_cols=5): - """ - Generates a list of lists where each sub-list's length depends on - the number of columns in the list - """ - return gridify_list(list(this_cursor), num_cols) From ad7420281cdaf5846d8754a29e5006bde82d87f9 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 5 Dec 2012 13:37:19 +0100 Subject: [PATCH 099/140] Create a active_user_from_url decorator This can be used for URL patterns containing a element. It will look up the corresponding user among all active users and return a 404 NOT FOUND page if there is no such active user. It then passes the User() instance as url_user keyword argument to the decorated view function. Signed-off-by: Sebastian Spaeth --- mediagoblin/decorators.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index 9be9d4cc..90b36771 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -22,6 +22,7 @@ from urllib import urlencode from webob import exc from mediagoblin.db.util import ObjectId, InvalidId +from mediagoblin.db.sql.models import User from mediagoblin.tools.response import redirect, render_404 @@ -52,6 +53,20 @@ def require_active_login(controller): return new_controller_func +def active_user_from_url(controller): + """Retrieve User() from URL pattern and pass in as url_user=... + + Returns a 404 if no such active user has been found""" + @wraps(controller) + def wrapper(request, *args, **kwargs): + user = User.query.filter_by(username=request.matchdict['user']).first() + if user is None: + return render_404(request) + + return controller(request, *args, url_user=user, **kwargs) + + return wrapper + def user_may_delete_media(controller): """ From 64c2a4002c261c01c50f333a8aa8dc5c223e79c9 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 5 Dec 2012 13:38:50 +0100 Subject: [PATCH 100/140] Switch over the user gallery to the active_user_from_url decorator This switches the user gallery page over to use the new decorator, and cleans up the queries to be in proper sqlalchemy format rather than the old mongo format. Signed-off-by: Sebastian Spaeth --- mediagoblin/user_pages/views.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index ec159b6e..e260a592 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -20,6 +20,7 @@ import datetime from mediagoblin import messages, mg_globals from mediagoblin.db.util import DESCENDING, ObjectId +from mediagoblin.db.sql.models import MediaEntry, Collection, CollectionItem 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 @@ -29,7 +30,7 @@ from mediagoblin.user_pages.lib import send_comment_email from mediagoblin.decorators import (uses_pagination, get_user_media_entry, require_active_login, user_may_delete_media, user_may_alter_collection, - get_user_collection, get_user_collection_item) + get_user_collection, get_user_collection_item, active_user_from_url) from werkzeug.contrib.atom import AtomFeed @@ -75,30 +76,26 @@ def user_home(request, page): 'pagination': pagination}) +@active_user_from_url @uses_pagination -def user_gallery(request, page): +def user_gallery(request, page, url_user=None): """'Gallery' of a User()""" - user = request.db.User.find_one({ - 'username': request.matchdict['user'], - 'status': u'active'}) - if not user: - return render_404(request) - - cursor = request.db.MediaEntry.find( - {'uploader': user._id, - 'state': u'processed'}).sort('created', DESCENDING) - + cursor = MediaEntry.query.filter_by( + uploader=url_user.id, + state=u'processed').order_by(MediaEntry.created.desc()) + # Paginate gallery pagination = Pagination(page, cursor) media_entries = pagination() #if no data is available, return NotFound + # TODO: Should we really also return 404 for empty galleries? if media_entries == None: return render_404(request) return render_to_response( request, 'mediagoblin/user_pages/gallery.html', - {'user': user, + {'user': url_user, 'media_entries': media_entries, 'pagination': pagination}) From e2ae0f59202e39f996cd796e42420e061eebf8d1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 5 Dec 2012 13:42:00 +0100 Subject: [PATCH 101/140] Fix user collection gallery We were fetching the user collection gallery by slug only, so if two users had the same collection slug, we would not have been sure which one we'd get. Fix this by explicitly only fetching the specific user's collections. Also switch over the view function to make use of the new active_user_from_url decorator that fetches the User() object for us. Signed-off-by: Sebastian Spaeth --- mediagoblin/user_pages/views.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index e260a592..cbf3f15f 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -319,32 +319,28 @@ def media_confirm_delete(request, media): 'form': form}) +@active_user_from_url @uses_pagination -def user_collection(request, page): +def user_collection(request, page, url_user=None): """A User-defined Collection""" - user = request.db.User.find_one({ - 'username': request.matchdict['user'], - 'status': u'active'}) - if not user: - return render_404(request) + collection = Collection.query.filter_by( + get_creator=url_user, + slug=request.matchdict['collection']).first() - collection = request.db.Collection.find_one( - {'slug': request.matchdict['collection']}) - - cursor = request.db.CollectionItem.find( - {'collection': collection.id}) + cursor = collection.get_collection_items() pagination = Pagination(page, cursor) collection_items = pagination() - #if no data is available, return NotFound + # if no data is available, return NotFound + # TODO: Should an empty collection really also return 404? if collection_items == None: return render_404(request) return render_to_response( request, 'mediagoblin/user_pages/collection.html', - {'user': user, + {'user': url_user, 'collection': collection, 'collection_items': collection_items, 'pagination': pagination}) From 52539acad2e945002b25d7e07991b634734eee30 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 5 Dec 2012 16:13:22 -0600 Subject: [PATCH 102/140] Add a UniqueConstraint add test in test_sql_migrations We should have this anyway, and Elrond needs it to help fix current broken migration thingies. --- mediagoblin/tests/test_sql_migrations.py | 29 +++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index e3b55634..6383d096 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -322,6 +322,28 @@ def creature_power_hitpower_to_float(db_conn): creature_power.c.hitpower.alter(type=Float) +@RegisterMigration(8, FULL_MIGRATIONS) +def creature_power_name_creature_unique(db_conn): + """ + Add a unique constraint to name and creature on creature_power. + + We don't want multiple creature powers with the same name per creature! + """ + # Note: We don't actually check to see if this constraint is set + # up because at present there's no way to do so in sqlalchemy :\ + + metadata = MetaData(bind=db_conn.bind) + + creature_power = Table( + 'creature_power', metadata, + autoload=True, autoload_with=db_conn.bind) + + cons = changeset.constraint.UniqueConstraint( + 'name', 'creature', table=creature_power) + + cons.create() + + def _insert_migration1_objects(session): """ Test objects to insert for the first set of things @@ -660,7 +682,7 @@ def test_set1_to_set3(): u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), printer) - assert migration_manager.latest_migration == 7 + assert migration_manager.latest_migration == 8 assert migration_manager.database_current_migration == 0 # Migrate @@ -679,14 +701,15 @@ def test_set1_to_set3(): + Running migration 5, "level_exit_index_from_and_to_level"... done. + Running migration 6, "creature_power_index_creature"... done. + Running migration 7, "creature_power_hitpower_to_float"... done. + + Running migration 8, "creature_power_name_creature_unique"... done. """ # Make sure version matches expected migration_manager = MigrationManager( u'__main__', SET3_MODELS, SET3_MIGRATIONS, Session(), printer) - assert migration_manager.latest_migration == 7 - assert migration_manager.database_current_migration == 7 + assert migration_manager.latest_migration == 8 + assert migration_manager.database_current_migration == 8 # Check all things in database match expected From 9b25ad59d3fa1dec3ab59d172d341aed47def930 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 7 Dec 2012 12:45:47 -0600 Subject: [PATCH 103/140] Committing present MediaGoblin translations before pushing extracted messages --- .../i18n/de/LC_MESSAGES/mediagoblin.po | 87 ++++++++++--------- .../i18n/ro/LC_MESSAGES/mediagoblin.po | 32 +++---- .../i18n/ru/LC_MESSAGES/mediagoblin.po | 28 +++--- 3 files changed, 74 insertions(+), 73 deletions(-) diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po index db464d6e..8b764c1c 100644 --- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po @@ -5,7 +5,7 @@ # Translators: # , 2011. # , 2011. -# Elrond , 2011, 2012. +# Elrond , 2011-2012. # , 2011, 2012. # Jakob Kramer , 2012. # Jan-Christoph Borchardt , 2011. @@ -13,6 +13,7 @@ # , 2011. # , 2011. # Rafael Maguiña , 2011. +# , 2012. # Vinzenz Vietzke , 2012. # Vinzenz Vietzke , 2011. msgid "" @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" "POT-Creation-Date: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" -"Last-Translator: cwebber \n" +"PO-Revision-Date: 2012-12-05 08:17+0000\n" +"Last-Translator: spaetz \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" @@ -52,7 +53,7 @@ msgstr "Fehlerhafte Eingabe" #: mediagoblin/auth/views.py:55 msgid "Sorry, registration is disabled on this instance." -msgstr "Das Registrieren ist auf dieser Instanz leider deaktiviert." +msgstr "Benutzerregistrierung ist auf diesem Server leider deaktiviert." #: mediagoblin/auth/views.py:75 msgid "Sorry, a user with that name already exists." @@ -66,11 +67,11 @@ msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse." msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" -msgstr "Deine E-Mail-Adresse wurde bestätigt. Du kannst dich nun anmelden, dein Profil bearbeiten und Bilder hochladen!" +msgstr "Deine E-Mail-Adresse wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Media hochladen!" #: mediagoblin/auth/views.py:188 msgid "The verification key or user id is incorrect" -msgstr "Der Bestätigungsschlüssel oder die Nutzernummer ist falsch." +msgstr "Der Aktivierungsschlüssel oder die Nutzerkennung ist falsch." #: mediagoblin/auth/views.py:206 msgid "You must be logged in so we know who to send the email to!" @@ -78,22 +79,22 @@ msgstr "Du musst angemeldet sein, damit wir wissen, wer die Email bekommt." #: mediagoblin/auth/views.py:214 msgid "You've already verified your email address!" -msgstr "Deine E-Mail-Adresse wurde bereits bestätigt." +msgstr "Deine E-Mail-Adresse wurde bereits aktiviert." #: mediagoblin/auth/views.py:227 msgid "Resent your verification email." -msgstr "Bestätigungs-E-Mail wurde erneut versandt." +msgstr "Aktivierungsmail wurde erneut versandt." #: mediagoblin/auth/views.py:263 msgid "" "An email has been sent with instructions on how to change your password." -msgstr "Es wurde eine Email mit Anweisungen für die Änderung des Passwortes an dich gesendet." +msgstr "Es wurde eine E-Mail mit der Anleitung zur Änderung des Passwortes an Dich gesendet." #: mediagoblin/auth/views.py:273 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 bestätigt wurde." +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." @@ -198,16 +199,16 @@ msgstr "Diesen Kurztitel hast du bereits vergeben." #: mediagoblin/edit/views.py:86 msgid "You are editing another user's media. Proceed with caution." -msgstr "Du bearbeitest die Medien eines Anderen. Sei bitte vorsichtig." +msgstr "Du bearbeitest die Medien eines anderen Nutzers. Sei bitte vorsichtig." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Sie haben den Anhang %s hinzugefügt!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." -msgstr "Du bearbeitest das Profil eines Anderen. Sei bitte vorsichtig." +msgstr "Du bearbeitest das Profil eines anderen Nutzers. Sei bitte vorsichtig." #: mediagoblin/edit/views.py:197 msgid "Profile changes saved" @@ -288,7 +289,7 @@ msgstr "Beschreibung" msgid "" "This will be visible to users allowing your\n" " application to authenticate as them." -msgstr "Dies wird für Benutzer sichtbar sein, die deiner\n Anwendung erlauben, sich als sie zu authentifizieren.." +msgstr "Dies wird für Benutzer sichtbar sein, die deiner\nAnwendung erlauben, sich als sie zu authentifizieren.." #: mediagoblin/plugins/oauth/forms.py:41 msgid "Type" @@ -336,7 +337,7 @@ msgstr "Du musst eine Datei angeben." #: mediagoblin/submit/views.py:164 msgid "Woohoo! Submitted!" -msgstr "Yeeeaaah! Geschafft!" +msgstr "JAAA! Geschafft!" #: mediagoblin/submit/views.py:215 #, python-format @@ -345,16 +346,16 @@ msgstr "Sammlung \"%s\" hinzugefügt!" #: mediagoblin/templates/mediagoblin/base.html:50 msgid "MediaGoblin logo" -msgstr "MediaGoblin-Logo" +msgstr "MediaGoblin Logo" #: mediagoblin/templates/mediagoblin/base.html:56 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "%(user_name)ss Konto" #: mediagoblin/templates/mediagoblin/base.html:62 msgid "log out" -msgstr "" +msgstr "abmelden" #: mediagoblin/templates/mediagoblin/base.html:64 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -364,7 +365,7 @@ msgstr "Medien hinzufügen" #: mediagoblin/templates/mediagoblin/base.html:70 msgid "Verify your email!" -msgstr "Bitte bestätige deine E-Mail-Adresse!" +msgstr "Bitte bestätige Deine E-Mail-Adresse!" #: mediagoblin/templates/mediagoblin/base.html:75 #: mediagoblin/templates/mediagoblin/auth/login.html:28 @@ -389,15 +390,15 @@ msgstr "Veröffentlicht unter der MediaGoblin, an " "extraordinarily great piece of media hosting software." -msgstr "Diese Seite setzt MediaGoblin ein, eine großartige Software für Medienhosting." +msgstr "Diese Webseite setzt MediaGoblin ein, eine großartige Software für Medienhosting." #: 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 "Melde dich mit deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, zu kommentieren und mehr." +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 msgid "Don't have one yet? It's easy!" @@ -520,11 +521,11 @@ msgstr "Anmeldevorgang fehlgeschlagen!" #: mediagoblin/templates/mediagoblin/auth/login.html:44 msgid "Don't have an account yet?" -msgstr "Hast du noch keines? Es geht ganz einfach!" +msgstr "Hast du noch keines?" #: mediagoblin/templates/mediagoblin/auth/login.html:45 msgid "Create one here!" -msgstr "Registriere dich hier!" +msgstr "Registriere dich einfach hier!" #: mediagoblin/templates/mediagoblin/auth/login.html:51 msgid "Forgot your password?" @@ -533,7 +534,7 @@ msgstr "Passwort vergessen?" #: mediagoblin/templates/mediagoblin/auth/register.html:28 #: mediagoblin/templates/mediagoblin/auth/register.html:36 msgid "Create an account!" -msgstr "Neues Konto registrieren!" +msgstr "Neues Nutzerkonto registrieren!" #: mediagoblin/templates/mediagoblin/auth/register.html:40 msgid "Create" @@ -548,7 +549,7 @@ msgid "" "your web browser:\n" "\n" "%(verification_url)s" -msgstr "Hallo %(username)s,\n\num dein Konto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n\n%(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/edit/attachments.html:23 #: mediagoblin/templates/mediagoblin/edit/attachments.html:35 @@ -786,7 +787,7 @@ msgstr "

Veröffentlicht am

\n

%(date)s

" #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Medien zu einem Album hinzufügen" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -804,7 +805,7 @@ msgstr "Eine neue Sammlung hinzufügen" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "Du kannst den Status der Medien, die sich gerade in Bearbeitung befinden, hier betrachten." +msgstr "Du kannst hier den Status der Medien verfolgen die sich gerade in Bearbeitung befinden." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" @@ -823,7 +824,7 @@ msgstr "Dieser Benutzer konnte leider nicht gefunden werden." #: mediagoblin/templates/mediagoblin/user_pages/user.html:50 #: mediagoblin/templates/mediagoblin/user_pages/user.html:70 msgid "Email verification needed" -msgstr "E-Mail-Bestätigung benötigt" +msgstr "E-Mail Aktivierung benötigt" #: mediagoblin/templates/mediagoblin/user_pages/user.html:53 msgid "Almost done! Your account still needs to be activated." @@ -832,15 +833,15 @@ msgstr "Fast fertig! Dein Konto muss noch freigeschaltet werden." #: mediagoblin/templates/mediagoblin/user_pages/user.html:58 msgid "" "An email should arrive in a few moments with instructions on how to do so." -msgstr "Gleich solltest du eine E-Mail erhalten, die dir erklärt, was du noch machen musst." +msgstr "Gleich solltest du eine E-Mail erhalten, die beschreibt was noch zu tun bleibt." #: mediagoblin/templates/mediagoblin/user_pages/user.html:62 msgid "In case it doesn't:" -msgstr "Wenn sie nicht ankommt:" +msgstr "Falls sie nicht ankommt:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:65 msgid "Resend verification email" -msgstr "Bestätigungs-E-Mail erneut senden" +msgstr "Aktivierungsmail erneut senden" #: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "" @@ -853,11 +854,11 @@ msgstr "Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, aber msgid "" "If you are that person but you've lost your verification email, you can log in and resend it." -msgstr "Wenn dir dieses Konto gehört und die Bestätigungsmail verloren gegangen ist, kannst du dich anmelden und sie erneut senden." +msgstr "Wenn dir dieses Konto gehört und die Aktivierungsmail verloren gegangen ist, kannst du dich anmelden und sie erneut senden." #: mediagoblin/templates/mediagoblin/user_pages/user.html:96 msgid "Here's a spot to tell others about yourself." -msgstr "Hier kannst du Anderen etwas über dich erzählen." +msgstr "Hier kannst Du Dich selbst beschreiben." #: mediagoblin/templates/mediagoblin/user_pages/user.html:101 #: mediagoblin/templates/mediagoblin/user_pages/user.html:118 @@ -887,7 +888,7 @@ msgstr "Scheinbar gibt es hier noch nichts …" #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 msgid "(remove)" -msgstr "" +msgstr "(entfernen)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -951,25 +952,25 @@ msgstr "Hoppla!" #: mediagoblin/tools/response.py:30 msgid "An error occured" -msgstr "" +msgstr "Ein Fehler trat auf" #: mediagoblin/tools/response.py:44 msgid "Operation not allowed" -msgstr "" +msgstr "Funktion nicht erlaubt" #: mediagoblin/tools/response.py:45 msgid "" "Sorry Dave, I can't let you do that!

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

Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?" #: mediagoblin/tools/response.py:52 msgid "" "There doesn't seem to be a page at this address. Sorry!

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

Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell verschoben oder gelöscht." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" @@ -993,11 +994,11 @@ msgstr "hat dein Medium kommentiert" #: mediagoblin/user_pages/views.py:161 msgid "Oops, your comment was empty." -msgstr "Ohh, der Kommentar war leer." +msgstr "Hoppla, der Kommentartext fehlte." #: mediagoblin/user_pages/views.py:167 msgid "Your comment has been posted!" -msgstr "Dein Kommentar wurde gesendet!" +msgstr "Dein Kommentar wurde angenommen!" #: mediagoblin/user_pages/views.py:235 msgid "You have to select or add a collection" diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index fabd9c31..364a6017 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" "POT-Creation-Date: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" -"Last-Translator: cwebber \n" +"PO-Revision-Date: 2012-12-04 04:03+0000\n" +"Last-Translator: George Pop \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -193,7 +193,7 @@ msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Ai anexat %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -278,7 +278,7 @@ msgstr "Descriere" msgid "" "This will be visible to users allowing your\n" " application to authenticate as them." -msgstr "" +msgstr "Aceste informații vor fi vizibile pentru utilizatorii\n care permit aplicației tale să se autentifice în numele lor." #: mediagoblin/plugins/oauth/forms.py:41 msgid "Type" @@ -340,11 +340,11 @@ msgstr "logo MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:56 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "Contul lui %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:62 msgid "log out" -msgstr "" +msgstr "Ieșire" #: mediagoblin/templates/mediagoblin/base.html:64 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -379,15 +379,15 @@ msgstr "Publicat sub licența Adăugat la\n

%(date)s

" #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Adaugă un fișier la colecție" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -877,7 +877,7 @@ msgstr "Nu pare să existe niciun fișier media deocamdată..." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 msgid "(remove)" -msgstr "" +msgstr "(șterge)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -941,25 +941,25 @@ msgstr "Hopa!" #: mediagoblin/tools/response.py:30 msgid "An error occured" -msgstr "" +msgstr "S-a produs o eroare" #: mediagoblin/tools/response.py:44 msgid "Operation not allowed" -msgstr "" +msgstr "Operația nu este permisă" #: mediagoblin/tools/response.py:45 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

Dacă sunteți sigur că adresa este corectă, poate că pagina pe care o căutați a fost mutată sau ștearsă." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index fc5e1037..81a64c9f 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" "POT-Creation-Date: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" -"Last-Translator: cwebber \n" +"PO-Revision-Date: 2012-12-05 12:41+0000\n" +"Last-Translator: aleksejrs \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -168,7 +168,7 @@ msgstr "Уведомлять меня по e-mail о комментариях к #: mediagoblin/edit/forms.py:83 msgid "The title can't be empty" -msgstr "" +msgstr "Название не может быть пустым" #: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:43 @@ -192,7 +192,7 @@ msgstr "Вы редактируете файлы другого пользова #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Вы добавили сопутствующий файл %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -271,7 +271,7 @@ msgstr "" #: mediagoblin/plugins/oauth/forms.py:37 msgid "Description" -msgstr "" +msgstr "Описание" #: mediagoblin/plugins/oauth/forms.py:39 msgid "" @@ -339,11 +339,11 @@ msgstr "Символ MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:56 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "Учётная запись %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:62 msgid "log out" -msgstr "" +msgstr "завершение сеанса" #: mediagoblin/templates/mediagoblin/base.html:64 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -378,15 +378,15 @@ msgstr "Он опубликован на условиях Добавлено\n

%(date)s

" #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Добавить файл к коллекции" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -876,7 +876,7 @@ msgstr "Пока что тут файлов нет…" #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 msgid "(remove)" -msgstr "" +msgstr "(исключить)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -940,11 +940,11 @@ msgstr "Ой!" #: mediagoblin/tools/response.py:30 msgid "An error occured" -msgstr "" +msgstr "Произошла ошибка" #: mediagoblin/tools/response.py:44 msgid "Operation not allowed" -msgstr "" +msgstr "Операция не позволяется" #: mediagoblin/tools/response.py:45 msgid "" From a589201714cd15e8c0d5b59ca460f2dd7378fdc4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 7 Dec 2012 12:46:37 -0600 Subject: [PATCH 104/140] Committing extracted and compiled translations --- .../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 22344 -> 22664 bytes .../i18n/ar/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 22094 -> 22414 bytes .../i18n/ca/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 21166 -> 21486 bytes .../i18n/da/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 22443 -> 22473 bytes .../i18n/en/LC_MESSAGES/mediagoblin.po | 111 ++++-- .../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 22167 -> 22487 bytes .../i18n/eo/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 22804 -> 23124 bytes .../i18n/es/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 21990 -> 22310 bytes .../i18n/fa/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 22998 -> 23318 bytes .../i18n/fr/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 23402 -> 24055 bytes .../i18n/he/LC_MESSAGES/mediagoblin.po | 363 ++++++++++------- .../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 21166 -> 21486 bytes .../i18n/ia/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 22482 -> 23160 bytes .../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 365 +++++++++++------- .../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 22187 -> 22507 bytes .../i18n/it/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 21735 -> 22055 bytes .../i18n/ja/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 22789 -> 23479 bytes .../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 365 +++++++++++------- .../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 21630 -> 21950 bytes .../i18n/nl/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 20770 -> 21090 bytes .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 22002 -> 22322 bytes .../i18n/pl/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 21340 -> 21660 bytes .../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 22587 -> 22636 bytes .../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 28087 -> 28344 bytes .../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 21992 -> 22312 bytes .../i18n/sk/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 21346 -> 21666 bytes .../i18n/sl/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 22506 -> 22826 bytes .../i18n/sq/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 21262 -> 21582 bytes .../i18n/sr/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 21492 -> 21812 bytes .../i18n/sv/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 21408 -> 21728 bytes .../i18n/te/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 21206 -> 21526 bytes .../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 113 ++++-- .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 20527 -> 20847 bytes .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 113 ++++-- 54 files changed, 2460 insertions(+), 1230 deletions(-) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo index fe10204fea408ff63905969745bcdc728892b33d..06dc2263662a9edf7f07163fa97ead4f31ad4092 100644 GIT binary patch delta 3898 zcmZYA4NR5S9mnziMP5ZIzJZ|VRg1hAK~M`aQRGeW6?`ePra12CEtKm3H8R`VRjsyN zs*~CTrQJ+KH@boLuBEYVt+flZ-I{bwV@!i?>FAtb=DKF9O*8lX@!X_KM}W_H&V8P9 z{^x)G&$)xWuEXbD{%ey%j~hQj{LSPqG(uP3{ESXCOXBht&c^5%vjv!e%WxY`#V(A) z^B9SP=)wG^WsT7sGH07mF|fD{wuo!cNS` zzn}(4WEKsafzg~TjnkZgUP5BC zZsgZq=br-j05#Ed)aRdJDBeK@^dHo?@oI(Dz z^4IC04s8InXIGGC?JLv@rjZ6^DhZYH`KXjs43QJD>( z#(T?8LleG>8gLXf&|OpjafGcD=b#>3hAN&aROU7#zqXBkN@+W4;G?MLI)m3|QK>(N z+Nz7_MgK4jJ-Cj1kX`ejQusJ(1^uXr2k{7gjLLwAWh%8zs1-lOKizi*wc-G3yx#@; zuc77{L1n__9@B5(G_>c@xCN`R8(&66x?zs<+O=aQ*XK}~8NwX=5^FJ?G^#cZqE>nX zHPIJ15AWb=OyZ&xy;w&5Ssx9uZU4e%oN}*I?N6dsa006_fNL=#*$HGbp5l5x-iOKa z&D>an8gCb-;W4bii}(aiN*O!(>=-`8{Ps4DFr3G7w__S=?+)WQd;vr81V-XdQ7Qg8 zs%9>r0{sKJ@iXLTwFqX{xQkH%6`}5{#RzOgzXtdr4ZQ`=p>BK;)A0gs!eOkyLOM(E z04~NsEJnSHg|Hm=<72oFUF;W4dmPKL2anhWgM$RN_N4=geplanTPQ_O-2H!)~$W`PpwGq_)XI#!g~1cB58$9+iRLB5#@vU_9Q$R19HN zdM*RwFdsQe{8mNdS9CO@Qk1}kYoIFBjhj#hM-yt#pTuzd8BWHtsJG(+Dxf!!f$e=v zz?+zip;V~)(^2DBVvOGZjWjes9V+tgquzq2F%i$8itZ9>&u$?FY}1xHD_eogVU0+Z z?F?$mhHyL%qXN5)Gx2Lw#uF&GXy&)sG|Djp^?J49Y3#>LYGT`WoRjToDo=roB4uLJ zi_I9z)*xB7XYdqWMy=el+{u_9RSPeoGSG*rfe+As4~-!jTKO&1iepzeE66~lY9T7+ zOHoBuf(m3S-irrtHvR&W@Lkm2{}q+lyQmroWpx^F63)fM67sJ-ETV%q&eo#>_z|kA zyHF4Ipo*tI=q1!d@1tttZ>WLqqMnOf>8v;omHJdn#XR)lgQ({QR+9gDG=}I<3SFg6 zl^38UUX4d^D=GswFb)5XoIRFM=Ddy-s1(=Zbli=4{s?NKE)2z2g8ludEq}*PqlLx< zuDa2WiZr>x`PN&D%w-2~HNJP^2{NT! zK^3Ea7N0iLC`7HO2epE$sBgW`aV?frIVaz7JjM0Ls1@v47`^|$q_LfjH&A<*xZXMGQc)?(L={sGD#ewkn)xm&&}K}*Lzs3tT0S%+>3)w(6a0aTs2*=+4+F*wl)A`^j+=S}h8u7{ z_ToOwt#RItKIB&W1dri;4C=v4sJA6$Gnu0Ptel2Ux*yhb&s#5ewmfE_?p`SS@AVt6Lvh} z`Cgm5!sBgtxUIuKvvs_urFAD=-rb(S?V05vk=}ZbRX6Qw=r~zg8Q4F2QDm&Ip@9iD z`r7K+JXYh|+0mbJDx|zBP?K625wX~vlUtCN-*Gy7j@nBK@^S*d&wgqAw*&PS9CbyP zeG_TNmxZ&!#^UP8ir*A?WNCW%w_}^$(X-;=|BWxU#2*q`O@M*tNrO}f7m*h8$^ZZW delta 3595 zcmYM#3vA727{~Fq)jGXUs%N!GOeyzl?=zR&x-&wI|A!+sYI`nhkk z3fO4)spYR7f2W$N_y5m?=ElU)eFHn-5=_Ib*bgsZYit%~OeDr*5cWhrEWl=1i1j!E zGcc=#G2M-En`tyUa$yrX@C?4koArfPz~Y z!(66424h!@!XBvSOJCi08#9SU1Q%Qwh?SUw?_)8Z#UU8XL)kbQHNXd`fwy8PR-pnr zj7s7$Ou$p9iEm;mK101{C(20XH=Ss-#{yi8lQ0A8Py>avF@_jS8|2rd@=pQuMcpq& z-5-MiI0F^X9MrgrF&Z~x3?A`azl?6}RRayZ_yo0AFHp5$V?z~r5^A8{sI7V(mFh~= ziay1*cmi{<7PVEOysU8}kReSpDzI)i2y>&@|1LCEa$y-B!mHSoaHn7(qjtvWn1vfq zMR*Z=;yql12`r1I*@i0CuaGR8T2$b7QMF*BU??jSiQ1Z!Sn|(3GnfmC*on%>EL3V2 zpi;XOHQ+jAapp@@ASX~;aUH2U^8mHtMpP#KNu$PVftoNHHC`TSoZ)U73ScVgh2^N? z_y|>un@}s-j!NN4)PO&uw&1$2e;2hCk8lRY@RFWih1&ZqsEm100XLxLb2rjhM#}GDbDsD%%(=_R7Wh4<* z%_Yd8ZP+bUerMQF&L{+E53wEX|2!ezWcYZ z57+PG13zkqv}uCY6q3fxz%(3%{jd`GP&MD89j~Rktvz|p1>QIQ8CJCiU_JeC}+cRE>z&Fu?c>Rd?c9lsN;7Ko8uWb4MlVr!|*nS<0Dkn zHp#JGh(+D+f)SX9%19|HmF1|tK8iYajW|r#*>Fv`3zbnXhT>^#hVF|rf@u7ToE&o# zqtL&nbzWmoFBW1XmLNypIPm~hqB4}u@->bV_1tW1gR4+mvIU#sacqTWkW=9{S7<1r ztEhqNu`T*jLCM$-b-h1og2|}kG!qrD3swE=F$NEzime7a;!~tvO?xUm6^A01%zVtz z`9DNMd-W%V;6v1a&ryLz_O?zz0_qse#NBuhyRi3VRNxf)%lldr*Q36yT2OI3Vg?{d zGAnQ=odLOz*s(|DVP_Iv|srF&3&eGc_)Rf}5b9gIO+ffaB9DkGgxsm(;yQZ6b3 zrI>_EumkQuZN*vC7T-X(Qu&mIis2<{z@YxtgyE>Y%0eBZL8t)UK|Sw5)y58=`%n`c zMeY3+)OdGM)&2;z(0@@|5nf3CXVAzcuXlH)?=2VJhm&DjT)pbLhZJ z$VY&Aim{knWKC3n(e%qu0nb9sv&h$9S492?abX)5D)0_g;n;yzgpHU@KZS?5WhUTI z+=U!@^AN{lLa|i?%TP6Q3pHT_YC+FY@5K$a#+iW(Z4S9fo>8bDGaGl}0VD=fI?Sr_O{np{LkIqjuVH8j1&U6jUd%?zjLoaTV%*HO6C|?|LJK(T^EnJ?FqqI{yP{lyhS) zk|py!zKJbIT9GfreEL7(1PmW#eOb-HrSur-SB$o*|1VTVY)qyP zsB}!x`7frS4+IzL`0Yatco9|2PjCZ9jIjpVi~jU4pa%K@gYh=numJ<{Z=WxG_w~7~ z)Q6x+NS>EqpX_vcpEUm@$h#pj$*;AmVw!8deUWQHh5fC`^X4sdRXF>3Z$ym_^yJ6Q z^`4F^^7q>8D}y{+Q@`-$JBn\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -239,7 +239,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -334,43 +334,43 @@ msgstr "يا سلام! نُشرَت!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "شعار ميدياغوبلن" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "لِج" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -982,74 +1027,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "أنت على وشك حذف وسائط مستخدم آخر. كن حذرًا أثناء العملية." -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 31700e95d640c31f4ae597263e36ca7afb94fddb..091056629af666977409d05ed42e217338cb8f53 100644 GIT binary patch delta 3886 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
Q;PDjc_EX>eB9 zt2hWxpq|gKP#6B__XZB7ACc*#)Po8<2epMoI13vwA5Zzm!`X1nHv^T?dodiV{e5pO zjW7nDMqbv$n^tffS-f>)Bt~aBd+tUG-}3PQK8$%7#qw3^%$>#{WJz+2YT>ZR0{i00Sw4@RuYTKL@sK}7NPcZIqK=C z$C0=SM_~)<`onk|c3}+OKxHI^D7^z{#M96X6HsS;Ix3JnR7$JSjSZ-j?nMRGi7MJ3 zPU5KiQji{BjqEdYjwc?Yg`&>kA^*=>kPAwY2#mnUUF_kwKVQW#5o<^lCkmYkESSfDD4fp~Mo#(7{KN5p|kM)>P;ry{` zK{x%sF$qVJ4jn+nn4$-AAq`dICRED5zzO&Z>amHea`rX_iP&~y0CwUK{0u|!Ji4$4 zwensJ!yBkf{)^KwVm@!4vGpGJlA0RdACWJH_;$pO2^dnha#`II?p1Y9u5>@Xq`v;C zx|KC~zMqFx1~=!&ukdxm7YF)W?sXx}dy@A1@{@~QuF3AS$=T_Xo42GUs68z^Ez9>_ tsyED6kW&-Td^k73cRsf-xcPj+I^VLwV}ZWJk|m+dyUITGRhLh6{ReYJrb_?- diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po index f01bd3a8..b93516d8 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgid "Wrong password" msgstr "Contrasenya errònia" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ja tens una col.lecció anomenada \"%s\"!" @@ -239,7 +239,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Tot i així, l'enllaç antic al directori s'ha trobat; eliminat.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: 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 :(" @@ -334,43 +334,43 @@ msgstr "Visca! S'ha enviat!" msgid "Collection \"%s\" added!" msgstr "S'ha afegit la col.leccio \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logo de mediagoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifica el teu correu electrònic" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Entra" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Alimentat per MediaGoblin, un projecte GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s's media" msgid "❖ Browsing media by %(username)s" msgstr "❖ Navegant mitjà per a %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Imatge per %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Afegeix un comentari" @@ -982,74 +1027,74 @@ msgstr "Incluir una nota" msgid "commented on your post" msgstr "comentat al teu post" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Uups, el teu comentari era buit." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "El teu comentari s'ha publicat!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Has de sel.leccionar o afegir una col.lecció" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" afegir a la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Has esborrat el mitjà" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Has esborrat l'element de la col.lecció" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Has esborrat la col.lecció \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 1e27578b46102526edfea614ff9479eee6315720..c511196af0f574f556ec1b468ae9d181d3a95ec0 100644 GIT binary patch delta 3918 zcma*oeNa_(9>?+TMdVRYL`4+kn)!f63JEB#ftWx-qDWd)rsNgzfy=^GM^-zwLN(d0 z4s7ni(r)gqS~QWnr_wQMnyi7Gaw?~>#!+k39!7VUU7g&T&3b=4cV?gdSq6Che&^x$ z`~JSa?>VP?zwa*xea_iokxv;vXZTCyFEU!afBjq@Y&MqepD_*N6U=7dG|b2QaX5D3 zNc0ek<4#LX^g`UunGGy3)heE2Ko&W zo9#z_?Fj!AzzNhu=TPTA$4LAJ70`9mxN+>uC``xEScp3Q06N;MZ8Vgs7SsU0K1>R zQRBVg(9neMpa#5*8t8je03!)oDb7UQn2#!+GF0Z4A-{G%|CG`u)WCaC_qB)n2T`d% zgxabetVQP{4c%ByKFF>GP$_&EwSvQ_iTiLjeuTRV7V(W9kq9l;{e=?k=TJT_*+zp zpGDQoQB>4*070_JNbyXORjp%5ApU}`#@N?9KPvcZPig)8hEWtS( zoR7_zi+xytdKTxvJlu)faU1&BFPio+7GoE-;@>fVEg9sWdaz3wUaI2BqpCj}$(EI2 z9yX#P??w&Si`1=ML1iqF1i`c4mxC>rl0i?dU>0AtzUA}mK@u)U}O-bD?32IKJyRFPgmjdKlEJJ&H8(`R{) z@jTRh>u@B7kXMOgyJ$SYfi6@gvRS?cdJu=;8XSR}Q7e5ie7*yR(cc&Dzk~|tRa6o8 zq5`;p%Gf_~JdUEEv{iYSpyz)+4Lx2J7>CPI15~31a8SkeOVpmdj0)roswOUB3a0W1 zuxQIcZCM>EGn-L?HK7*rD5?lMb)5O_cQlHz8#Te#xE;s+$ouMbVm18`6{^&pLdwJ< zZug2a7fGHi$E~;r6;K?Ns=#kX?R6oJ!)2%%*@TW((oACvw&G~)Ms2}6s8qd=TG1z{ zlz)aA@G5FAV+y=L(oi*$kBPV#mDy@kW^2MWAa7&aUO@ge;4>W1KrSkP^8y=;TG?<^O0!UbmZ0uif(rOSRO)MR3N~UbcB1Z!Ds;RTOKPE)!fezE>QK+G zgS+ubR7O(gdjU?s@$_#;rE(=|#X(f+A3@#!Yt%%~qB8M%*kf2szt5quoW{^QyszF` zR8b}H462y&aT;zxP567%UcZf1cpaGy+x>gKl*iip|>Rkm`Q&HR^lGqfftdNtF2+M zmADrNGQVA;v5o`Zq4sWVS@^L*t)vO#&_UJ66R6_bhg!kQ=*JVN3I2)_u(LX2!}Ag)zi@Pz5~~k^V`QXw6cf_@2i)Blz|nXj<;Y2cA~2OIBK9TF%1_j z^}c#_sOx`>vG_P@#jU7}bcB5-eEtB&%;m%(8txl2$|K$96BkA%+!5STw;{M{wSQx9 zbzp;gb;Ly9q}mMue^Ibu&^ z%3yul;mP|Vip$)}DR)Lk=lV0V@@8hY{bBlewP)qc%yi$KzB~56gRGi8_5TgBEhG6J tw?FT4^E*e29VlJ6tMh<3_1FmC+bxkbSqPmzU zI!SiZ$(fqG+LTKRGwrt1rWMXu4l32On4{&`_vd?O`X>kZoO9myJ?A;kdES>__Jq9X z5ApsG6S~Ft*UtZI`G2H`djI{K)7vbO?j3j?)?*g7U=bd}e%LF@EDn>fCyvGtEXH0q z9#7#E9Eqc%%|@7cZ2^rT3~a>=d;{0<W8K}cBY`|RHfMxh5PQY+(x&f!7CfJCYxCJB8 zj|%K%R1yzjG9E!K+=1zM0ri}lDC1b)hSC^>#rObL;Yd7znkXvPj2J8y`LT3lLW$w_zyOpaQBz&HDhx<2D?K`-9^jp;u?sMMDpsN1fFrR4uqTP(_}Kn&?K>F58_MsH4Z1-c^Jm5*W*1n z3Y$>L`B08XU+&x_>R|?6;#b7C;5ug<8*hnMNax z2=b&IZ%3uF6}7{|s2fk9cG!uU@KSKRFE?o+H)`j(sIx7^nb?4SJb?=EVYl-Zy@12? z{-30w4D?Pi%f@t^jk8fTa1d2A@#Ienq+$wY;6yCP65NJ2V+WE1OXH?m9FLTh?MDUv z0ZzkHIGOb=FZF69_9(V;A%K}UV=%kIwWtaGn1O9L9lLNf7N=ePl35#8(f=L8aM}>F zxi||$@m18(9YtmG9gJap`-X-hJBMxzB~K%8Flyl$sOwA6g_}@C{U^Qij{;!yk? zXW(Tl!)Zi49(Q0Ko}h_LVjDh%5ggcj+=(2gbsz3z zBn4H?<;do(8Vhg}D)4tu^K~HQW|5>Kku=}10APRag8vS=we&L69C%%}e)Unvz^^bJnnL$Evj5y&UOa_}0gz}{HprJ;yw zF$x<{JAVo_(GJuD2ZGn%Mtz9du?Kb{G1{+Kf=Ri~Td)8bvKLX$|A?CRJVxRbRAAmn zDnb)QqlzaEwQw;~KQ;^X;2Mm>&B&{7yKy77p)yfE+L>nsM$>-?WASm+PM-^2-;Xi$ zUvv6iJ4QnheSxat4(yNrpiZqooUZ+Zoz$(;p_o1F!kE(%PsH1uv6~Jkv z4D3%FfP<;fJiY%#G*o0O@M=m>kvE_M+lHm+M@{%MK8UfrI$xs?=iz-fIvM;JDFeHR zD(*}wl)czwT#4&Y0fdYtP}a8u8amT_RBFpnwXhHsc|9r<8*m`{QAhSBDkJZrHt;Db zwcnuTJBK>5E2u!?ikw==#Xj^)(W_L>qM=mI4O)YIMQs^s!mX%@UO)x#7V3<@L)AtX zDxkkG5ig@MnBZ{&%tmdb02OE%s>CQy7mIQ7MZlb|RjLdM)Q*Bi5i6 zyod_O#yK^TfXdt$)D9=1Qau;-{QanP9zkuqWt`VJ+g%LIWS|rM=o#-6%W2G`-~T4( z3s!+i^y^Up?!?*n70$zK-a*w&6Nch0OhG?R#P^XOi@n)-O)I@LwBu*777wGUcqkR8 z$j9MioP(NRA7VkplT)yb)N?_Sl{lT zF@u41NbvSOl66ZfcaGp*)Dg5`E`EUx7(rTA;p3Q&krmESj>0YUSK)k&nc`Ic{m6pW zjM`8ers@6vmIlXXcB^xt1c%d|gG%K_)I@vnI*gj?{ISYJO_Yt{ScWc~ipuEhpjE-^ zcO$R9Eka8kyfoQ;S9NvZeD5cE2AbkhL;BS%Sx~pky|Qlk68ECJmM&dUx1_qr*IIac zAUFP>P@gApao}iTNw\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgid "Wrong password" msgstr "Forkert kodeord" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" @@ -239,7 +239,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" @@ -334,43 +334,43 @@ msgstr "Juhuu! Delt!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin logo" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Log ind" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -982,74 +1027,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 8b3f232aae17f51c6138c7dd5c7a29e323a60554..793fb975ab157d834381be3a632287c1146c5168 100644 GIT binary patch delta 3030 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\n" "Language-Team: LANGUAGE \n" @@ -209,7 +209,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -235,7 +235,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -334,43 +334,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -983,74 +1028,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed " "with caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were " "sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 859a7868a893e1837ce3a694998e910abcca88e3..b5e6398b54e86a81458ae80cd6e333d4ec1c5ac2 100644 GIT binary patch delta 3889 zcmZYB4{%h~702I)F@K0gVjvKj3YC~81|pluu8l;= zIzozIEtFJk0+gXPw8asTRbePr#a3XZb%v%&8Aj+>rB0!p45g@Pr}X>F+Zp?Z3HjW6 z_q}`1J@>q~dEsT(xmR4Fi=$(nGyZ+V|8)MxxYhgW-_<0uiFE&hlhKoGHXCPQF+PB| z;T}xIS1}$>qYKaCC>+E;;vaAh{_+;HT(gjUP9u|n%v;T}uoky+=SEyW-!LCI0Lt$?mLXBtZ&C@Ov1C+g+n+8*N=53 z`XLgV4In>uj9&`iebhpiP@iAM82l0y(7#agCUP#fV-}`i8ESkLhICd>&`_#+P!oI~ zb!L62nmB;k!Mms%FQATW7?tv=e5jqx#_{-doQDC_ksUDzk7r+nI|MsN(Fx0_?|)IEV`9J_8Ox=Y% zf=c~i)KQ(lRt$YgLpRov53*}MR0_LMJ2;A3_%!ao4^SEKu}!764YlKM^GnwqKsU39Ke@Qk=9Ld9=k5grhgcfnU63JzraSENg7of zJ*b_2hFa)4PQx$pUYtm$0$Z_?`m7}5lf)6i4!UDSnpaV8$e<@hNs z#zF?~#w|D>Ph$z{SuBK7+>D#>33PE@G_4z}@F4EOYv{wC9P&>+*p(b7RUY!F>d!~A zWi_}E1E|Okp(Z?q)UEvum9Z4It9jZn3U{LB>BR&*h}!XMsEnM5crus#>w?n^+=aiz zAGoOe*-i$2MulZC{yStX8^&VHn&Sl2ioC1rDU8Q{(GlUaSU$6Tku)bmMY9xA{O zQ5pOz>N+>)rwoQB(ojkYkw0|m!k(;P(>O*1=xwoP&eL& zzd-8I22q**C+fWsw_xP444Ick7X#%;aP}6e+Hasz_zzUX@f3n~HVL&*9_j^EfV#dK z70?nKhmDwq9g+UCsM;Ao)xud!*7JWpGVmE{!XeaC;G(1_<0RA(Ey7HE7?W`)k{sKI zQ}G;@<1p$-ii@0uYEgkTpyqoBmGRA(#QL_4Mm@fODzdAn@d;Gq=eQd;VDBR5FQTYo z=MR!1Q4_q1Dz=lTh2KL3bQwpA3w3=QZz(O5hD!Z3oPoLc7_LMwp1nKd6v;IPC`?P@ z098DdsN!3VyKz0L=-d^~=gFwlPe&DH1uDfWBjf8(0dK=J?8g{<9hI5m$f??3h{iG+ zDV5H*o)7h+@Klj*T!gBL$59I%L^f$}Vkhdo{Cju|wbQz4XXmSM8vV6+KW>kBA!7DD zPK|^%(NJ;qBQHNoxYvnr0oKxAigoxSRAAR}KW6fBn2l#p0S==wl69Z+v@Ax3tONV; zE!6ytOZe8q?MOyLc7?_|2CiWeu42__T#rhb9}_T$s_Jgcz}@J@cTi{hF)APr+l|E{ zR0hgW*RMq#;df9+)r+I`oDI;>#K$lTKR~i;H&I7W#rEYE)MNGz=Hm_2^Pj!c?C;o& z+pv-I%*IcUAxq)e-lxy817nsuk7Xxju)aMAbmHv)L)&vb&{6X(V|Dzq=_BDY(r@y1Q*eW~x8-n4SarLpIn%4Oq z3VIj&T3a3t_J+~}iN20NJ43DC@`Z=etD>S?n|FGk|A?n|D1Bx)zid@h%rXV_z4C#C{|{>JlJ{d9d`-mVs(s%5Z;Wd3 AyZ`_I delta 3619 zcmYM#3rv-D7{~F4iyQ&b1i6HvM{a_pA;?8ExhklsBw}gS#1NwuD0oHdc*}d49??Wy zb49aUu{>eT%PeYbnO$@)O*gfv%M0taxvo~7!(P43VsH@l#5@eZBJ71F zcoi!!6G!whd(g~d^B4?fVi%_430%)NZ{kRf7xZ-kA4C_&ofw2Cu|Ix=_uwrg7yAp9 zP-vtX_p$*PibF9Lb5Yk%=|1lR)zCr#f?HjS{y2|VOWOwvF!f?3|2GoJhtOG97?)#um@4^$ER@w z?m#u+=a`2#aTzAEEQYoh)vSk+D%)99;x|ye;G$t@D~myGO=^GY&p8{XU(w&EA8!+5@=>(`?8z7T(S3U8nS{^_5O;v(J1jaqpQYHvs3qqqj!@FFU~Rc_}gdK(|m z^M8ebDiATqY&fRjOq_}8feuvD#8E%pAQ_V|9Vg->9E-bg99~9>V5wYGk0nT3*&$To zC$SQ*;$-e`xyjv`*gD+L2_Fu_suWg*Yf%B)FdaK_8g}7IEK2QulUXOu=J;3aft7>J zp2Qg#j31)5?l`KFpJ62TxAP2?*==-VFm-wmQ&2aqLY;3!7j8y1kr&m~Z=$a2z#(`B ztMD$CVypzXEMwA`lOt0v*Iq>_n~j6sn|W{a)~& zzk&}je+yp?pm!*nD)4az)x$32ltt251z3biXcej_T8C5ro(v8#!T0Sbs@sp_&v+6u zHP1&D{)jBX5;>rXR)PAlYQ{p21GAkKmY@=^#t^JSH_pc>+=hA)wRspsGw8rb{K9|Y z5-P(VQ5lEiIM)qCl`tE-n+(a(W?(UH#)t7MEX4k7xSsb}*cYF}aP(l1+{{23Zbg-7 zC-S>v-y;2Ew^3WsFVA@|48SCg^RO9bA@{O#s4nk4(y3q+Msw^&Ei4ChpYf=KDv;|v zR?R>e)nY6*qTUCa{Ksvm<~fck=}o`CpaT7Y>i#e~PQ5f3wKZip7#Cn~+>NZo4qzf) z!BRc{K|BK5i*nQr9zzA1jS;vK^}N4~YNo5m*DP{0zvZ|c>v0pENG|pVPQa`&&X3Ov zs2{I=*o0?L36CpaD;4M|2HKld*dM*9MA|V9KS27+zQKVQTeuF*Z{qJ~G6E&jV{okW9>`Nz2 z!6EnvHY4vKJB9o4U(CS$6P*OlpjI5fOCTNHsQ1AHK3Z`XDt_i9=f}!3hd~GvpWrii z5`!^&va@&jsBSIA6s$%!uE#VyfJ)#rYNdf>tLsuxaUVu)MJ1|ob5Ze@A_;n|g#lHw z6R1+VsFN&3JvOV5m!KWSTw6aU6s5IG%}vuoDCE8tQTS0mJYgbYbXpXYc!BILGlA zfvGqLN1!F9G$p#LYifLVB3|j~+Yyr-(66C!Uc*B7vW7*C?)lYCO-mXYYYKdqVyE@+ z7A7q4W|XA)t|ue}`dseSJ-vI* zhJb;eZdl}AT<5MO^xUSpCdSqE3ck3ZabZJ!fp5cTSBQ6C@p@lI$%}#BsT1RTXU1*` O_0FGi%2!;`;`$GaMz8Sz diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index 690857b8..4bd19dda 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -213,7 +213,7 @@ msgid "Wrong password" msgstr "Malĝusta pasvorto" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vi jam havas kolekton kun la nomo «%s»!" @@ -239,7 +239,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Tamen trovitas — kaj forigitas — malnova simbola ligilo al dosierujo.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :(" @@ -334,43 +334,43 @@ msgstr "Hura! Alŝutitas!" msgid "Collection \"%s\" added!" msgstr "Kolekto «%s» aldonitas!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Emblemo de MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Konfirmu viecon de la retpoŝtadreso!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Ensaluti" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Funkcias per MediaGoblin, unu el la projektoj de GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Просмотр файлов пользователя %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Bildo de «%(media_title)s»" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Aldoni komenton" @@ -982,74 +1027,74 @@ msgstr "Rimarko" msgid "commented on your post" msgstr "komentis je via afiŝo" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Oj, via komento estis malplena." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Via komento estis afiŝita!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Necesas elekti aŭ aldoni kolekton" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» estis aldonita al la kolekto «%s»" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Vi forigis la dosieron." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Vi forigis la dosieron el la kolekto." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vi forigis la kolekton «%s»" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 9dc7a9b3ef855262a9f1e9859510e8256266905d..bbc0efb0661430919d9324ebb663fc431cc8d677 100644 GIT binary patch delta 3885 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\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" @@ -221,7 +221,7 @@ msgid "Wrong password" msgstr "Contraseña incorrecta" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "¡Ya tienes una colección llamada \"%s\"!" @@ -247,7 +247,7 @@ 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/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Lo sentidos, No soportamos ese tipo de archivo :(" @@ -342,43 +342,43 @@ msgstr "¡Yujú! ¡Enviado!" msgid "Collection \"%s\" added!" msgstr "¡Colección \"%s\" añadida!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logo de MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "¡Verifica tu email!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Conectarse" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Proveído por MediaGoblin, un proyecto GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s's" msgid "❖ Browsing media by %(username)s" msgstr "❖ Explorando contenido de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Imágenes para %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Añadir un comentario" @@ -990,74 +1035,74 @@ msgstr "Incluir una nota" msgid "commented on your post" msgstr "comentó tu publicación" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Ups, tu comentario estaba vacío." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "¡Tu comentario ha sido publicado!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Tienes que seleccionar o añadir una colección" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "%s\" ya está en la colección \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" añadido a la colección \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Eliminaste el contenido" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Borraste el ítem de la colección." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Borraste la colección \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 6aea46885ff9a343c3f69ee1e390fab483e8967f..155ccd223a8b9a1d8c00552fbb4fb242161b7fdd 100644 GIT binary patch delta 3924 zcma*oeNfd^9>?+TRUYI)4HOYY_o^u(Az}g|xeD@NhM0;vVe5#?U6xWV3zWlM@iw|< z4$~92EG)NiOEO8qZmGjq!)A#!TT_}@>nO~aPK|A2T=YmpWYSoi6|R_^>C9f9Lq0%>S@R_5SnktD$D&=>7wLg)zg-W?&l5!@F@L zK8vI9AP&J3=)#XM7Ej>??8lk-_HeTdGrxULBZUhoH<_j465P&{O_)pH74Hn3hl*_( z4#o-`i))Zu&4eFNY7&92ZG!G#+bjw9$~V-haJJ8==V zVHSRl8ej~wXy7!A!7Nl@`51vkI1x)x6MJzgZbv=Wg`=3?x@nBZkI;u#a3UTvbGRBb~I@C0hl z+E6voj#|Mn)PrYHTlNDg3y`Cb67ZScEE0AI`>I*o3E00WGFbRK(TD?%6ifLfXcX zf35ro7pOz)MeW%c{ya=Of9ma#SGqqPD07D@zchquu0LS^P0X5uxhz-gpWwXqGg z(l1aGUByXw9q+(#bc(PBi>W_*g$CKSe_}0;xY?=pEvOaj!sQsmGK`$;1hNwM(BF#F zaq<*1HE-iaEp7pYtO4wbPumaB2FROdUXW-M;kG zAiEaFYfQg-d6-N8SeCPbpHY#I%yw!a8F?p}8+ANyL)FS+9Eq!O7}lW{=0^p%19ktN z(D$$62z~!o8cNA&TS)>5oONcsg>@EDsZL z4N{MGKkB*Xa1_3Tyh{AmL&L{~K2(Y-Sbj7f%8v81H6ff_!#OGoDF#mwf6~>xc00VmAYEg%C=w< zcAzr&4rd&%hlwdw`GHeGP$3u7qo2g7~#fo1$D>;Ic ziG7YL&Lk?5@N>8B%{u1@vx2R&(+e$SNhYEBY)?hK}xvm9%r$~--K`HD* zJvh41nK%_6rJs$O_&BPV-bY>qb{&=Kv?6E4MW~`%g$le5HBmE$VIbtws4d^^r?HC0 zMcj*X*#|{>0kbfcyY9pSq#P`Oci@LufyoP<+SrI%>EBVO=MqlBZ&3Fq-0uA9RU$*% zifr`ThfgK=l??*y0H(Z;ZL{%Q^-5nvu30$>^Rn9^itIWbL0WWLc48{^XNPF0`ulMTevfl-JW*ugU8n(DP*r~z zyYMt>pa)kvzk2PcabChG?7>KU50#OVAwLa$e;y-vx7ZgegB3%c88WQUyRmk?x3bE; z!CU27AH13{*)^qRy~kbbt=~}DXi)8KbT@hLt9RE`HZ*MX)>qB5;(BjwV=z6jJUn*Y zJ)Yk-x)*wCs(;@Y@FzD!d+HnNxKwk$CwL{fWYFN6Do@Z`*x?HHyFZJ#$y;5`;LE&? zm5m-N_tpgtr|cP2QX0rE%L%qjjgO4Xac9n)Gb=0bLdFEOXV00H8T?zuk5MCk8K@Oi z)ihe*+>*rLh1^;HZ^(i4#4W)Cc_06G*!i1&8TLU}VE=;NQ0POW{x@ph;vS+7W|wtE F{u@eI36uZ; delta 3625 zcmZwIdu+{T9LMqRsn*ezx>PUjM^R2utx~-(t?Rf>+xz2plKnHO^Ln1=_xnB1_xV2G-#I(? zxqjK>@?Gu_zRCF4#Q(1RuWzZ|fB&9uW7duC3)lmfVk&OKk$46>V(VzLIP8h7FcV#v zhpjOmui+#dj6>R*4KnlDD>V8tum!#NCBDs*H!+L;{Pxbod(ch45nJGC?1Ja89o|A> zv4^ODB0HF|mUYKS9EkBa40V6uEn8SdE%^ z8%ALrDzJm7Bp$&;tVb<;1^eNB)N>x9jAMOErqLbquo`FJU~EQB6dh|u3>J(0SwB7$ zz>}!!g{bROF&xWL0nJ6tTa5|06+7dh(D+&O>8$S1(1Z6-XY~M83vLcnk@rSTG#qtQ z&!JLXgWA!0?1U#U1DjAs6~)7vHwKx~5>SDq;8@I#=lloISkAy3xF0XzK*F7c5zN{j zU&SG~5mkiWV3h#;&&{^&OD_1SD?=RLsZ6ssDSUF*7H50 z@ji_w$dh*bAu5%%s2!d}-PnxU;SJP;4?^QH+@ys(sGVn^&Nc_9VGY({Gb+HhJkDFR z8wcq9ze+jN_z1^g5mD#kM>q_xVlF0dvoD9nbQ(3d3726f-Z}nkGaqBI5jWry99S8Cj2x%6 z80ciA7pj^kBAd5T%*HjSz)zv(yMmOPMUh@*#+yR^HPI>t!f+RAqCFUiji?=;L8Y`Q z6PT&Ku1^pq&SAu0?J1oXFSmvXl zh^jCeSD|*k1r=c}>Ve~->!&e>{?Dk4+{Fz16Lr?fbY@`{GGsrYo^Q>;Yu;`cg?+ID z`qF7=$77H;$BHl>7a{dy@1Y(%hH>~c^6J|~tj7DO3{_@QA6SRHKz0CQ@yAgAHnybS zjx=fEc;v0{SuzbpGzc|u4klm;s%WZ0Qa5g?sS=E*S2l{23}y0q;l3 zz?xCT-R?=}t2Y(Dp&=a_IMk8O64OOs)4XPXTr9qT1Y^hRSxRx3s3=+q3-vi zYGWPQuQd1IKNz;{@D=CHNQ4!a@o~HFF5{HZ))_{2q1xU1TcD8s{9T&qqVmdkW{` zHB?nke%gurH7ufEg9Ug2$72#7wKyMBFoxMZI0`l2OXx*E7UOR8<3Grkr1_t5eyn^4 zXeiS56P@qmuBg;3MHP`BRV*7(wXhSF(&MNqKaZNwO>|m#80va4D&=!fDX+$8T!*@E zJ0|P>uctAEfnSl$+lWHv*J>rsrGFZ8F^l}q!D_6*8@LQ-KkL-MO(eS(JK6cMdI8Jm z|AwmmsiaXES%fO)PccdF|1lcb3|vMPQ77`%A19!yc`+WqO{j^+5N#N~jGCw%Bhim; zT#XU9A>;?4>z^QB3API@u}@W^XJ%<>V0T)5@L+V4JGe2fx2t1C\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -332,43 +332,43 @@ msgstr "هورا!ثبت شد!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "لوگو مدیاگوبلین" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "ورود" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s's رسانه های" msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -980,74 +1025,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 6b7cb599ded5a3accfa73c3ee38798f792ac6318..fcef90d89b7c272e5cad1f51fa4514af56220aa3 100644 GIT binary patch delta 3898 zcmZYB3vg7`9mnzik|%_RA&@mBf#n$@&_Eyo6C}ZqhY|#m2%3SA;I3gKvgsz4k}B(f z7#-0v3AHBGX3`Q{aE8#XV;mlxDq5l~%pg*RS^_FM4iBZ4wxT2S`{VA^X`2c8oOAcy zbN=Ul{^u@#4!fRz%@rCL8T}LE=M4YS_!k|g-giHjhMA?)y^P~9VYt~$oQ4Is3P<6K zn2f){c<}00zbxcn2m3ZFv~Iv*}rIHa3SLsvrJrytvtC2Z>R4X=?t8Yimd{p zuo_db2D#N*kQnV5R6rfbT(%bn;~{k85!C%>Z+;#!yFw$03pX$Zlj!7P3YOtAyc;_( z2hXDh7{e?Ycp4^P4l1yP7>mU?0n1Sn2XHF3qMqA_$;@y2X^h3=*n(Fu8y_0&4D@p( zHtRut?REYrfMckM&Z0j56r=GPDxmAAafh%kw_+xa!8=jcS7S(f^(YOcY8z^Rov1zQ zK-I*{s1+PWJ@^4?%f3dXd;%Y8Wiv4a@5fwhLT%X|)VRMz1=feeW{2JEzfyiW^1)dw zrGF8p<7~oy3~TWe4&YjRjajB)3d@;;#i-(J!Fkw;oA3lGpd}QFint!xJ==y_NJlF9 z*UDe#0(EFdP>cIk3@sy)7w*vXKRs2y(TTlbHi9q z`hBRaI*5J@eL_PIE+rpi*LfT={uoc9GT>vGO6_{oil5|b`1>!zK)AfFIG&DR>Tb<4brO?#Fxa6D-4g zE*9YvI2Ze|5Oo&wVIgkC$M8{fv0pT8GnV2WY{M_nhudb5f9k<5&TvwdKps{7IY_pw z9P_XV75QG&fJczJwZEe>mdJ87P9qM&9jI~IaWL*dt@u?`Mh-@NGmHG|hJG&Gf$!ll z7nMKLndmGP#_m``w)3qw8w==rQ4{QncmU(|Jo31GfO;>S!O!t;$giE7?U=+{i*mD) z5Dl_x4XAIuop?L_v|K0ED^QVlM*Ia*$hHTQ@o2>Js0@6AI+m&Ij{?X+H{ON1zYa&? z49TT(NsQ1AY)cr1^9Dxa_B27gFIu41!GH^WBMEZ}T zp6f#$-#3t#YsmgeV<#8B!a{tO4UffRI1*2yUL2oA`qxntB~o!In1brh#sthqWug?v zU_EN(TTm(QK%K5bI9%udk2EyEUr-Z%gdBDI2Wp@(q(#M;ht!+Z;c(o63$P2d(gCbR z6_RS94mEBADzG4GoXw~r?7@-DZ?Di;fxkngZZxBIV>y0DYE@K0x6+6Y=T1@_ViP>9RD8Vl<6?5sR z7Ao)s^r13x9VcLHsk7&qs1z?oWyX(Fa0_ZdyCeO6jHdquD$uLA2EPr_SWaVgne(mJ zi(ImM?{dDSUP9g(_A&BKGWXri8?g-i^tWOoUPi67X0bC-15TnJK)u3uVkKUPxS-tG z>QEbv2l=2Er(^OGCj&)TM}G~j!Z(omv$6L$#aV-#ME>L8d`;)0GUG*!(~9fxRcyud zWzIr+u$KO5WGh3K$MRdaP>93u07l_EsFWSWM0^i*p3kEPZ{S4qRPfb{i%?bGfDCM1 zI1YPITlzLC^&g@eFW@Mh|3TzMRqw_uoP$cK7i;k(DigU?P6}T@%ET_={g_RDx8rtv z8dEsSl!^TkmHG?Vg@r54HsU!{jof!18DV}4(NGbEF&mE~*|lg!_h2Q?#AZ~Ad+I2Q5O@T*(p2oVSrj3E1x4=q*fep>!8Sbi>p=%p_ z4>WtqeE#}%&F!JIrXjvyQzMuBKk$XGq?Hbe@_T*ZoN-UY-x8>=XWWWFb6vB~ssfGe zeHqu@EMd>3we%lxS^PH^4xJ7b3}{jccqigpZH_Mh;={YBAHQI&pg_}!9s2mgO`ZOcx? N5L#(@*t`2Y&zn delta 3583 zcmYM$32;qU9LMpKJrS`zULp}*7Li!9Nl1_o68o0emjqFvMo6kAmOd3li$P;af+00A z2Gb6&Ovf^9Gi6#;t(ICcgN~v0wi>ilr{7=hn`tI_pL5Q=_uT*apZ~ot+mCzv?DBBl zXyv`l@NekPyq$B zGKPDZ_85TOFc?!&=Z|VU?lh)=hK+$@^ucmW!S``6et|$RCYBEc&<}Nd z6zceR^v1cUfEJ+UU5X)Cg`s%VJ^md!wO5a5=)z~Hy?TkN1wS@akw>E@>Vw*MVO3R zQAPL-_QLyEhLJ3brrCum*5gQ)%_UUe_fWOqN5N25#*W&Wm@x9sF*Ae#MO=u=$b3|4 z7o$?U95vx4WN~I6Dv%SXt+V-t-g z8My0X_wZfCA6YEhcyoZ|brF-1QNxG2(wel3y-lpROEXP``M+NwK@r9zU@T6?$*3AQhANs6@~0a_V-&{WFdTt{unM#BCXxgb!$}J;3n?pe6czY6 z%*ER{lKY#~=*CFQ8m!@f3%ldEj;sn-qb97yIIP1we1t2pe@x?>%+z54{io=Ixt)xe zj+4+EKSOQZX;dc9Vk_=%uF_Cs57B|%UatI;d)dNRiLVRKkB?=*cpGs zarhbsV=hr=;Vw+YTbPLJ%vz?C|tiunn2^%&WcO%g!wg)Gn*WsBpAyKwKLZaK;Ck~X>N$UgPcR_S zdKLfWwo8&#eAAIEnpLPTtHaovesWJM)eBI8A9Z^IsY_Fb3gC|0f1EUw0b7do*d?Kj z{s>gn&OkesAzue(v%6o5%Frq7gJ&@xz1ZMsI197!OVso3-^)6`E$R&zg47Jcz9syH8G8&n~vZ%5rH4%=da)pwd< zGy)mOMP(u%L(z$Lti~ujfINU-csz#6P*WV9nbTHSc6pjlGG^#v-7h;wnd_xDr*}`>_N5fbH>j)Z^7W%Q`|Mi>7U0iv<9 z%}I>M-;jDUjv?09?G#){{|u^_Q-)ga`~j$pP2=CRbzFiBEEvW zt(~TU#zF?7$666>L#_BZDpeEtV0+DBoPmOfUW_*SE0B6NThK&yERA%`C@ge63)<}O+G>yXXkA<~r}!;LS@Gf$$HEzD$S5sBe{T#n^$HT#pBOdbt{Mz7D9kFy^AGcI+bm{{Yo9uBiY3 diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 6ce86ae8..98b5b52f 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -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-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -218,7 +218,7 @@ msgid "Wrong password" msgstr "Mauvais mot de passe" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Vous avez déjà une collection appelée \"%s\" !" @@ -244,7 +244,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: 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 :(" @@ -339,43 +339,43 @@ msgstr "Youhou, c'est envoyé !" msgid "Collection \"%s\" added!" msgstr "Collection \"%s\" ajoutée !" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logo MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Vérifiez votre adresse e-mail !" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "S'identifier" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Conçu avec MediaGoblin, un projet GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Parcourir les médias de %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Image de %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Ajouter un commentaire" @@ -987,74 +1032,74 @@ msgstr "Inclure une note" msgid "commented on your post" msgstr "a commenté votre post" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Oups, votre commentaire était vide." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Votre commentaire a été posté !" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Vous devez sélectionner ou ajouter une collection" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" as été ajouté à la collection \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Vous avez supprimé le media." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Vous avez supprimé cet élément de la collection." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Vous avez supprimé la collection \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 822c33757f714b81409651eed40d0b17586015d7..2db7a9a97d2ee4dcb774618f04c3b12685dc3887 100644 GIT binary patch delta 4776 zcmc)Me{_xa9l-JLjl?A)5fMS89`Pe0zeD0zNJJt*2$C}9*LCkB!p(hh?tMaYgWIlt zY|~SYTQy2oZFT5svD>4DmX=~?tJR#%Y{!por5n~V+f29V-k&_To0*;cxtzGK@AtXS z^ZkClpYP}U#PtKVyN7LoOI;&3D}FBWuQ&f9?b7?#&&|$CrO^F7_Q6iEO66h(7ULZ3 zhTE|_?#B*z8f|zMWAGgQ2CrZ~o`_Q_N2!3iOCya7X1lg&7SzOAb@@FwJpw(kQ<-J+4eg)cA)6X+CTPprhL zI1#sE0e*}!Krd#IfitiZ7N7(+7TaSvreYP!#0Cz+btuoZVt3|OhiE*8XVH(hFdvsD zS_8d^#HMy3zv>_#62KXhi7umje+?t?9!fy>QO1pCUwU9V_QFz>>vJ(6d$odwq-qVy z0MDW9*;bUAcnxI*$59^q70Q-Uw~*M>@g(+N zQhp))#bvCZe*-gd2w|_p1$Z7W;X*vXEE(971Ri%ATD^o>iZttRRszNTyOyQa%tRoIVZhCEnJKFF@pQBt@HWd(1cOne$Q;LlJpptDR#ts7;< zYx$7-UPD=N2xYwY!`CmN%yR=J6E>~QfND=e_Pi6$#2Va%ucJgdt*>?L{Fq6<6(utl zF%SQOvvDwKl-gK>veMt8O!P3L& zLpTNP1FS%1;7S*LsFa4aDC0F@I&Q*RJc3VRd|KO^Pi?{l%&*>~5rzF&?mSFK z*}Jb}JA57^aT|8PZ=OtMevQpKFJWBN!AlXt?I1+s*k?%tp@Dx(F>JCcA;#sbY(})qc5oMepcEr6XD}ECt zBS*r%mqY&LhSOXajX%Y2*{J+n>saog!q|58W0YdM&4*;5U%r*8I^;m8)z|@FK^|A% z#TeX&f5OAaui8Jv%G}2&FRtDJKFO|{hR1la1t-uiDzpMvixT-BjK=-QJ4qcudGY)L z@~Ch++kqy=TK*P>)(Gs-}%;r>r>5dG`e4HL?(Q!@x7 z=}$%}#_1>%FG3EOdZL{Cccrn13j^>7a>CTFQQm;v##;}jhAl)nt`kvCO)bh+tU|f} zIh2WBMhW}?O6uQ5%1eEKPhbb$MydEz1^Mqs<5ez@1a%r^z?e!a1F85D{T%FoAEMO2 z1*9xg3`a(aaso<Wcci{l1{=N->v0W!f|A;X$=1pPD5v0?$dKxlu%9Bgsu5JKY-M0A4G)c- zC@bqyZSBoCTteRrdl}hYHF2u-S8oGKAbHcQ6&sjFe>+lt>I8bxKAj-YkG!K)R1HTE zi!fTw{|*}8;KFX~jQO?JU%e9K233Y}SdD#fK57_1DZ-aUyY&-XYQ z^mJcQj$=%kPjfh(Mw7=>!G_$lU~yb@=$*KXi1tpi-thQ>pTv6;8gy5^Lo*G{X}H~b z+ZUnQuA^;n9!>Xp4Xx>5*DW@KXL^tB)~I_O60GK75Qp1sEZ1GZjwz|py4Tkz;V#od=_wTv?dn~6 z(9`GjfL7*Mre|ssG^fLpW@>J|ZEnqFXy#&v*|#XCaZFL;m{~@XwwN0=(_62*G+940 zEh1#ip)G3iwB@1g35i^Dc=ZPZ;Pz~-QXZEt7wWo)ahmHrb(-1N(8z*r>JqHhU^s`WZNKDWa(ydyQ|a(&@KA}tCxN?c7ov)So3nq1jz zU#LgU4{Q(C+5Ox|8wHh;_{drd+VV$+TJxWYu#XMb*{FgoNn>49$Rld)Y{5siE@K}q zw*AAZA`-`Wb&{byRC9kDar@z#yE*cpt?T#)ithZL^Dms=5 zww2xguDYTLrBT6E{d)x$^iO%P`hu&bbPxS<%8iKl+W#oQ6Von-OYrFQmA&Q6IR0B5 Qj;eXn{?9u6boPpW0E(hJQ~&?~ delta 4359 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 In-*>S4{QAvg8%>k diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index 6c8ce5e6..c953cc03 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-09-24 14:01-0500\n" -"PO-Revision-Date: 2012-11-21 16:56+0000\n" -"Last-Translator: GenghisKhan \n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +92,7 @@ msgstr "לא ניתן היה למצוא מישהו עם שם משתמש או ד msgid "You can now log in using your new password." msgstr "כעת ביכולתך להתחבר באמצעות סיסמתך החדשה." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 #: mediagoblin/user_pages/forms.py:40 msgid "Title" @@ -103,7 +103,7 @@ msgid "Description of this work" msgstr "תיאור של מלאכה זו" #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32 +#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 #: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44 msgid "" "You can use\n" @@ -119,11 +119,11 @@ msgstr "תגיות" msgid "Separate tags by commas." msgstr "הפרד תגיות בעזרת פסיקים." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 msgid "Slug" msgstr "חשופית" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 msgid "The slug can't be empty" msgstr "החשופית לא יכולה להיות ריקה" @@ -162,20 +162,20 @@ msgstr "הזן את סיסמתך הישנה כדי להוכיח שאתה הבע msgid "New password" msgstr "סיסמה חדשה" -#: mediagoblin/edit/forms.py:72 +#: mediagoblin/edit/forms.py:71 msgid "Email me when others comment on my media" msgstr "שלח לי דוא״ל כאשר אחרים מגיבים על המדיה שלי" -#: mediagoblin/edit/forms.py:84 +#: mediagoblin/edit/forms.py:83 msgid "The title can't be empty" msgstr "הכותרת לא יכולה להיות ריקה" -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:43 msgid "Description of this collection" msgstr "תיאור אוסף זה" -#: mediagoblin/edit/forms.py:93 +#: mediagoblin/edit/forms.py:92 msgid "" "The title part of this collection's address. You usually don't need to " "change this." @@ -189,33 +189,38 @@ msgstr "רשומה עם חשופית זו כבר קיימת עבור משתמש msgid "You are editing another user's media. Proceed with caution." msgstr "אתה עורך מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:156 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." msgstr "אתה עורך דיוקן של משתמש. המשך בזהירות." -#: mediagoblin/edit/views.py:198 +#: mediagoblin/edit/views.py:197 msgid "Profile changes saved" msgstr "שינויי דיוקן נשמרו" -#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 msgid "Account settings saved" msgstr "הגדרות חשבון נשמרו" -#: mediagoblin/edit/views.py:252 +#: mediagoblin/edit/views.py:251 msgid "Wrong password" msgstr "סיסמה שגויה" -#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "כבר יש לך אוסף שקרוי בשם \"%s\"!" -#: mediagoblin/edit/views.py:292 +#: mediagoblin/edit/views.py:291 msgid "A collection with that slug already exists for this user." msgstr "אוסף עם חשופית זו כבר קיים עבור משתמש זה." -#: mediagoblin/edit/views.py:309 +#: mediagoblin/edit/views.py:308 msgid "You are editing another user's collection. Proceed with caution." msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות." @@ -232,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "בכל אופן, קישור מדור symlink נמצא; הוסר.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "צר לי, אינני תומך בטיפוס קובץ זה :(" @@ -327,62 +332,43 @@ msgstr "הידד! נשלח!" msgid "Collection \"%s\" added!" msgstr "אוסף \"%s\" התווסף!" -#: mediagoblin/templates/mediagoblin/404.html:24 -msgid "Image of 404 goblin stressing out" -msgstr "" - -#: mediagoblin/templates/mediagoblin/404.html:25 -msgid "Oops!" -msgstr "אופס!" - -#: mediagoblin/templates/mediagoblin/404.html:26 -msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "לא נראה שיש עמוד בכתובת זו. עמך הסליחה!" - -#: mediagoblin/templates/mediagoblin/404.html:28 -msgid "" -"If you're sure the address is correct, maybe the page you're looking for has" -" been moved or deleted." -msgstr "במידה ואתה בטוח שהכתובת הינה אכן נכונה, ייתכן שהעמוד שאתה מחפש הועבר או נמחק." - -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "לוגו MediaGoblin" +#: mediagoblin/templates/mediagoblin/base.html:54 +#, python-format +msgid "%(user_name)s's account" +msgstr "" + #: mediagoblin/templates/mediagoblin/base.html:60 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +msgid "Add media" +msgstr "הוספת מדיה" + +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "אמת את הדוא״ל שלך!" -#: mediagoblin/templates/mediagoblin/base.html:66 -msgid "+ Add media" -msgstr "+ הוספת מדיה" - -#: mediagoblin/templates/mediagoblin/base.html:67 -msgid "+ Add collection" -msgstr "+ הוספת אוסף" - -#: mediagoblin/templates/mediagoblin/base.html:69 -msgid "View your profile" -msgstr "צפיה בדיוקן שלך" - -#: mediagoblin/templates/mediagoblin/base.html:70 -msgid "Log out" -msgstr "התנתקות" - -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "התחברות" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "מופעל על ידי MediaGoblin, פרויקט GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the Source code available." msgstr "משוחרר תחת הרשיון AGPL. קוד מקור זמין." -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +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:26 +#: mediagoblin/templates/mediagoblin/root.html:53 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "שלום לך, ברוך בואך אל אתר MediaGoblin זה!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:55 msgid "" "This site is running MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "אתר זה מריץ MediaGoblin, חתיכת תוכנת אירוח מדיה יוצאת מן הכלל." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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 "בכדי להוסיף את המדיה שלך, להשים תגובות, ועוד, ביכולתך להתחבר עם חשבון MediaGoblin." -#: mediagoblin/templates/mediagoblin/root.html:31 +#: mediagoblin/templates/mediagoblin/root.html:58 msgid "Don't have one yet? It's easy!" msgstr "אין ברשותך חשבון עדיין? זה קל!" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:59 #, python-format msgid "" "Create an account at this site\n" @@ -422,17 +433,10 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "יצירת חשבון אצל אתר זה\n או\n להתקין את MediaGoblin על שרתך" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:67 msgid "Most recent media" msgstr "המדיה האחרונה ביותר" -#: 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/admin/panel.html:29 msgid "" "Here you can track the state of media being processed on this instance." @@ -541,30 +545,43 @@ msgstr "שלום %(username)s,\n\nבכדי להפעיל את חשבונך אצל 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 +msgid "Attachments" +msgstr "תצריפים" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +msgid "Add attachment" +msgstr "הוספת תצריף" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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_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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +msgid "Save changes" +msgstr "שמירת שינויים" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format msgid "Editing %(media_title)s" msgstr "עריכת %(media_title)s" -#: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: 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:53 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Cancel" -msgstr "ביטול" - -#: mediagoblin/templates/mediagoblin/edit/edit.html:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 -#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 -msgid "Save changes" -msgstr "שמירת שינויים" - #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" msgstr "שינוי הגדרות חשבון עבור %(username)s" @@ -590,13 +607,12 @@ 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/image.html:23 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Download" msgstr "הורדה" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 -#: mediagoblin/templates/mediagoblin/media_displays/image.html:27 msgid "Original" msgstr "מקורי/ת" @@ -623,6 +639,56 @@ msgstr "קובץ מקורי" msgid "WebM file (Vorbis codec)" msgstr "קובץ WebM (קודק Vorbis)" +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#, python-format +msgid "Image for %(media_title)s" +msgstr "תמונה עבור %(media_title)s" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Toggle Rotate" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +msgid "File Format" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +msgid "Object Height" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" "Sorry, this video will not work because \n" @@ -647,7 +713,7 @@ msgstr "הוספת אוסף" #: mediagoblin/templates/mediagoblin/submit/collection.html:30 #: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 msgid "Add" msgstr "הוספה" @@ -691,7 +757,7 @@ 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:50 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 msgid "Delete permanently" msgstr "מחיקה לצמיתות" @@ -700,7 +766,7 @@ msgstr "מחיקה לצמיתות" msgid "Really remove %(media_title)s from %(collection_title)s?" msgstr "באמת להסיר את %(media_title)s מן %(collection_title)s?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" msgstr "הסרה" @@ -726,12 +792,6 @@ msgstr "המדיה של %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ עיון במדיה מאת %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "תמונה עבור %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "הוספת תגובה" @@ -758,25 +818,20 @@ msgid "" "

%(date)s

" msgstr "

הוסף בתאריך

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 -msgid "Attachments" -msgstr "תצריפים" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add attachment" -msgstr "הוספת תצריף" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +msgid "Add media to collection" +msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" msgstr "הוספת אוסף חדש" @@ -847,43 +902,27 @@ msgstr "עריכת דיוקן" msgid "This user hasn't filled in their profile (yet)." msgstr "משתמש זה לא מילא דיוקן (עדיין)." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:125 -msgid "Change account settings" -msgstr "שינוי הגדרות חשבון" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 #, python-format msgid "View all of %(username)s's media" msgstr "הצגת כל המדיה של %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 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 -msgid "Add media" -msgstr "הוספת מדיה" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:163 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "לא נראה שיש כאן מדיה כלשהי עדיין..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39 -#, python-format -msgid "" -"
\n" -" %(note)s" +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +msgid "(remove)" msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47 -#, python-format -msgid "
(remove)" -msgstr "
(הסר)" - #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format msgid "In collections (%(collected)s)" @@ -901,7 +940,7 @@ msgstr "ערוץ Atom" msgid "Location" msgstr "מיקום" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38 +#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 #, python-format msgid "View on OpenStreetMap" msgstr "הצגה אצל OpenStreetMap" @@ -940,6 +979,32 @@ msgstr "מתויגת עם" msgid "Could not read the image file." msgstr "לא ניתן היה לקרוא את קובץ התמונה." +#: mediagoblin/tools/response.py:29 +msgid "Oops!" +msgstr "אופס!" + +#: mediagoblin/tools/response.py:30 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:44 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:45 +msgid "" +"Sorry Dave, I can't let you do that!

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

If you're sure" +" the address is correct, maybe the page you're looking for has been moved or" +" deleted." +msgstr "" + #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" msgstr "אני בטוח שברצוני למחוק זאת" @@ -960,74 +1025,74 @@ msgstr "הכללת פתק" msgid "commented on your post" msgstr "הגיב/ה על פרסומך" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "אופס, תגובתך היתה ריקה." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "תגובתך פורסמה!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "עליך לבחור או להוסיף אוסף" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" כבר קיים באוסף \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" הוסף אל האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "נא לבדוק את רישומייך ולנסות שוב." -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "מחקת את מדיה זו." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "המדיה לא נמחקה מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "בחרת למחוק מדיה של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "מחקת את הפריט מן אוסף זה." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "הפריט לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "בחרת למחוק פריט מן אוסף של משתמש אחר. המשך בזהירות." -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "מחקת את האוסף \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "האוסף לא הוסר מכיוון שלא סימנת שאתה בטוח." -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 11f51e127e69cbc0eaf8846f7344d6996150f588..488d8dd24025bfbae6a3ea1f1c80f301daa856ba 100644 GIT binary patch delta 3888 zcmZ|Q3s6*59LMpq2rL3(ih`iT;tK%{Uw~jHQV0t9B+N&Sq8pLOnrsg?Wi=x$8Z}l; zOe@FK)G}%vF{7r@3Tv{oGRJY0n$&ExG<#{&Xy2cAXPT*r0Y2xPz4x5|`Jey2yL+qc zr|mZH>CVAx4L_&&>%m{JUA=#PE_N^`f$oo(h!Ii748$}Xi8HVZZp0XT6T|Qj+VChw z;+OaxeuIPYgO0|e8{;*9&`4$=`4(eRa6B&O&Kk_7Z|iJLJRB9iV{upL>nDOe30s8yJGobTTmx3vmLD#YW7)GpGsTSw$14 zVFYHN0vm;)n2$ZN7`3nq`{8obeN7m{`er|kTk$A*@G=g@d0nlEUPNLuTajP0kADi_ zGt@$DsL#(~FkV9ibR9KsIOoz0Q!pO$P~-QZS7)_|hEi3BnqUp;%o{S9<8UfwVm0c>cB1Be3l&&15}P>~%lRwiCjuX|VFCRM*dK=w_F|lc z$MH0l;a*lr!#K7x6!THV>A_*R0c-F}R6uuAC@SJ|34N+k(3wZz6r7A(aThAmiAmOD=fVE;n^2iKg@f=aPQz5vsM@GQ?esiqpV%-4pPd%6m1FTdzupJKlrJNK3#2>EvG*9AaPueu3+4RQ^C~fgMzsCT>NB z%=b7FyA8I!WbQ@YRc1bhVI6Y2S&5Oj8o$F$$gf#C#5$Ti$f=t%UK(WAMDiNbw_YY@ z(|<3++QC&+G`U-M6A-GKuhi={{mW;1Gnayd5(sMfhJUn(%60|&cu%B#IE=-DuDXH=Nqvz{Vk}cV=pS8caVuqD|W+ksQ1N< zz<4|brK8HmC_VpqG&I3P)R~o{o`N~39V|gjxE^(8&8UUjP&>PVaoC+lKpD(H9a$x6 zUNjv)rbeZO7YV)csrU#jK>z#4vwQz)rPw6JZk4xQ4>bw zT4$MviS#p3M^uV>L6xI2P=m^BEo#1c)Ou@j$-gFSWc;Ri#5v)qnEJGE!_Y)dbG`>ew zdugGygDRX%e>slBlc+#a$5`KbQ}8zW*U*9ecv)z|F_?n)V+pRtC3qIoHBL0Ma2xD88l`B zQ1?&8o6mnG4MqMqrs8_M2M;2fHgRm9Q!-_kh1)O}Pa{vNNgQu|>rKZ+^xH5EXH2lp zcm+1lKY~u2GtsJ@k1>V%Ge6K!^+!*#zV%WuhyFxVqBl4FO*ce7+6CM({xs4d43%KlCR>ePxfj%k^kgrEB(F$9&gZXQgjy z_A1}9n04V5l}^WK*TVU;-M*zcu_2=ux~km%0kI_^k!24$=eQk(&WiE}+&*uQ>Tu`6 z>IDo{JmU0U?oklbu41m!zbo%jkiU1&wIR2-%FCH*lFL2Y?KCB>1-|Cw%|Qjlz7s`R z{`!8M?e;9kpussqGkmY4C#gLwXXqgRr|B!(|0^>8)a+E-|Akc;>~FiHtL@*hRrsdo XcKDz8>cjpU+R&mMgyug{bS(651Vi+7 delta 3629 zcmZ|QdrZ}39LMo5$Q>`J$wkGEh{*B6RZ*c3MFlUYh-P9cIuzX;AZSg~9TF?ayps1z zSy5h^PLH%wuIV`Y^B!-FOz?<;nXvl>Xw5&cuf>n0_O+!AsZ;uV4f|Kw`0H zsDMH{nX#7jz)&23Q8*ZN|HRho9z~Q(YOE3-ZpeAbH#f%uN3-W7;{8Iqg zsOu9^*I&T^T!;#&95wH9jK&?<6_5GGzeA7C>Jbe+_y_8&o}y|Ym;+Vh@u-PjLLJo% zRH|!HJKBUXcoH+P33XKAJgj*;BU4&5DzGHX!^|kozdwyt46MW>coPQ@?pzFH)_%AE z2jT~)BD{!0@IEfXIJQO8cB6{*OC-zIgbKU`RSUrs3}t1JsG~{fM*g{GV;E4xrKpT7 zLZx;oDzz(66K+5@XP=+~If*)o+eqEnL)4C+qcZ7F8Z}=B)Pm8d`La;+Oz_Z90P|1} z)S!xE9jX|&p?0(fmBLe~39q7#;I^;df;x&{aUpi)A>F?kb@n?^8S|n7euP@j^PI*8 z8e!x~JKl*(cvr36{W3<(P|z1IzTKjs$R45#1ISY{_C_r{6?MG|gK;gYi0V;Q{Tb@M6WAB8 z;Z%H%`B+5Mxwsn#<6X?bXm0jo(U?x77PsIEjNzT**S7L64;yhahH+r?a1U~v)@Fc{ zkzS~3E(j~ z^}F~o;}3AVAGJf;w7~fkC%|Up*Z$$(FifGq_)xV|ucC?K4!h@5g(1 z0@H8@|8yjmkyEn2kStn!y7Of<0f*AR!Kaiq5HZLJybrdapNxDYSUN`FL~Ms89vX_M z9NS|pYUi6#5$;AkaNKwO8`K9;6DlJun1PQ`XWg65SS&||>}%BXzo6z-0fa*sDlktZ z4PEGpyg3$+QJ9C+kIhD1UxSgj8F}^X04~RGQ5nh|;(UI*jveT)#4flF6~HIH>&LMZ z{Zq(W;jt?;6w!6m#LXCuf1^GZqR6Yp(@;lMhuVvGxYvv(@>EuMNPaC75OSuVB0YdKSc`P9^p!i;nlf`+i)&cyyR5*HKYve zZ&Y!oQ=#m|if|dej|w0tn_^{sbJ5V5W}_mXjH-pjs8rUVj%FivMK3DgE2xazK;74j z+UYN-`TU1DM;3_+WB}?Y3a}&2LXUP_Nkgezikfg0YQeRr2@j*r{yZvxTd4bg$JV0C zaf&evV;PS?WiSaf-$+!o7oaja0~4_Xyt*j_BgA8;=A8|Cb9J%-WWiM_A^$Kgff*Sd^$zN}_=XsCKW#&SH1s^TOn zPLYqsBAksA(2M=iKi~PXO2#DmSJ8zw#+k1ty6I-)6kLEccm|U-&WA(^ddg`8(fA%` z;SCJHL4>Q+XQEO$4pj>?u{EXWqF;xa@E~d2UHGsG{zVx-Sd+vcA1a zV=4o+$R_MZB5#)J7dD zBL`5$d>s>5-yYD&WT0cAv$OH23Fo1zc@ru#M^Hu9ezNmrm4uoo6+ z-}U*(t8bNPalNbKTysiGy??aZ7*b!DxxPLwYU>LXRb>@RT+1q!R=FzYR9C-IQB^w3 z`%zYYfH$FgTfh38*u~y6v7`LG!LC&y^}7;3^yaun1qY|QQqwcj((B((>8bY6%+w*? z<0zyF(aW+2m*h38h3FR7YSy|Apj!h0$\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -333,43 +333,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Initiar session" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -981,74 +1026,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 1b8a2173a7cc167d27a7845a85c0965c1f9a5a28..b2157a190da1e36c308719a8a274a9023e4bf706 100644 GIT binary patch delta 4788 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\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +92,7 @@ msgstr "Gat ekki fundið neinn með það notandanafn eða lykilorð." 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:83 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 #: mediagoblin/user_pages/forms.py:40 msgid "Title" @@ -103,7 +103,7 @@ msgid "Description of this work" msgstr "Lýsing á þessu efni" #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32 +#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 #: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44 msgid "" "You can use\n" @@ -119,11 +119,11 @@ msgstr "Efnisorð" msgid "Separate tags by commas." msgstr "Aðskildu efnisorðin með kommum." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 msgid "Slug" msgstr "Vefslóðarormur" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 msgid "The slug can't be empty" msgstr "Vefslóðarormurinn getur ekki verið tómur" @@ -162,20 +162,20 @@ 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:72 +#: mediagoblin/edit/forms.py:71 msgid "Email me when others comment on my media" msgstr "Senda mér tölvupóst þegar einhver bætir athugasemd við efnið mitt" -#: mediagoblin/edit/forms.py:84 +#: mediagoblin/edit/forms.py:83 msgid "The title can't be empty" msgstr "Þessi titill getur verið innihaldslaus" -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:43 msgid "Description of this collection" msgstr "Lýsing á þessu albúmi" -#: mediagoblin/edit/forms.py:93 +#: mediagoblin/edit/forms.py:92 msgid "" "The title part of this collection's address. You usually don't need to " "change this." @@ -189,33 +189,38 @@ msgstr "Efni merkt með þessum vefslóðarormi er nú þegar til fyrir þennan 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:182 +#: mediagoblin/edit/views.py:156 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:181 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:198 +#: mediagoblin/edit/views.py:197 msgid "Profile changes saved" msgstr "Breytingar á kenniskrá vistaðar" -#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 msgid "Account settings saved" msgstr "Aðgangsstillingar vistaðar" -#: mediagoblin/edit/views.py:252 +#: mediagoblin/edit/views.py:251 msgid "Wrong password" msgstr "Vitlaust lykilorð" -#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Þú hefur nú þegar albúm sem kallast \"%s\"!" -#: mediagoblin/edit/views.py:292 +#: mediagoblin/edit/views.py:291 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:309 +#: mediagoblin/edit/views.py:308 msgid "You are editing another user's collection. Proceed with caution." msgstr "Þú ert að breyta albúmi annars notanda. Farðu mjög varlega." @@ -232,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Fann samt gamlan táknrænan tengil á möppu; fjarlægður.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: 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 :(" @@ -327,62 +332,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/404.html:24 -msgid "Image of 404 goblin stressing out" -msgstr "Mynd af 404 durti að teygja úr sér" - -#: mediagoblin/templates/mediagoblin/404.html:25 -msgid "Oops!" -msgstr "Obbosí!" - -#: mediagoblin/templates/mediagoblin/404.html:26 -msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "Því miður þá virðist ekki vera til síða á þessari vefslóð." - -#: mediagoblin/templates/mediagoblin/404.html:28 -msgid "" -"If you're sure the address is correct, maybe the page you're looking for has" -" been moved or deleted." -msgstr "Ef þú ert viss um að vefslóðin virkar þá ertu kannski búið að færa eða eyða síðunni sem þú ert að leita að." - -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin einkennismerkið" +#: mediagoblin/templates/mediagoblin/base.html:54 +#, python-format +msgid "%(user_name)s's account" +msgstr "" + #: 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 "Senda inn efni" + +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Staðfestu netfangið þitt!" -#: mediagoblin/templates/mediagoblin/base.html:66 -msgid "+ Add media" -msgstr "+ Senda inn efni" - -#: mediagoblin/templates/mediagoblin/base.html:67 -msgid "+ Add collection" -msgstr "+ Búa til albúm" - -#: mediagoblin/templates/mediagoblin/base.html:69 -msgid "View your profile" -msgstr "Skoða kenniskrána þína" - -#: mediagoblin/templates/mediagoblin/base.html:70 -msgid "Log out" -msgstr "Skrá út" - -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Innskráning" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Keyrt af MediaGoblin, sem er GNU verkefni." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the Source code available." msgstr "Gefið út undir AGPL. Frumkóti aðgengilegur." -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +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 "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 msgid "Explore" msgstr "Skoða" -#: mediagoblin/templates/mediagoblin/root.html:26 +#: mediagoblin/templates/mediagoblin/root.html:53 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:55 msgid "" "This site is running MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "Þetta vefsvæði keyrira á MediaGoblin sem er ótrúlega frábær hugbúnaður til að geyma margmiðlunarefni." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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 "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:58 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:59 #, python-format msgid "" "Create an account at this site\n" @@ -422,17 +433,10 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "Búa til aðgang á þessari síðu\n eða\n Settu upp þinn eigin margmiðlunarþjón" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:67 msgid "Most recent media" msgstr "Nýlegt efni" -#: 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/admin/panel.html:29 msgid "" "Here you can track the state of media being processed on this instance." @@ -541,30 +545,43 @@ msgstr "Hæ %(username)s,\n\ntil að virkja GNU MediaGoblin aðganginn þinn, op 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 +msgid "Attachments" +msgstr "Viðhengi" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +msgid "Add attachment" +msgstr "Bæta við viðhengi" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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_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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +msgid "Save changes" +msgstr "Vista breytingar" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format msgid "Editing %(media_title)s" msgstr "Breyti %(media_title)s" -#: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: 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:53 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Cancel" -msgstr "Hætta við" - -#: mediagoblin/templates/mediagoblin/edit/edit.html:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 -#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 -msgid "Save changes" -msgstr "Vista breytingar" - #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" msgstr "Breyti notandaaðgangsstillingum fyrir: %(username)s" @@ -590,13 +607,12 @@ 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/image.html:23 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Download" msgstr "Sækja af Netinu" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 -#: mediagoblin/templates/mediagoblin/media_displays/image.html:27 msgid "Original" msgstr "Upphafleg skrá" @@ -623,6 +639,56 @@ msgstr "Upphaflega skráin" msgid "WebM file (Vorbis codec)" msgstr "WebM skrá (Vorbis víxlþjöppun)" +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#, python-format +msgid "Image for %(media_title)s" +msgstr "Mynd fyrir %(media_title)s" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Toggle Rotate" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +msgid "File Format" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +msgid "Object Height" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" "Sorry, this video will not work because \n" @@ -647,7 +713,7 @@ 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:83 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 msgid "Add" msgstr "Bæta við" @@ -691,7 +757,7 @@ 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:50 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 msgid "Delete permanently" msgstr "Eytt algjörlega" @@ -700,7 +766,7 @@ msgstr "Eytt algjörlega" msgid "Really remove %(media_title)s from %(collection_title)s?" msgstr "Virkilega fjarlægja %(media_title)s úr %(collection_title)s albúminu?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" msgstr "Fjarlægja" @@ -726,12 +792,6 @@ msgstr "Efni sem %(username)s á" msgid "❖ Browsing media by %(username)s" msgstr "❖ Skoða efnið sem %(username)s setti inn" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Mynd fyrir %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Bæta við athugasemd" @@ -758,25 +818,20 @@ msgid "" "

%(date)s

" msgstr "

Bætt við:

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 -msgid "Attachments" -msgstr "Viðhengi" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add attachment" -msgstr "Bæta við viðhengi" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +msgid "Add media to collection" +msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" msgstr "Setja %(title)s í albúm" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" msgstr "Búa til nýtt albúm" @@ -847,42 +902,26 @@ msgstr "Breyta kenniskrá" 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:125 -msgid "Change account settings" -msgstr "Breyta stillingum notandaaðgangs" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 #, python-format msgid "View all of %(username)s's media" msgstr "Skoða efnið sem %(username)s á" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 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 -msgid "Add media" -msgstr "Senda inn efni" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:163 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Það virðist ekki vera neitt efni hérna ennþá..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39 -#, python-format -msgid "" -"
\n" -" %(note)s" -msgstr "
\n %(note)s" - -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47 -#, python-format -msgid "
(remove)" -msgstr "
(fjarlægja)" +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +msgid "(remove)" +msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -901,7 +940,7 @@ msgstr "Atom fréttaveita" msgid "Location" msgstr "Staðsetning" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38 +#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 #, python-format msgid "View on OpenStreetMap" msgstr "Skoða á OpenStreetMap" @@ -940,6 +979,32 @@ msgstr "Merkt með" msgid "Could not read the image file." msgstr "Gat ekki lesið myndskrána." +#: mediagoblin/tools/response.py:29 +msgid "Oops!" +msgstr "Obbosí!" + +#: mediagoblin/tools/response.py:30 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:44 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:45 +msgid "" +"Sorry Dave, I can't let you do that!

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

If you're sure" +" the address is correct, maybe the page you're looking for has been moved or" +" deleted." +msgstr "" + #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" msgstr "Ég er viss um að ég vilji eyða þessu" @@ -960,74 +1025,74 @@ msgstr "Bæta við minnispunktum" msgid "commented on your post" msgstr "skrifaði athugasemd við færsluna þína" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Obbosí! Athugasemdin þín var innihaldslaus." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Athugasemdin þín var skráð!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 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:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" sett í albúmið \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Þú eyddir þessu efni." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Þú tókst þetta efni úr albúminu." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Þú eyddir albúminu \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 5fca53ad93e2478f80d432e028f36732b05e08c4..cd60d011e06292e1c1a0503c1f4910228cd7c2e0 100644 GIT binary patch delta 3894 zcmZYB3s6+o9mnzi@>&!H#K=Q2u2?`c6f~j+st78Nh=7XH7)?dpYzg2pEQyt0>bg$wROh_~<#F+m)_ zh^hD!jK?$R!gDwV-^M@U2RIu~C7BhN1?}%Na=DP3Y?g<0xQ8dV;a&7yDbBzpsMuCw zG_J)-cpq}Bbs;g@UQ|Fm$Xs>|N8xLjhC`_Phi`ozG`mJ)JQr?aERLr$7c;O5>+x>v z!6N(?H{28;%#0-`*2bZFXvkT|r0o;afqXJq^p{R&`$nM#0)IxeD zk$}| zLsW`?jH;RAs6c;>9{dn_wVIpRHSRoAKnqa!twlEmFsK0@rlC{t1nR~g;0!#Dt8oOY zu!M_?u^Z>%8C--qizQHokKzv8jxP3#rtQQ^Jc9f2Z|KF{`Q)E^u*>;QsuIYfs=o-y zmepV}22hb7Lk&2D)U91dWo#VF)i~`Kh5JzBgm4rdL9O@|R7OrjJXt{gb;B7hEWq>l zoQujYbS8L_3e&(t$R+zTmSXyB=h%K7c~{xP7>^<3aXW}(uop-0DDrFHztfrL6e`0} zL0(^E*YZ){dX0D&{ox{KFEi#kkr$&TC`aB&whVPVeRvywE8_Q1wedXazE@BI{uY(N zk8mow*gqZL;4~Ua$pX~Gi?IfGp!V!nNGz5z-_;b|C-$gzD87AudD?F_v2{mCl>cKqpU8x3{;~gtVLydJ!awk<>Wtw#^YR=jt6lfo<_X^KR`|R zam1Ub)Fty4@?a{eHs+xMU5;8%BWfZaD)sHC@wcNg)Q3}W!jhm<6h%v%6gHxc&py=o zeI9$TAC-aXrA}?sM{Gl-_B*IRdr_I_kMz%C2K`}-!5b03z)Jej!3vHNjb+$}eORbI zpOQ`6js^HSdhlahh)Gq>N@{VdK1Z!|ZnZN}IZmTriOaABnbQU%{eNL5{b2Ro&bQwE zsN-}2)A1^s0D4n zc-)5C;$4`e^ZyhL-FO&h;4g4BUO}>Ih)CkJKCB$4SfDi&o=*q9iH~4KwzuCV{@rhbojS)hV#=JV#jQJz`Lo_ zQ{`>;eX}zZ%nXe7b_CkF)clY)d@ZvwD!O^IH(WHOJ3iU(^D*v9e`iyt*Bboop~2ik zQI$2}hUwLA_dL(6*~N2;LWc{csy)AW&aCiT1vR7pH@>vu!>)viF9Qr6FUg8^!ns)T w&)Bhb{}s=>W!?V~Pv~0ajPS1V)lN(omNbp}|Cr{~{wB83yOFS>>RxpJ8+l3f#{d8T delta 3587 zcmYM#3rv<(9LMnkf-i^)qHZi)(~AmUvi0ShmMhLKAJH0QjqSHoG}t=CJ6 zt~qC!WG-KIrD%oemTBuknWE@27oxf4<}96~@6YFLG2nBa^FGfx|MNfp^SpPDc-0^F za<&BfY&ZNg@zAU%4l?_qY{0w7Bg`jj>9i;0{U~)U@S%rupTvV9R}b5 zRA8T?l6V|rumLsk4NSmCsOK!A3}JqgM57Pp;&Lp*bZkZq)U~HE#9(?Nzb1iy3Sb24 z^8(c8)6fU!p#oZn8h1H{;Vz88qn`dt=+s`_qoD^MqW0=BsumnHW0^RRw(;FfX172)Zh`kjLC#M2Ynf}KfZ>8 za2u)!zrmq+2bWhN{`t&|r$Z5!qcSod zmD(k!)UHGgxCL39*^dh3Bx)Db$V4s1>%N27K)4@6Jt{$U?0=6ScS5_yX4A0c=JExZ1K$(IFh5 z^M8|uGSDU3m^4hl={Ox#1IJNC6Gr|tL0^o;M4X6|F&}r~7`%Zb!NhaZLd-+T${a-n zegTW{7EWP)Go;Z?m!Ljhgbv(*Dk2xEsy{&8cN~-O zM=ZgoI1Y=5IuG~Y5WI;w7{<-cY#OCBYH>TR#Bk0Wzh(#j#$qGBi=Ei8xwseEPSYXT z&PXh(nkOTRH|3ax8&H9tM~!y_DK`^9dX<^Pf#hEUy-kNV9z+dPkN((*TJc3xN}D`h z^?ZI4pQFDG-}9n&NSh}3D%B3~2J&m#`8N_%DKN^zRH16Zl}7&kXw=ie^X3?;+E3tZ zJd5f05&tyNHB^ctGVGP-qrR*vaTxuNcuQHBHrNh)Dr)@c$Sc9Tf>=f;bu2wPDp)O$4=!coUF8A|BCW#H#gk`9VR-*!1;kkCM zp`jFSMx|y4ax%>4sM@%WdN6#by*05I$8{F2!!lHA+fY@WL^PT(1$$x+>XkbUHP5RU ziVKnZon|eK06I1x?-a8WRm~?*?}eXGE5DB#Ac)G+3c^qmMWgOdM+*y3#a4x>xCa%$ zB`n12s4X1G>WX##OKE7}Pf#m3ffk-ZO>hn8hr0nfU8kkvkW_8 zEh^yksI9C+1#|}WTpNaBL>Q5w+s@ z(e~aadz^sEWCbd~6{wYO^jz1YQs00+_{(UgeO#L9D5WDd-~P6$!Bkz3;r))qn1Vad z!t*!+|3EDueylM|aR;iHyN($4jV%bSSU`x6qI4VW=$}g@IU%y009QbpBV< zD52wHBpJrL&_1UVQK{d9IoN{SVxpdBQmjN5I;Psktq!$?-{WpfB5e!s9ICc5_|8^F zickxw!FZkjZ8X?Ma|%@)-bB+Mdt(faLk;vg#^Dw8!gkdCUeoL1Q-`mxmKgnHWW%{}565e;`B<4FD8CF_GR(ghOV`{Y8!?Mzbx{sw!>f{d0 o-tXl)Gd$XTd-xMy*Zono?wY(BZ+CnC%l@vaf=lka!h?=~0oJRg-2eap diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po index 75d5191d..834c4c49 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -214,7 +214,7 @@ msgid "Wrong password" msgstr "Password errata" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -240,7 +240,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Mi dispiace, non supporto questo tipo di file :(" @@ -335,43 +335,43 @@ msgstr "Evviva! Caricato!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Simbolo di MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifica la tua email!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Accedi" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Realizzato con MediaGoblin, un progetto GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Stai guardando i files multimediali di %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Aggiungi un commento" @@ -983,74 +1028,74 @@ msgstr "" msgid "commented on your post" msgstr "ha commentato il tuo post" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Oops, il tuo commento era vuoto." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Il tuo commento è stato aggiunto!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Hai eliminato il file." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 927d500de83f5b525392a32f6af101d550bea869..1b45aff215f8f48bef70d033b00c5f518fd161fe 100644 GIT binary patch delta 3927 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 diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index 5cd1aed6..f902893a 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -332,43 +332,43 @@ msgstr "投稿終了！" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "ログイン" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)sさんのコンテンツ" msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -980,74 +1025,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 94c771ed3a5aecdf9d490a963b5f35d9a79e5964..5ffc82dd3c7394069472f1f944c79b0cd33b2c20 100644 GIT binary patch delta 4790 zcmc)MdvH|c8OQN=a|Oc15E4otA;5JD~zK$1WLglmvsBFd$fP4p^B#?228z!zrUaMZ7Vcb!=hF8L_a?4E z#dba>;|d&&7bBONJ|sr76&28SWG!2$q?O2U}MNN>)Dw?b!OX9HE}y?2als}{3GhfPN7m>z?a%t1&+eyI0Yl9BfAqd?>+lFFpv4r5ins$g zJ+m3Lk?o_&zjl5<1Jt2;3Uy{LBKMk8s2yaJ24yM_mGbeZl$W68WlheVJpRzs2gXZil+&cxn;<&S;dD^+J~C> zI@EpJ6aAl}QhzV%s19HkMqj0&8<&s|vTJNq3OAy5uphPXA-on}KxM#Yn@VjEwd1S! z&~>+?b{t2|_v^&?G1NM5qB7yL`i+`28and~ybxP(H{OMcbZNf#*!AH=`uCzT^D$fK&i8p)Pv!s!@6MSc%z!l#hBHUB_mER*eOo*qoX>rnH=a3J1^+VOp;j2uY# zSULIE1&0`@!{6ieJ}SS$%fN0bj3M(oWT^kWJQFIbyz0LU706Z`fOjCbn|(MK@59&e zSIDoq;~ejW^%9ZYhLG?RnW#6`FmC*msXL#{C|;tU)*&0BCWX3)PF zb>AfkFH86>oWpn&70?r?BRh)9NGiLdKFx3>15r~$<34o(w9q7AK$r>A<0S{#_cHa1$!xt5Lu$DxCI+=4{E-*626Pd*hgsL018b-Sb`&1-;~qP<1q(|@EW`g z_hAk-aRK??NDX~Fk#CC;w*cD4)kSU!R~F{!~T&Ra2${zKS*1c~v~SzgVI#pq}* zD5Ie>S%4OXQIAUuwUe7rPsweVk3U1D{xFWjSCN>^$2c78h=!M?X-3`Oi@JUT4#F66 zDrVWTQ1|@=bwvA6sXvIy zz%$r|@1ZvAZzTVPG_L00bas3B(1PzK95~netCxq$z}={n?ngbgFJKy;M%|ajIVwZB zsD3SK;bu(14XA*wM1IW=qI}vkUclX0Gv5p3PuN1gc!Bpgtw$aV^C&8Hr*IQiQxHGG z2T(g-w8#r+Icnk6*o4<0x0s`-dB-t02BT|fglJrk6EK;VKoL$tUD%4PxCbd<^D*9v z)6et%pYRfLY9@P$xAW!LKz}`M#D`HEt8MmbKB|W5P&=QGIePx>#J~ou z;EV0J9DjpKT_M}Q5HG`J_%u>K#=5|}&c>VQAH>^mB^N0ppP=rW#m8RUfy&6ji@d;} z#wyk~@6b@u6tSvOHxG4I-$xba5v;-YQP)jg!CyFBh8Dh#$v9x8mx;lsj7`RLY(!;p zal%$qCRVE7Ok>T;*n}a+2Av(YyPeDJ5>pxd#s`n=NshgeTM$bd{b>B~=p^6Zwo3@Xns0Y?bh@#_ zW9mlq*kQkdwL(nd4+fpJb|5w|uV9cJj`S$p%k6kc-n^vbu7Dj2jlC;s&GBDuPqY?T z?fy`)YX$B8wXJ|-xt)GDzqY(*Ms3fG`x_RmUd2-)&mYkEWddFa1G zkz4+-eP#e$KFOM|+x2CeZHJg=U00~Xa`PRFEZDBCV6EPW9sbV=a1uF%YQmUT%= zdLoY4`rJT#V__iaET^M`q@C}$e%CgwPEYKW@jFv5wAhht0FoWALxy^>)L}(Z(tI~7tby~=sUB_KCH<4 z>N1-e-&NI+l-`i2vE!5bMm7YfjxVXRi>lkdSZ5DR$x6ze9k$7X^|^9;X4>1IFSiHI z?ek^K{j}avQuKbo)DO%UNS}IBmhMkQH&mb|j+XQqnr>{}69( zxWYGN$!Ci1x3d;yFZt5y%b7hcqxp>Tn>Kr2Qc8>J?~TTXqAgB1yzc*3gyZ|G@P8Iz ztZv?@_<^|%sj-cPxv|xSd7mlB^O~k4XSRN!A~!8Lny5&(dHonYLjJER%eR{EPXBLN J?zrgEe*@l+I3xf7 delta 4311 zcmb`|c~n%_9l-HBfE#WoDC&qlPy`fYB!Gf|5>ap?QBY%C5`>Wufw2QfUE)}vYS9xV z45<#W2!ClFq#u>a+>7y`*SAgY5%TA_}qKvzTf@b z-@R`*b;|O~lNQ(2fqo5&e;@KQoS*&OrT3qI(S4N)p&NrEaW>j;6;8os48qTGFy2E8 z_Uxxr0QzHZv|=BOz?&G4u}Znrkp4;~F_4AHScMVTj#2nG+(N|uM3Z^D26z_w5Pj+Y z9j$1hEZB3PQskh9q9hi9tff-07tThRx8UKpOR1GK0vV{lZul!q#2uK09XJd7GbsU| zLNVr}J* zl5q&i_;~Ml0{YRdhu+BSv6noOYfb!f$bjg`~N<+^67D~pxq$h!_ zC`XZuQqmPDJ6VlGaW^KSfjzJjCGb~BDD_X2#QG966Nh3n=HYYrd@$$#35`Cay8^$! zahOT;cq~J?bO&(~{t4Hjg>B{IdSpml!%+Mdsj{+iA!GxwC}*FITqCs%i(Oq4+WbmS-kQTm}6iDR({b5Kg(j&cV+LaCgI zl4v+(k#!Pr2fC)wkR5-7Qp(RzcJ?*O#2`Advrv?PkD!dtL0M=q%8nf}BjHfc0C~*#;4|c>*e+l$w272Lj z?1r6Q?|R1{U@GHsPIVTg(olB(0cDfQ{fl2V9LKLIxD@3wH=`u*2J)D?h*H5zUjJdE z{(Ttuj)B|Qiz_K#JohjO$HaLSej3?~+JjPo3n+h-?xW0mj)$nSI)&ZwI`RUk+Zce| z6FjeNFb2^N_x6)rG-N`ScVIC}MG8^Aa5ka@d;#a;Zd{7DF%dKPm4@rFH=aS6-{JLL zuNN_c@hd0^Xj}|AB3A+psX!je4oXpWx(i>#cW@RindAw40A**#Fckml9lwKv>EHME z`%o51BoO6&ABKEsssxnh=V6Mx|Ep<80>@AuID?Ym+bEai63W}~0OiaBxoKQ@m4@=% zN|Xf4P{X%yI$lGG7tWOzqfx_0P~zuero8_}GM35*vYXB+)24PQoIzqipbfl!U%PIiipZ>MslA zb2Y_E+=1Irc5G#qyuaZnuiZ411xrxomt!by_4W^=Ec_Ps#!k${2WZE%8J>mrV~%`2 zgZi_UN@EuHOI4#(q#djA8?3_(S)LvCo9RhlILbn!a1K6({8!EVlEAl6E^RUwrxX|A zSnR-XyoWL`*frbp$7L0A-_&pMar_>6lTsa) z`gc)wzITBq;gLj(qo0LRq4g*gYC$=YYd9LCSbZ{Pqs*(topSg`X=n_j^78uPa+C_J zzyPd8DP@z_eJDFWgltl^J)w8@y~^LpaawvoftK$mF1F{F7dcA3110u?qC6E7qvhD; z1HCmvgEyRUF+v1$JL`9;AC!z1mb<<7NFRXB^I%EHpZBTF6S_NcOy z*t|5A@^D^Cp7xB>zA`l|Jkn_|ajda>=W6-Id1Ym(VV=RTH1DTT@~AN;AjU^uGH|tV zbKoS45gnvk^p6L%8uf!mTY?zI)2(+UvIwH<{dJOxIhcX&~Ly`pLnbM@H7_xA5X)4 zZIk&@Yv<`!&w&KQPvbxm*BWNx3XAd7qyawq=Hxp@_2jh{y=Q8u5u57tTV%d+&fL76 z)HSp5sJpe^{c4+g+kW?3a8pR)#clSDU-F$!w_6x*867 z9vQD+PXDZj#+cbuZ5(;D#-gWY%+gyj!i)rN-R+@=t4r8dtI>`s$\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,7 +92,7 @@ msgstr "사용자 이름 또는 email로 된 사용자를 찾을 수 없습니 msgid "You can now log in using your new password." msgstr "이제 새로운 비밀번호로 로그인 하실 수 있습니다." -#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:83 +#: mediagoblin/edit/forms.py:25 mediagoblin/edit/forms.py:82 #: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47 #: mediagoblin/user_pages/forms.py:40 msgid "Title" @@ -103,7 +103,7 @@ msgid "Description of this work" msgstr "이 작업에 대한 설명" #: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52 -#: mediagoblin/edit/forms.py:87 mediagoblin/submit/forms.py:32 +#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:32 #: mediagoblin/submit/forms.py:51 mediagoblin/user_pages/forms.py:44 msgid "" "You can use\n" @@ -119,11 +119,11 @@ msgstr "태그" msgid "Separate tags by commas." msgstr "태그는 , 로 구분 됩니다." -#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:91 +#: mediagoblin/edit/forms.py:38 mediagoblin/edit/forms.py:90 msgid "Slug" msgstr "'슬러그'" -#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:92 +#: mediagoblin/edit/forms.py:39 mediagoblin/edit/forms.py:91 msgid "The slug can't be empty" msgstr "'슬러그'는 공백일 수 없습니다." @@ -162,20 +162,20 @@ msgstr "계정 확인을 위해, 이전 비밀 번호를 입력해 주세요." msgid "New password" msgstr "새로운 비밀번호" -#: mediagoblin/edit/forms.py:72 +#: mediagoblin/edit/forms.py:71 msgid "Email me when others comment on my media" msgstr "제 미디어에 대한 컨텍을 원한다면, 메일을 보내주세요." -#: mediagoblin/edit/forms.py:84 +#: mediagoblin/edit/forms.py:83 msgid "The title can't be empty" msgstr "제목은 공백일 수 없습니다." -#: mediagoblin/edit/forms.py:86 mediagoblin/submit/forms.py:50 +#: mediagoblin/edit/forms.py:85 mediagoblin/submit/forms.py:50 #: mediagoblin/user_pages/forms.py:43 msgid "Description of this collection" msgstr "모음집에 대한 설명" -#: mediagoblin/edit/forms.py:93 +#: mediagoblin/edit/forms.py:92 msgid "" "The title part of this collection's address. You usually don't need to " "change this." @@ -189,33 +189,38 @@ msgstr "해당 유저에 대한 '슬러그'가 이미 존재합니다." msgid "You are editing another user's media. Proceed with caution." msgstr "다른 사용자의 미디어를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:182 +#: mediagoblin/edit/views.py:156 +#, python-format +msgid "You added the attachment %s!" +msgstr "" + +#: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." msgstr "사용자의 계정 정보를 수정하고 있습니다. 조심해서 수정하세요." -#: mediagoblin/edit/views.py:198 +#: mediagoblin/edit/views.py:197 msgid "Profile changes saved" msgstr "계정 정보가 저장 되었습니다." -#: mediagoblin/edit/views.py:227 mediagoblin/edit/views.py:247 +#: mediagoblin/edit/views.py:226 mediagoblin/edit/views.py:246 msgid "Account settings saved" msgstr "계정 설정이 저장 되었습니다." -#: mediagoblin/edit/views.py:252 +#: mediagoblin/edit/views.py:251 msgid "Wrong password" msgstr "잘못된 비밀번호" -#: mediagoblin/edit/views.py:288 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "\"%s\" 모음집을 이미 가지고 있습니다!" -#: mediagoblin/edit/views.py:292 +#: mediagoblin/edit/views.py:291 msgid "A collection with that slug already exists for this user." msgstr "" -#: mediagoblin/edit/views.py:309 +#: mediagoblin/edit/views.py:308 msgid "You are editing another user's collection. Proceed with caution." msgstr "다른 유저의 모음집을 수정 중 입니다. 주의하세요." @@ -232,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "그런데, 오래된 디렉토리 심볼릭 링크를 찾았습니다; 지워졌습니다.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "죄송합니다. 해당 타입의 파일은 지원하지 않아요 :(" @@ -327,62 +332,43 @@ msgstr "이햐!! 등록했습니다!" msgid "Collection \"%s\" added!" msgstr "\"%s\" 모음집이 추가되었습니다!" -#: mediagoblin/templates/mediagoblin/404.html:24 -msgid "Image of 404 goblin stressing out" -msgstr "404 이미지 고블린이 열받아 합니다." - -#: mediagoblin/templates/mediagoblin/404.html:25 -msgid "Oops!" -msgstr "웁스!" - -#: mediagoblin/templates/mediagoblin/404.html:26 -msgid "There doesn't seem to be a page at this address. Sorry!" -msgstr "해당 URL의 페이지가 존재하지 않는것 같습니다. 죄송합니다!" - -#: mediagoblin/templates/mediagoblin/404.html:28 -msgid "" -"If you're sure the address is correct, maybe the page you're looking for has" -" been moved or deleted." -msgstr "주소가 올바르다면, 페이지가 옮겨지거나 삭제되었을거 같습니다." - -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin 로고" +#: mediagoblin/templates/mediagoblin/base.html:54 +#, python-format +msgid "%(user_name)s's account" +msgstr "" + #: mediagoblin/templates/mediagoblin/base.html:60 +msgid "log out" +msgstr "" + +#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +msgid "Add media" +msgstr "미디어 추가" + +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "메일을 확인하세요!" -#: mediagoblin/templates/mediagoblin/base.html:66 -msgid "+ Add media" -msgstr "+ 미디어 추가" - -#: mediagoblin/templates/mediagoblin/base.html:67 -msgid "+ Add collection" -msgstr "+ 모음집 추가" - -#: mediagoblin/templates/mediagoblin/base.html:69 -msgid "View your profile" -msgstr "내 계정 정보 보기" - -#: mediagoblin/templates/mediagoblin/base.html:70 -msgid "Log out" -msgstr "로그 아웃" - -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "로그인" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Powered by MediaGoblin, a GNU project." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the Source code available." msgstr "Released under the AGPL. Source code available." -#: mediagoblin/templates/mediagoblin/root.html:24 +#: mediagoblin/templates/mediagoblin/error.html:24 +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:26 +#: mediagoblin/templates/mediagoblin/root.html:53 msgid "Hi there, welcome to this MediaGoblin site!" msgstr "안녕하세요! 미디어 고블린 사이트에 온걸 환영 합니다!" -#: mediagoblin/templates/mediagoblin/root.html:28 +#: mediagoblin/templates/mediagoblin/root.html:55 msgid "" "This site is running MediaGoblin, an " "extraordinarily great piece of media hosting software." msgstr "이사이트는 MediaGoblin으로 작동 중입니다. 이는 특이한 미디어 호스팅 소프트웨어중 하나 입니다." -#: mediagoblin/templates/mediagoblin/root.html:29 +#: 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 "자신의 미디어를 추가하고, 댓글을 남기세요! 미디어 고블린 계정으로 내역을 확인 하실 수 있습니다!" -#: mediagoblin/templates/mediagoblin/root.html:31 +#: mediagoblin/templates/mediagoblin/root.html:58 msgid "Don't have one yet? It's easy!" msgstr "아직 아무것도 없으시다구요? 매우 쉽습니다!" -#: mediagoblin/templates/mediagoblin/root.html:32 +#: mediagoblin/templates/mediagoblin/root.html:59 #, python-format msgid "" "Create an account at this site\n" @@ -422,17 +433,10 @@ msgid "" " Set up MediaGoblin on your own server" msgstr "사용자 계정 만들기\n 또는\n 서버를 위한 MediaGoblin 설정하기" -#: mediagoblin/templates/mediagoblin/root.html:40 +#: mediagoblin/templates/mediagoblin/root.html:67 msgid "Most recent media" msgstr "가장 최근에 등록된 미디어" -#: 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/admin/panel.html:29 msgid "" "Here you can track the state of media being processed on this instance." @@ -541,30 +545,43 @@ msgstr "안녕하세요 %(username)s님,\n\nGNU MediaGoblin 계정을 활성화 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 +msgid "Attachments" +msgstr "첨부" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:56 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 +msgid "Add attachment" +msgstr "첨부 추가" + +#: mediagoblin/templates/mediagoblin/edit/attachments.html:60 +#: 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_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_collection.html:33 +#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 +msgid "Save changes" +msgstr "저장" + #: mediagoblin/templates/mediagoblin/edit/edit.html:23 #: mediagoblin/templates/mediagoblin/edit/edit.html:35 #, python-format msgid "Editing %(media_title)s" msgstr "%(media_title)s 편집중..." -#: mediagoblin/templates/mediagoblin/edit/edit.html:42 -#: 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:53 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 -#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 -msgid "Cancel" -msgstr "취소" - -#: mediagoblin/templates/mediagoblin/edit/edit.html:43 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47 -#: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33 -#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:41 -msgid "Save changes" -msgstr "저장" - #: mediagoblin/templates/mediagoblin/edit/edit_account.html:28 -#: mediagoblin/templates/mediagoblin/edit/edit_account.html:41 +#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40 #, python-format msgid "Changing %(username)s's account settings" msgstr "%(username)s'의 계정 설정 변경중..." @@ -590,13 +607,12 @@ 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/image.html:23 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:136 #: mediagoblin/templates/mediagoblin/media_displays/video.html:52 msgid "Download" msgstr "다운로드" #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:38 -#: mediagoblin/templates/mediagoblin/media_displays/image.html:27 msgid "Original" msgstr "원본" @@ -623,6 +639,56 @@ msgstr "원본 파일" msgid "WebM file (Vorbis codec)" msgstr "WebM 파일 (Vorbis 코덱)" +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:87 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:93 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:99 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:105 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 +#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 +#, python-format +msgid "Image for %(media_title)s" +msgstr "%(media_title)s 이미지" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 +msgid "Toggle Rotate" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 +msgid "Perspective" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 +msgid "Front" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 +msgid "Top" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 +msgid "Side" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:130 +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:131 +msgid "WebGL" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:138 +msgid "Download model" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 +msgid "File Format" +msgstr "" + +#: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 +msgid "Object Height" +msgstr "" + #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" "Sorry, this video will not work because \n" @@ -647,7 +713,7 @@ msgstr "모음집 추가" #: mediagoblin/templates/mediagoblin/submit/collection.html:30 #: mediagoblin/templates/mediagoblin/submit/start.html:34 -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:83 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:82 msgid "Add" msgstr "추가" @@ -691,7 +757,7 @@ 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:50 +#: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:49 msgid "Delete permanently" msgstr "영구적으로 삭제" @@ -700,7 +766,7 @@ msgstr "영구적으로 삭제" msgid "Really remove %(media_title)s from %(collection_title)s?" msgstr "%(collection_title)s의 %(media_title)s을 삭제 하시겠습니까?" -#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:54 +#: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" msgstr "지우기" @@ -726,12 +792,6 @@ msgstr "%(username)s의 미디어" msgid "❖ Browsing media by %(username)s" msgstr "❖ %(username)s의 미디어를 보고 있습니다." -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "%(media_title)s 이미지" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "덧글 달기" @@ -758,25 +818,20 @@ msgid "" "

%(date)s

" msgstr "

부가 기능

\n

%(date)s

" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:171 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:187 -msgid "Attachments" -msgstr "첨부" - -#: mediagoblin/templates/mediagoblin/user_pages/media.html:192 -msgid "Add attachment" -msgstr "첨부 추가" +#: mediagoblin/templates/mediagoblin/user_pages/media.html:202 +msgid "Add media to collection" +msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" msgstr "%(title)s 의 모음집 추가" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:52 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" msgstr "+" -#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:57 +#: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" msgstr "새 모음집 추가" @@ -847,42 +902,26 @@ msgstr "계정 정보 수정" msgid "This user hasn't filled in their profile (yet)." msgstr "이 사용자는 계정 정보를 입력하지 않았습니다." -#: mediagoblin/templates/mediagoblin/user_pages/user.html:125 -msgid "Change account settings" -msgstr "계정 설정 변경" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:138 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:132 #, python-format msgid "View all of %(username)s's media" msgstr "%(username)s의 모든 미디어 보기" -#: mediagoblin/templates/mediagoblin/user_pages/user.html:151 +#: mediagoblin/templates/mediagoblin/user_pages/user.html:145 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 -msgid "Add media" -msgstr "미디어 추가" - -#: mediagoblin/templates/mediagoblin/user_pages/user.html:163 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:87 -#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "아직 어떠한 미디어도 존재하지 않습니다." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:39 -#, python-format -msgid "" -"
\n" -" %(note)s" -msgstr "
\n %(note)s" - -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:47 -#, python-format -msgid "
(remove)" -msgstr "
(지우기)" +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +msgid "(remove)" +msgstr "" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -901,7 +940,7 @@ msgstr "Atom 피드" msgid "Location" msgstr "장소" -#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38 +#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:53 #, python-format msgid "View on OpenStreetMap" msgstr " OpenStreetMap으로 보기" @@ -940,6 +979,32 @@ msgstr "태그 정보" msgid "Could not read the image file." msgstr "이미지 파일을 읽을 수 없습니다." +#: mediagoblin/tools/response.py:29 +msgid "Oops!" +msgstr "웁스!" + +#: mediagoblin/tools/response.py:30 +msgid "An error occured" +msgstr "" + +#: mediagoblin/tools/response.py:44 +msgid "Operation not allowed" +msgstr "" + +#: mediagoblin/tools/response.py:45 +msgid "" +"Sorry Dave, I can't let you do that!

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

If you're sure" +" the address is correct, maybe the page you're looking for has been moved or" +" deleted." +msgstr "" + #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" msgstr "이걸 지우고 싶습니다." @@ -960,74 +1025,74 @@ msgstr "노트 추가" msgid "commented on your post" msgstr "게시물에 덧글이 달렸습니다." -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "오우, 댓글이 비었습니다." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "댓글이 등록 되었습니다!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "모음집을 추가하거나 기존 모음집을 선택하세요." -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" 모음집이 이미 존재 합니다. \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" 모음집을 추가했습니다. \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "확인을 하시고 다시 시도하세요." -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "미디어를 삭제 했습니다." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "확인 체크를 하지 않았습니다. 미디어는 삭제되지 않았습니다." -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "다른 사람의 미디어를 삭제하려고 합니다. 다시 한번 확인하세요." -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "모음집에 있는 항목을 삭제 했습니다." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 항목은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "다른 사용자의 모음집에 있는 항목을 삭제하였습니다. 주의하세요." -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "\"%s\" 모음집을 삭제하셨습니다." -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "확인을 하지 않았습니다. 모음집은 삭제하지 않았습니다." -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 bab3def6bec50de98bbc86b7b0f411a479c7ecab..fbe19c5128c70ad8e3cf4212d3fd1b30b06795a4 100644 GIT binary patch delta 3898 zcmZwJeNa@_8OQOnvbe}1L=A|Fx}v-q3WDGZ8bHHK6a*D*O05;bmXZ*cun;3+ZW>Fq zNhT(4-Y_PWPGZz#jAq+t9n;v*6g$>7n#nlWQPXKmZ6#BZ+FJcX^Zjw}Ogfn|$mg81 z_nz~d=REhWH}|@J{f5iBFxLH?;paU6lKAKLsQ2~H;Amqe)BPN$qBqu<9Gr> zU6_D}FbYqg3r}MVeuRI;PcRpM8)r|^xn;}{jd2Xz!bluPrvN8l1=ipa z?7@8e6g9y_R?);W(Tn-0z)El=mSQqiq81KdI&MYXcMua;-yEee1y5rq4q-0dA8$|e z3KE-n4f!=k_@e;+h+60(>hsUgjn`2D-9*hB&AB9E22R99sPXTirL*dyp;UFFCU_Qg zW<98y*n`?ZAL_g;@Eul}i4)k)Y%E0;XD80ZowyM{LIqSsp{R(Pkkd2WsEzbY zBLCX?5eBG3(~ml{v&g;X25JZKq(PaQj7oVbD&<+I35$_rm|9dI_oI&J2^@pFP#HLY z%4`@l-*JnE7W_SG!a>wTw@?8j5Vlf03w2`=s(30#KaIMt$LYV0 zO8r69Q60l(v@X%mjn(9X>>58Rg^!?ia2U1l3EYk!qcY%Un@Vj9YR5m}kFMK;+Hn{) z-v`e41=KoMP?>P~hPBK{8ai_?ej8WfYxo8#(&f|a$F39apnnjRne#Xc|BH2)Ng7of z-Kd>jMlEy|r{i^8ij(P-Vl$Ref95S3WZV1)*W>38?#CVYCHk>Di~Lg$=1P{GDld6d_2(nm zGL<+VgQ&<4peF1`>el=Vm9a5wSM#*u2z(kfPY6fhe$_zzb-hzz(PEO zFS@Aw9D9L%RG232M~2Mbum}@#?FH^Z1s1?4+=kq4p1~LlVI%{)kzcbXkCz$_@P{Or z(H5^SvTNp}zV#Y$9{s_5`wf*^U`JkxTA&JfCz;i#$Ft3G3*JuuS&YSfjz^G}sp)q< zzvzr#MLoV&1P7^9`$t0M2+Vl z?M8gfH9<6`tzw*kX}A=1wn0qCM^V@9 z!(!}1)s%aIJ#Q>3umsc*CFAg8iE*rN7Sd44tB@?4=dcS;;VE1~S{g9%PJ6*ksH1un zRXYPn5={h^xeXWKRQv#S1eZ`7j3~A<<3-g-CR%Yc=Fw1f-i;Hn3zec5P&e*&`g>73 zIE2d7?@(tsfYWdYRU>0d>;s)En?!RHP?S zDLscu-KVJQ|ADH3$VK+&lTi1iU^M2TQhz6=;}UGaAWp$g7Fm3U)40WeQkcc-O%whA zb;e!zJpL3%qVF!}KdY#ksK#;l5UMyI$7I}v+Sq%TglEu=|8%^HI`ZoljqlSaDYd`# zdXaaKDKE3ncmw9pe-nAxne)h_Yht*&5f|e!+=~kM8jeJFh5fDP#ijJKk*UolT#3Iy z1!l$HZGY?KqEgz6iFgck;m6p38B6RMc@lf+zlZ5q&+H29aa1k*3N!FStj8OuVqR0p zG2j5M!^EoLqqNLM8fzJ_a5P@P2pmK=4xwt`->7PKvt2!I$*4dVpi;gH^YCF*jl7B4 z;oGR|{)8U9j5@NRVL5+ywS8eCX7WKkuEKRlmdrayR?RKP@*4X&-;T=Ahxj9$v7C1S z?!hcfTS0KR3Y%~T2Jr??#r52r!TRPY8mh)4n2Kky7H^_0T#%k1#>l_P&c;@(K<<6g-A9^)=n%Z;c&z=?jLv~#BH{(1vuhiu&`#R9j xl){8aJFL9I$G#C(xVYng!U_!~Wrk}?HV=muKDl`C|Ah6+%HxC;ez0n^=PSXo^#A|> delta 3595 zcmYM#3rv+|9LMno1P>Px6+tc{2fP3#coamrs34+v0~O3mS!#G&4ivINspD;VPwl9r zXy%$lSu;K2oQftnw;Yz5EvHW0aPwNrHnV6}-=FWh#SZ85Jn!Xs{?GsUzwbGH(C43e zANQ>;eme|*SNZSG|Ec!s{r~rJh%vErXJQ;KM;F%NaBRk|*rB5_5g3mFI0St#4?AE! zw&Fw_i0Prm^f$(B=F>>zKrJTY8C=Vq_c4?HlFrt^2hl;l3ESZXjKS}*6FxvBlT#XsH9t-gs9E*WmGzd#k18hJIT!+DU z02SC_R1zC70Z*YOZowpcin`B9lo8Bt`qJoudAJN`;Xu5B8mMEqF~nfPk&j8@O92c+ zoi9e6e-Zs~Au6D9)VRwq5_e%V9m{R=tEu z^=j0LwqX>Wzzn>K+Nxk~*0^EFkR}opSSpUjtZwXoKN_nz@D3irpD~4S=b%5MzJLob z9k-*3@H-rW_puriSQbsQ2UV=ckSv?4sKD=`YQaIlP*x@awKaWW$Uo=I7!D}nGE_zu zp;EgPmD(EAfLoBonNLuGoIq{Gb)@dhL)40&p)%=98Z}-hYQjj=c-g3Nirh35z+BV~ zD^SI;8C8t6s1@x+rSK$bz{{vDxNi6Fp|;{NF2rbV()DXld%qi%F)u3MN2vMS&uDC+ z5k#J};@zlJ?nkZgBp zdj4F9^YQCruD%H(l&~x zUco8&3=6S@sPl0T4#wMjSw2lM5SdSX$AO>O+YQ@c{lwP&H zZlAx6LplBcKlGt?NSh`&>#_oDK|bbRzJ{ZV0@L`5QGu-;K>h=0e9QsvH=m=b{UG{t z;5ZJXf10l}e2gsK^rk}=&1BS%RSjm+_ZwuraE74*pNSfOF7iq+<=6=~*w(pe@R~PY zVn;k{dkIywE%y1R_VErG*5et2%E%zpn=u=;Rf};V9!CWn$cAgep{R@&VK7d^cIYm% zPb@&598-x(;SSWEdF}Hp7(xF&YLE3cSqh1$E!c}%@eK^eR@=X@GyPD~qlx2D=TnfU z!fo>H6NSh-#gt+cR@rVwRrP16R9?a76JZznt*Gk%1EVmE%2R+Tn24pQEv>;MT#vf$ z2FKtgzzY6;BKfbi9`KZq~mBDi7ei1LOmtt@FM2rSTCwj(x3?{QCm`ns*y`b z5=bf6M zd;BZvykDO6W7QFZ=yykDDlw1zFQPG#16p|_@{TY!Q7H==VGWdz+QaF%6X#)je1?hW z$Lmdd-VejD1XXnNF#)Sl3)zFJl|!h7H|M*py}itVS2++h()zWkM&2bRuE5&MVsz18 zgS=}@17_eIEW?;l`Z3}602SyD*dA|UPi)0;=%A3e#gt$P?sC&mM89A;1{GQ%qnj8zL|xSxJ4CSm4SE3i4JJ>Q1OSdX*u3f5pcQBY>)FwR2vZ#4XAOd4;! zlc%Cma}2e|CovW;pdOohsK9(DSgDOcy=aD^7E*~izXcswkJ^&2ZO@^uyM}$4-#no) zg#%9V$0E&}NHWYBTSu|=YgLTO#8zC1cW?#Hn`qU{UCf~$K8bzD$ykLaFb-2ETNx=r z)!N(GN6&vPjZzMrMnx9JEQ#nstz;U$hD%Tb{e-^w1eNMPF$hB$L@SQAO+aO~F9xFv zscVyiCZTs#f^&9RnfFP^)&TGJh+aNjD=Oz#yy2{_SX${^JiDsut%}OB;oe)_O8q^# zu}i#-u?4m8UT_$y+tz9bb>bIo_LB@KJ#0@r2XfhN3{nf32vb%K!iX diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po index e66ead04..3abb2b0f 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "Verkeerd wachtwoord" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Sorry, dat bestandstype wordt niet ondersteunt." @@ -333,43 +333,43 @@ msgstr "Mooizo! Toegevoegd!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin logo" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifieer je e-mailadres!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Inloggen" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Hier draait MediaGoblin, een GNU project." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s " msgid "❖ Browsing media by %(username)s" msgstr "❖ Blader door media van %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Afbeelding voor %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Geef een reactie" @@ -981,74 +1026,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Oeps, je bericht was leeg." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Je bericht is geplaatst!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Je hebt deze media verwijderd." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 f272497a576ec1d09a0eee9ac9d880354d67ac07..2953d8000474d6a3218b6851707e6972ad43e807 100644 GIT binary patch delta 3897 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\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "Feil passord" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allereie ei samling med namn «%s»." @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "However, old link directory symlink found; removed.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Orsak, stør ikkje den filtypen :(" @@ -332,43 +332,43 @@ msgstr "Johoo! Opplasta!" msgid "Collection \"%s\" added!" msgstr "La til samlinga «%s»." -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifiser epostadressa di." -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Logg inn" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Drive av MediaGoblin, eit GNU-prosjekt." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s sine verk" msgid "❖ Browsing media by %(username)s" msgstr "❖ Ser på %(username)s sine verk" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Bilete for %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Legg att innspel" @@ -980,74 +1025,74 @@ msgstr "Legg ved eit notat" msgid "commented on your post" msgstr "kom med innspel på innlegget ditt" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Vops, innspelet ditt var tomt." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Innspelet ditt er lagt til." -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Du må velja eller laga ei samling" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» lagt til samling «%s»" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Du sletta verket." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje verket." -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Du fjerna fila frå samlinga." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Samlinga «%s» sletta" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Sletta ikkje samlinga." -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 8227376917db645ef1d7403ba87553928b986b2e..cbbed538c793897ffae5c6c2d319f545b6ed302e 100644 GIT binary patch delta 3885 zcmZYB3rv;g9mnziQQ#opl_5p3J>Y;+L`20KZ2=V!ig-KPl(|N&M@B^tnKL!E=~^7w|In;zayts9BzwV}GZS#f7Y4X4yCoxAEi#oKD{}!X3B}7284_ zh&4DGpG0o8W+X;?85K|)GM632LHHgfV;AcFp8oG0v)eQhxzLBvm`G;|rr;c$kCoVl z1$YHDz$j+Xz&RL?1*pJEFa}F89jj0i2k}ANhI;Nej%0p2N#lMzhs}5!C*tZPcc6nv zY}SGN+Pi!xfZwAg>Op;f4WsZoR6zGo|Pv=WzHUU%c37mo<)RJ|g#(f7B*a;*y`!JdHSIPez`JxBQ z>EFO{IEk<~;xfF5mv9CChFNkjg>)ukDQa^z<1}o?4R`?+&|Ef(HgPSode(wUq-`|y zSLW|>fqiIQs5QHYJZpDR86;5#RcZ{XL4Iv1A1Y}xYT#X{=h`CuU!qEX z9JN%ZunwK8H1yy+>OplafGXh&s0>b^Cho?a_y<%40;H+Z)}u21DIdD;2rA<+YP^pl z*Ds;wxq+&L$Jei8F*LO1@%T6{!VY{B73qRB_t-V#IQqv?mH7e$;r+Vm9tZKc2!(I6SNW&1buD8S~p|8qqkGbf3g*)Y@&wf%prI!gh?s*H9(? z6>86%L4cuLivsLPrBUM?89zCoVO?v^$u@iUW9SmSgF7;l z451=FiW;yB*|+vLRKwk-eBEN@PvuL)mN}PzJFfY=tL?X6TsLXdFvD$uAhJVCjyo=fk zg%7&{%|=zM0+q;O>`wrPGQT}TqZl_M2f4=RUD1E#qKGoKuuhWskjkUnRaya*Xs=$97%f*b;Dm#8F)+F$cLdaPDLHNY#f2* zsEKMY9oM1uNE>QtI#HRPL{;E@)O=?#1A9v%=RanqdkQim&POdpGiu`Pr~&q(*7z{y z;1N`2=TV#M3)IASP)j<1x0Rk7ggRwO7{ns%-xISOH{&iYXf3ax2DpE=o8fpoNWTP? zNiQn$YnX`%rEZ{;P!%b`H1wkaUx%7#D@NhIh=;I(euqP&n#L{cz(>p6|6X4~PK+g$ zyT`E_wZ>bp0N=(IypADUGlwIEpQ9>q6VvfqT!1OeHXm2xJUoS33MYX>u9EmL1$Uv= zv=fQJev6B7@MG>KeF_iLe;qThtjawV^{D6fVjdntVzVCHj9GKtP5TBeqyHtw==@ib z{(3GfK&|;19EcYqeu`Sd9@OT%fqH?&l7=$OLf+O^iTU^(M&nzk`@?u2eu7$}FL5aT z3zL}N5~z!AOpjQEi|8*!lDFfiO8gV`H)1CBEXGavFn)lC@E-mgUt8!dQ9gr|(yzrM z_!frH?{@?0#ti1S&uOT1Ug|s+(~x~=rI?5>;dnfND*0L5h<8x;H!N}g>g_=--7Ba{ zhS7^3Af>i5k^UzbNB>W{PBrcFl5ox7eX&Dk2iLEy4=!KnTN7Lvs1JXWl;O#&s}K0f zf{kmIHyP9hn|vFB&o=rRmWM*?gN-YTtgJD(wke#O?2k@Z@pRy+Cf}SuUF}brTAkET zT%a-3z@@r%f$;6r@&Nq)($T~cryejN}u)^z| z>dT)vV{$?3>v?HvPn$70KYTW?Fz$cji`U2Xtueh3LlvD~PGFdXx9xM#A_7 delta 3601 zcmYM$2~5^?9LMo5mk)@Tf*c;;BbSh=ARY)N4*?z#m?5<+4H_o45S5%q+9P0jHdHhZ zx>(^VS52PmQadnnHM8m5Y+_>9@?6v9YB{v`hySzXkk{{j{eIuy_xt_-wf+5o8~Xyh z=Ocr67=KRlcL;wE_0rM*e;$u8i|23-4#np%16wc;kK+LB)7LBphhZpYV*uu3A1uIM z@j)DeWA8E>ZRWN442E-JC#K^UxQ-_;;Y5xX_je}Vhc1pgFbKcH!FU4u;bkNiyM+oU zEYgg%ECIuCB*x+d)crGhu6xZY7({WR7DKQR$KwW^hF{|S7{*QGa29HUji`xRFdW-Z zf$c{n@c<^`A=JWMn1+9&o^umr4C~w73=%LOS7HT@!A{gfeWT5Y!J?5LOXHUUn2fqU z19kmj48{ehfEJ?WU5RnH8wX*#|NQspRjsZv(1SNowfYy;3oZ(($dgeMO+uCGF;uD> zQ9Ig-1MxE)kEcefs6akLmEtVYcXkD}<8D+Y14*Oiy9>2o9BRH?)I6nL1`1#v>VY+= z=6DI!j5|>~dKHzzgQy8lqDpYqe|!;DitD%l2l0^ZUyG{!9#qDBsDQ7c*7J5VXkyTt zJZZ;!P^oN1?eHM##!l1@FQO*=*MB~Wo3xM{we#_)+UDXT*obY|i3+gZ?Yu?r;yrr* zFECIBB8Hh|Vj9lI*{B{kfNGjJ@}~uoF$vSL7)!7ScjFZ7LXu#q+_Vr2khZdRRN&uX z8UBi;tZx&Ndm^zHv6Txx9EIg6>gv6y`wrmUcnZt0 z8>e9zQ5WDVH~}x92jjTeo6F!)293A_SK&b3IezSAeoe&=+=jg=*gSj{DW?UEbTX2J z>gEz;^Hzm9xCs^bH>ml#kan|h(yPp*k0Sq?Xgwza@om&Z`!EbUP&+=3O6h68XZ_bN z;Juu`jHd$V9nz*u+{$n=8An4+1(m zGT!O-SX9?0p&rOZT`xxMa1LsLm8bw4kQnR$-jA0s8^=;`z3(*`j?bfB=Z&c6y*nB7 zV(>Z=gYCswJcqm?_7|!Yam>amZ;41>Sw3#Vr*R5)qb4jQ4Sn$e)W#k|1-=-SiAL0h zHX!$VZ8rnG9<8Vw_o62F1Qp0JRL#0j3*12k?4lkK*cX-BAvg%L{l{gfKxSk* zPDU*>6BDrp)eBot8*4?cYOH5e(#6=*RH)2t#1Ytp z+R#B%@0>&}*oi9L71Vq;^2vWKgCX}hwcd=%z+0$VeT91P7HUV~1!k{d0xIyss6daP zQhy266a5OE`x9^&$C;>r%TPU4fx)=E(Cd5{R&%116UVR(V~U*rIsT3w%;hC-#Z{Ps3B^vg7owi8!O^%5S<^nodc1?QjnzNk{A1<)ia{?UI){nGhVm|7=I*h|DsFJ;dD&ZkiPaH?x_lu*~?l36h z#1QhKFV`Z}jt`=~?SbUWgC3lO_4o#Uj$82w@~To?N2+AQAL1K=HK>vdU~&bt9+jz9 zRECaWlHUKH8PGQt!awR!I2}jf9Ml7waW%GM5@t|`K%9koy&k~`tV0*pqcXa|f4l|N z6T6VT+M8&JDRqhN%Bm{g&4?|bzU?u|0Rw86%&&dcy`pyM68ECYy1HexORDmG=VNDu zG<)I~`wqt!1^Qg>hS27gwAX!}^dgrl%bl5(GbXEfbH*@@C+1{k`##Lb?d`jrQydUI zyK+%&&B6thM;qoHZE;su)*WrA%=0ap)Vo*n`upmA(FN-QeXT|5Va?}CPx^c_ysrNM DHz={> diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.po index 828f3d8a..152d2533 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "Nieprawidłowe hasło" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Kolekcja \"%s\" już istnieje!" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Znaleziono stary odnośnik symboliczny do katalogu; usunięto.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "NIestety, nie obsługujemy tego typu plików :-(" @@ -332,43 +332,43 @@ msgstr "Hura! Wysłano!" msgid "Collection \"%s\" added!" msgstr "Kolekcja \"%s\" została dodana!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logo MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Zweryfikuj swój adres e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Zaloguj się" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Obsługiwane przez MediaGoblin, projekt GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Przeglądanie mediów użytkownika %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Grafika dla %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Dodaj komentarz" @@ -980,74 +1025,74 @@ msgstr "Dodaj notatkę" msgid "commented on your post" msgstr "komentarze do twojego wpisu" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Ups, twój komentarz nie zawierał treści." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Twój komentarz został opublikowany!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Musisz wybrać lub dodać kolekcję" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" dodano do kolekcji \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Media zostały usunięte." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Element został usunięty z kolekcji." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Usunięto kolekcję \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 4b917fb8a1ebe2a1402ac10c7570b9b777b1a738..4a027c1cab5a025a6758ef9fba49187cb95db25b 100644 GIT binary patch delta 3915 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\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "Senha errada" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -333,43 +333,43 @@ msgstr "Eba! Enviado!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logo MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifique seu email!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Entrar" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s " msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -981,74 +1026,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Opa, seu comentáio estava vazio." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Seu comentário foi postado!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Você deletou a mídia." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "" diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo index b2749ff9421e5f15cf0cfd1853322fe44c3fc8b4..07bfd9b29d0b69dbb6d64850759079ebb659a8e6 100644 GIT binary patch delta 2463 zcmZA1Yiv|S6u|N6)|OIU0xgvC=D3sCyLQx*&p;Us_;c{E9?B2WHy$jfA zHld-Y7!evj5Q&KsQpFZ_|A)YNjNCM%`J&*U#QU?skci|_*+jommLd$B(bo~0DaRRIpg zLcEQoDC_e&NA;^rrC?&aGok(YXkAWu{$R?U(JQ8I>QD1*1$_CXq5tm>g zw&Gyijgrs-lnsuf#5vvf{e0i|uW=;fKcn1PW@3R-nnn>y0(H0$*J3H|$7k>y4!|6a zFM;z==8r+SiW#^b7h(w>z}N6BUc-3=-Gzf|mEt|Ay|@Gur)g*!k5FFI82)(=H{&>b zfMalIUHUDQVG;eMI1IOI#m)%*9Gg!a|&ii%{lmL)myIN+Nr(824cz?@yhg zA(?)Ka-wS}CBB0as0YJ1ih4=E10}!-T#DCF9&aHXxr#D8gtaJfzC)?VO_cTOsdNQO zFrWQZJ&p0W5ha0FQ7ZB_O6Es!878qAd+`WvVo+YWTAuzs9eG#E#|k`#b=Zw>Vo`%q z=kXKFL1zV3?nlF?AqlkMDm;u&<4;J^s)~->SsU)ggE$5Ad6}beAxedwM;9+*30AF4 zC)$ks^i>wYWxNJ8wydK5JZ!a>fpvHR_uz=t=>>c@fDP-_z-2@=Z(}~D)2o61MwD0zy~-8v(~07GaNV5uR?NE2eAon zq8y-_?0E(%j&*njA7U@=!~6U;r{U`x`2QP^qWsG4CunS=vG>{Zo%i5m`u(3vm%IW? z={I0%1C*;e(>Hz{2p^71)?8}D&+i&e0G3&4FC7v6^!=0NeCk$$KO~fvV)s&lBwXAbsV?pPTrYXrc zDw|mFz7uzy&RbRc#+rC*SG$h8y2ZJC$gzDLHrn#Sw#6Jfxo6JmjN$8N7#;P!t?`)l zwC#Jwx0654%?Rb&rj51#&epCM?`lszto}1IyVctgcHHEHg+oIl9oN=YT=qzh>R900 zF_Ro!_f{yMZH#u~+KvUbj@o|2i4o(o#rrc87v70DI?8U^?`n^i>ZN9fT`F^BrWfdN zS9{E8rt21CIhw+m@ipbq+L~x>y`wK2cP-nuOz?Pyr#*Hsax(4O|7=#K|1;Y$erm<# z;#5@~9e9QfEh((;gl!!UoUqd-m*a#zKY3@F$x5u|0K1%6KrXIhIUZ@ZIxan`X)K%6 zXq&AZyQ{sdFUO_EVlWnW1DlL=%xR7LT82{dOu8bL=i3&GOF3~W4Zf#hb0s7t#qqRN zOnm}5mo~b^iv>DDSGJ6qxR%#pe5vZ)l~*$o^;W9Xj@#n-5n1Et9iGqi>m5#;vqerA zwcWty!X6*g$<_b+liE5}!a$p7*s)S&rCNpnawjocn|MGZr^T^sxel%_VrTPN%2u%E dSVj(oH?F zFSr)@RasVUvL~8M>Bsd-iC1wsUdN@FzJXC#h;FRKG;GHV?8a;iVGa)CGCYMc{sWYG zFQY^}jb2<@qf|BStx-|6ox-y;Wa5{YiZkfK>+$+cl!^YqjhIxcR6cIOdVB=syBAS5 zFplN;5f0-l?!tk(SZY2&Ny+DR(bx`uqCo<lzJh`0_C_8tI>^}cn9{Q z1T=(_`%@_2y%O)Ai1$xoHtpY|oY~DN1&u=H-LU|wa1-@LT!T;IefTCWz}qMjyGVls zoQ`r7%ds6RundRr2)=WC-GI0szD1X3oyn>Q}Kau&PDzzbYc}h`s+<>yP5awbO z6LAa|;z^VRUq`NkI)``S4J^XcMxG2-pp5H4S-1x!5EED76PU&N>NEw3^c|EPO`@du zBFaSHVh|I^m((9cnP3c?a1!O+B~p>2$iXozMVaSAl#G0e^8GcG3@o{q09aqGrmzAV zPy+B{4i2D1{yc8Q6ZkOB;5atXD7X9?N`Kb2*lXy*O6o757tiA}n7W-{(ZUpL-$8bh zDRfbg00P*G!`O_MkYH5-6^S^2LwE#Ba31rpgc~Xu+JYgRz%ndoQR*e!fjoWn8%ld2 zi)h%=O8&Xfs*i^I@l`yEb0{AS?c{CayXZnUkGKalOu(m6GB%1b@kx|`&c~fW$%JZ) z-TEq&qwt}Od#a86O9oERun@;lCOnJz_%TXme#S0L+#So14?C&9g|dMZqURc@CiLP6 z{)HEC6sLHb<=C=E{r3-V5apFkMJe=B*ta)!=95@V{W40*=Wz{Y?~5;h63_@r`)epW z`Wg@8EiA&vI+Swaaa@ICn2M7q8@>?N{YAXv8(cug73BETY=`||`k}&29<8dbzN&V0 zB|m8`zJ7D}AM}|ihTWVQpi);0;9j&BOkn5eZZn;R9zYGn}rl-e(M0 zS?lJl>I{!#tJTt$V|hDE>=93=(`6nsLjBg&^`lto#GyMKYSP$5mvN+ZEmsr!|%D zw!dmTnqYlbaK?6Q>vmao(aW~0^)rWcqgc1Qcb#!$KVU>OUm&0dG_zONe5UF1_x9-_ UJAL;bNy$OufM!HY%h7r0UzhGPd;kCd diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo index d13c144551b500e43c78af1157fe3e53859b6b87..90d2cfdabf7f8a36965b3978dfddb1d6be406de0 100644 GIT binary patch delta 2253 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 diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index c3a43705..e412694f 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -215,7 +215,7 @@ msgid "Wrong password" msgstr "Forkert kodeord" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Du har allerede en samling ved navn \"%s\"!" @@ -241,7 +241,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Hoci, starý symbolický odkaz na priečinok nájdený; odstránený.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Desværre, jeg understøtter ikke den filtype :(" @@ -336,43 +336,43 @@ msgstr "Juhuu! Delt!" msgid "Collection \"%s\" added!" msgstr "Kolekcia \"%s\" pridaná!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin logo" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Bekræft din email!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Log ind" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Poháňa nás MediaGoblin, súčasť projektu GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Prezeranie výtvorov podľa %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Obrázok pre %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Pridaj komentár" @@ -984,74 +1029,74 @@ msgstr "Pridať poznámku" msgid "commented on your post" msgstr "skomentoval tvoj príspevok" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Ajaj, tvoj komentár bol prázdny." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Tvoj komentár bol zaslaný!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Musíš vybrať alebo pridať kolekciu" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s pridané do kolekcie \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Výtvor bol tebou odstránený." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Položka bola z kolekcie odstránená." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Kolekcia \"%s\" úspešne odstránená." -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 ce422a330c0ffdb782c4bc8dcac0f8765ba5487c..0711332d0865eb854756088e90f63e3426e07bef 100644 GIT binary patch delta 3878 zcmZwJ3vg7`9mnziCYv_|NhE7Xkc99GAq~WYKq3$xNsxqhz%~K{lx-S~EG2p4Wflan2`sUo?Ks@h_c!-Wc`%_w!|Uvp#hHiG494(QFvz;8>iC_u_U; z!M89LkD~`qVK+RD7x5F!$9H>}<(WBloyH&r2Hj(pjni-gcdo=y^gT)L#3iWMW@04P zU>eRxF102kMr%d|)Pk&KyD<(AqYpb!*I(%R+%daKBbkA_7=_7nMqnyV!s$2}Td)v6 zLru_|RWxx9CSV~duyGiTW!Mj^PzwieFm6EIw+B;L-wx8aA5UQuUd4QTtd~2{D@bhC zhWy%o{wRQxsD&<|KEH%synzbn4r<>YG=bR6@P>yumN>s?WlS8q5|88#Ae5QoWD~3QTT%kSV6xN zhvEZ-{S+?1vv?jC;U8Ef2UFQj0hXbPvk6CHE3U-TsDP$WC@SJwi3|I z>JZkU^EnOOIE{ReUGt+-_%vz<`%nuX#~1JnDg%DDsnph^cKj@Vbloo0jzg&V-V2YP zN3GL|%7iDQOUI&V=*$!FVVs3+_*+z@Gcw)Bt_g?I--F7`IUJ7v!5SPw8dV$XQ9Hei zTId>P;SH?BK6J{k4$G-O`#lY^ZU4q4nB3p3_BE&-wBjrb;Z%$n;07`WchX;rKfnP4 z%`&hWHQ#c~#w}Qlhj2Ca9MtvZvn{xQ_3bE)D9mEJ^D!HBcF$oXZbL7&Vl2LjO7WYh znmLFH^aISmOUSF$Vpv`C7NG(fjk>M|W3T}oO|XiFo`UC57w*6zco1jf=Qs&V7@UCX zun3Q1De74)fpNGNpTZ~6!+FuPr?CRtaSMKheq5hR{;3D+%ymgLVoR?2iy%^Mo!(b99~~! z*D6upddqPX{o94^4vI#&kxxa{!W`tCWHqSAa|NnaHlPA}5fiaJJbnNbUFC1-q#ms~ z{Q29MLjO<5tHiN0G@2N=hDuR@?dz;wM^$+{>cw#g6~KoWjTbQqzd$`5w^0E_P%unv ziFhC8qIOyy9D@hrx1E{pK*sOq0M#{Je? ziYm@FBzg88K7)5K6<3dSi?|h)f&F+tot@j zD&;>5yAIRnzl41;gj(n{>gfJ~%IpnPX78ZpOQ5h+BlnIY|C+Ff0i}F0_QqONRj)za zxCvEUJ5Uq8fqn3IsFeO0HSs5?`>vo;d>xhg+c+5G#=GBo`KbH0k9XWN-phbe_!rdK zdMCIG_re$G_d^xkUhIztP>=0-)b+6w-5sZ*Y9A?Zls5?kp3m)C1>g7u9e8k(weXa-^4{2$!yx`PcRynVHU2$O5A}=Wmk|}EN_yV zac2dMB@6^nMHBImyMuI`MZXZI;xCZ8vcKU@^i6iZBMx9D{m)QG7|m+gn1!V{1y|$q zsK9$vQBOD;3DmJyXv}Az4RvZopu9`*mYF=LXyuJ)&m zK_|T--oLD2DMNKD{GqGq6%mnji~XU(zUyM|3Dnjy%gjLI!bZPU2bKo+4cZw|Q5D=+ zRTOF-oD>sNlrcQNxS%lj>%2_0M-~?h51q(68TajoT1FLre?-At-|WzXC1bu5Rcdf^ k>74(M>@81l+xXqySqg8$gx2o~@8imM2rsm;>aWq?09;h=I{*Lx delta 3612 zcmZwJdrZ}39LMo52pldVC2|on4}u7x1Y(FBQwUL$kQB+O#jr?pnG|MCvyO_hiz(5O znwRFRY-Ja#ldTjhakF&f(y?sd6txRpTI3`*ovZhU-`V;nhP_xV1*pKrY% zbne|C@9BXd&BjkV|8C=7OPG%S`*|?hY$%5h;V^s_vvC_v!ZsX){Rf!EV={(gJ_cbC z_Qzs8kN4vk92;YHrIL;0ru?0mpOv-1=1LomNI1RtW=@`LHcj0VQ2QQ;K z-iA@Q3l-R>s3h*i;n;#2_zb4wHPmx%qKs#JyMxBNZr{b)QoSUG8s%7)n5#1z(iDk9#lUwyfhTR zqo@Z~ql#lAsu33iqQrJdRp|j=*s@YAOE0#hAoHx_=#N?YE*b=0^p588x2w zCXGfKk>p7;-ik`)PSgzdqi*a(&9EEQ;q}1zSZ>llZq&^4P;2YKIoN=^uoD&F8n?5H zcH=1R|1KKJKy1hc|*s1A2w2DajCyo{@{D6Q{JX02Gw@f8fk zijihjI2S|kOVrXGKxOhU4rF}$nT8^}gl-HWPj})7)WDUf>-Ffu4X7gWp{n{_)O~yL z4m^RCcoU~#1yL8{b{vOYScr+-?Df!?OQQjsaTN|`&+%)o^Jgly;%gYmf<20FBFkz0 zMmrfvK~-}ZGI^`P0^EQK{4lD&Gf25v6zNrFGP20OI(m^4!T27kqYp3wTTwG^L#4Dm zU`OD37v9bJi`W)K?T|JN(3|Z97)wFXv|OBoHONcV-a*yGS2^TAoW^lZ@Vs@Ps{It6 z#|tr9zlJqHsW}Wu?GA@;+i$Sc9>QQL15M&k}I4Mp@3 z4#3vHh2y9Q&!8T-7Puas=e&p#P#MWYWgrK&)^%8fU!rDy9rb)B3m=ISFbbyzj=dE$ zlrqS9gxXG9QA@Q0RsA2Lo;!lccn(Km2Ti1%+vmVnT8@ih#KGsD)JMkz`AiNUPW!o32Yf3F2R#%6Py>-&!{T*upatY)uM`f zJ2Gi&!8O>6gYlV(6f5If6AjID4=MwPP_=LlWAHCj5e7|i-jrie0hgl!o)b8(Mx}O9 zz-LiKw+V;gZqztOQA>0hy-H;d4W+Ud)nRaMy+5c|I96P8RC<$;Do0ZA&>ZpA$aZg@2+VY@Y0Vt-eOyF?Kaz zN(ui-;dmC#!`1jOcA{!#;uL3q>6pUtOf1Fa$Srmd`8Ai9%2H});8J`HRU93t$gg4r zMo-h%%4`8r4)zJ|#6OX@wl&@BRDBDoztgCU+`vK{F`XcBAu90Su^PQ`gcU~PX{^HM zFa%FwU+Ph*yn?EQko%m#5^xm9*{EId5NhC!sK9rl*8C8vh>xR+`Yh_c9wczDMVC2W zt9)cKwh76;ox~g*!n6yq3{?}GumQirRajc?Y`gDKDZPrXq33?*V|5INaXfaWlabk| z7uoZerv2YcgRN~Xn1I(X6JusM)$GAqj_0B}I*7q|7S+)&7>PH~g<-5$C=LiX2qQR7 zLbkr8q75IhY`A+tO^v@d`qgm%=J?d0L3Q=Dbx*lh)Ge=fKe1rhvS;e*YbN=6JeB_3 z#D7A3O+^X5IYa094-72{_Pg9`!+qP*clZl4N?fj7cTR4>m|Wj0*~w~;FUZOFf1Z6T q!rxRd{{Or6_jr7vbon^l?FsUIRs6Ak$>c5JzJxNr|HrZuVgCXh@wc1+ diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po index bc5aaaf2..e1d0a754 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -332,43 +332,43 @@ msgstr "Juhej! Poslano." msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logotip MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Prijava" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -980,74 +1025,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 73da40d81d318265c9af9be82bbaedcd9cc8e8d7..0cca32cf2a946cd89e3877c4d11193e8c856ed2f 100644 GIT binary patch delta 3887 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 diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 6c7ae9c7..56fd4849 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "Fjalëkalim i gabuar" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Keni tashmë një koleksion të quajtur \"%s\"!" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Sidoqoftë, u gjet simlidhje e vjetër drejtorie lidhjesh; u hoq.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: 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 :(" @@ -333,43 +333,43 @@ msgstr "Yhaaaaaa! U parashtrua!" msgid "Collection \"%s\" added!" msgstr "U shtua koleksioni \"%s\"!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Logoja e MediaGoblin-it" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifikoni email-in tuaj!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Hyni" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Bazuar në MediaGoblin, një projekt GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "❖ Po shfletoni media nga %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Figurë për %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Shtoni një koment" @@ -981,74 +1026,74 @@ msgstr "Përfshini një shënim" msgid "commented on your post" msgstr "komentoi te postimi juaj" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Hmmm, komenti juaj qe i zbrazët." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Komenti juaj u postua!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Duhet të përzgjidhni ose shtoni një koleksion" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" u shtua te koleksioni \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "E fshitë median." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "E fshitë objektin prej koleksionit." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "E fshitë koleksionin \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 a4a9cdc6686ce47ebc21196548e2d27d576d5d94..8084b3f4654521d653bacc044ecea85eb895e57c 100644 GIT binary patch delta 3865 zcmc)Li%->M9LMqR;c`Gx5lImQCGm!+2#FwSctbELykHiUQ}YZ@n#Tld;N|B+tLZWW zD?zKd($bb`rzII}CYHLD%Pzw#wav?Hl4%!HTH5==kF7r;2E3lJe4sZ}94 z+6GiYb;ww@2Rq;=7>7qt*Pm@W@0eYs5zB$w7>==YMq)e`;xxPm>o5z?qXHx_iUOx$ z6lS3k8;@Sh$G%vE8aRN1@LAM-d$9-O+W{KA@dQ@kRm{Xi-Q7U1A-UNOH@<2XQ2pqn2zpD(?HJ#P%b(SyLSAuabY?e&Q?^(7%jB@GjC`g>$hP z&)|IgkWtbwp6QIheAMQw!W^u}O8f?u(7kLFZQ?Ry^=ut#B6Yo}zh>UR0rsICL9JOc za<8?bX3(87s8UI&k`F+Yd?+g5IHVX>f=Xl&YKb;r3~obJU=OOYK~%hh4h;=>3>B~i z73el9fgYr-5@(=p%tLLSB2?w>M}F;L{;8x@sKA?0_tmxc-$IpsFKVe8(T~mr8oIHV zdQe^Sp-Q+KHG}=Afsf(~_#LVOKBlSCE=JAx8UE?Iov0ZHQSm-&KYj)^&Sg|3Jjrc3 z=B1%EkHXnF6L;V{s7$Bd={|NeqADDtSaVjR! z$wxmYUucJ!*HfqltKqdMmCgVlq z)oKxpuDIE#gvO$-E5!&bM@Iox(9lz`5q06KI2aG$EWCh)IGTeKaV=)!Q5=VQ7DvN) ztj1Ni5?PaCd;TOgHcp z59^V)w4Fi?^eaZ9_b&IV7mc0h$KW~aja*_Oysa3*vXE6bpF@M{+ViNd-hLcKKX0TP zxDu85Ce&Wog1nP#8|v|FK<$-dcn3CP7i>XI>~G{{YT>Mxu1`XpABM5$jHRKHOh>M@ z*{HSNi1%PKW?|nPH^2j^z_fi+sivL8N{nHLDxnRS zgga1c-Gsfd8MOzlqZ3Ude4M*x-7$fF4r&H7QKfnaRq_R>k}pC9T#Z`G8tj9+P)l?S z^@2Kusz3{>ve!`YZlU%_#CYnjfP=@ofySZ|C_$AtfVy!NYV)i|ZPv}Gnbo68+JFjt z9CcrFd;bEe^jASL(TduZ(y@6o=Fl%gt=;Ds zir=DUauOr)G^)fGQG4bFD$%HW-30of2FS;7T#ia;1?svj7=imx_kV*?ZFT{j*4>vJK!bMjDJH_q_thG zi_Uw|%R9xomIO;XZ;k9SDe%;i#esPXk{=H&@GTCW8r9#^(ZAT2JUOuJ@p%=s|K!Gn zPhJ*SQV|>)R}$W7{$svJE0PO+{<4J?wN7GrN8hsYr5y4<=?h*>EC>npFYpC>OE KM|b>RGWr*oR_oLN delta 3566 zcma*odu)w&9LMpmYI}OqqEwY~TBWT^(bB7FyRI%Zm#NOMNeQDO%tRJNPN~d{xpn4J zHl0+OkuZl%imjSxLab;cglxL>pSs0mlLcdYe>^AIzmub{-*fvu-{1H5eV(VeuEUl? z9X!8v_1|gyyT9SY^a&X7BEO;$1Y69pK$|M-oY%kmvwOhA4V73jo1+{VlQmQ&UhEe#a^Hi z3hrvgy{r!g;}GnD8L0Cozdr6UD`gPLj-?oYm6(njaU3>a5e9S8NSuZW@Hr}QHHKm> zDzWcTMLdb|cm{Rj+n9uZp{{e2Wfb?ffeiX!K9*xCrs6GBpz!Wy0()u@15k;&OXR3i1LrMQXoo!vvt_$8{6ew0!1B2YJsM#alP#hK(`pakZlE~r2? z#}}w(+=ZIaepCrhqXJ${-a^f=9To7oZ+|2w=|*nU%+pb8n}gG_5^M1mD#5jG=PCLQ2kZH7 zWuOXliZdIINjMW{qI%#Ys%fIBpKg$V{V*9P;6yCMJvat$BSo+QoU{ZBkhZepsKhT~ zF}C3(?r#|huQRbvv4#U)Ou>@=%nH||0@h+OHsUnAj}@3d;Pso#8nKk^Cm4XmiDt8L z2KwVE)Y6?rRk8`Ya(}zQK$+b`H~Lejq1YdF;}X>IkI{vjP)$^Y>gq$N^G@PGY{3$I ziQ}-CtP5}-W?(DkVKgUuav02DP>DNnHTLA0<7Z#-XDl}24h&(z=Hq^3Ij!Rmry~7O z-8>PQyv@UG+=NQJ2^H@)(ry+?c~zO@6zZ=)pRvOa>rjCXV=y+NW_$@%(rZ3%`i{5a z8|=S}F$74WY`Q@Kjik79a2T$|Ts)4vRP71sKCV=cvnG8~ov&3Qs@s#X4bzdI#iTh) zG7(uNTZ2^5YEd7n%b3OX^pQ^B?Wn}-up=HrUI}&r_4r-EPWZcrfiilC;pm_4%sdj+ zwXvuRMxu_7!ALAYRiq60*;4*!tq)-lK14!VHVdxnKSEV>Er#MIRAQc83<4QcBTtTf zi#_l>(m(bq>cYTGXJ(y|N8b{$9LJz4bPg5gPwa{>useoR7A25?IzAG0d=&Cjcx*BQ zWi$;HxD=z&gL*IQ_U-p#5Zf)N$LSVosajFp{{WSE2%V=m@u;QBN0qt^HK9+iCmz6b zJ^%F#v{sK%fuEr=e}zh{8;{6XbR&vmtZ#OoM2%6U=ULv{HiI#M62a#Rx@MT%jU zaU}+gb`n^JvE1MGG0>XUV;^irt@Q)c*XnQ7(uCzY6&Z?3xCm8|si@MR-md@|_D7q1L_vRkA&(j9XAQY(ssl9-(Gj@upMC4cM3M z8q|5`P%~^s#cTELe}+mdu)taB-US|KZR6N6odac9i|0@oE_lm%jJDxmwwq8D_yc)| zSa_lHvC6}_Y*(Xt<`w#5$Qb8i6@e4jPD2iv2l?4~4b;71bl4J1Ms@LSROZL97%$)? zj2-7BvKVXF-h(NaGv4`jEJDTGgvnTk`dGDK1t#)x(6^-yOVM+KK>&j+(wmLBsLa2{ zAUudFo9}uCd|WE$P;I|l%Wz=;cEN`2jS|;&QjLl4z?fRe5{<}^u`@jMS|aPnmG*z zaDOXez@u)\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -210,7 +210,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -236,7 +236,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -331,43 +331,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -979,74 +1024,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 7d65083b50ef9374777c5b52c2d11eb1dc896d20..435c406b2e69cd4214eb19d0024c4061dccd8fd7 100644 GIT binary patch delta 3908 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 diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index 859c1fd9..939dce36 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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "Fel lösenord" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -333,43 +333,43 @@ msgstr "Tjohoo! Upladdat!" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin-logotyp" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifiera din e-postadress" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Logga in" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)ss media" msgid "❖ Browsing media by %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -981,74 +1026,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 fca78822d04e89412a16fe615aec8cdeaa7f2f47..43de15d136786f5fa9b4bc8eb6f240eb45c280b4 100644 GIT binary patch delta 3911 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\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -332,43 +332,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -980,74 +1025,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 137bc4de19a93a1132fc11c3ee19c9fc5267bed1..854f7b5151d23ffe735f370ed4a04ed0e386e9f4 100644 GIT binary patch delta 3897 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\n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -210,7 +210,7 @@ msgid "Wrong password" msgstr "" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "" @@ -236,7 +236,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "" @@ -331,43 +331,43 @@ msgstr "" msgid "Collection \"%s\" added!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "" @@ -979,74 +1024,74 @@ msgstr "" msgid "commented on your post" msgstr "" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 5ce25b489ad4d8aa212e522ef720b1f8699b1141..846b8f70278a2a407b557f69ca006134ac425419 100644 GIT binary patch delta 3899 zcmZYB3s6+o9mnyr@>n9E_(0`hTtPt;iV*M_gZKayA{t3jsWoa@fru<&NgYYzcB+^* zF`9sRV6^xsX~$T#*~ABfQ%6m~jIp)0ane?CqF6hck;F_|oles4&wFN)Oc>yE&e?na z=YRg^+zSVGx^C@u1uhK?ebw-Fk)K3` z1b>ea*o7`Uhf#PQui$0O##8-`$uuTl{zD^`fz%jd(y#=d=gze_nZ9eF6L=~rw?{Ap z%P;|#BA1#5BuDciDxnr+F0&u+!(%uUJ5kqn-}^jZOfQW=41A4YIEc;!jKev&0Ow%~ z=HgXUfOuw6;BgpPCHj4MXt`Dxt4Xar?3_!!QlwaRzGq#~9FFJxfESYD5LtirTXl z)R}k-wStqV8~=gYvb(5~C-I?HHXh?}F-|}~YRmSb;=Y4Q>@bp>IXRU5SIIxNA9Q0O z{TrB$50LhAxC}4gC0v1rm}MNsv78*7jXInSI0?7mT0DJOdSQI#LW%ib`Y^YKvaP0k|Dif&Hk; z22t^j2WV)*)2M(qQGvcjB`}1vRpKnvjd`fUQ;e$IW5~Bz!Y`Gy0TuXV)O{_s{~J{4 z52CiJ1FJC5Lqj)~P!FnWyr>ecL#^O2YT_>3f`3C*z{@gK+G^B_H}Xr@y@gtF5Ebuz zJAMf@&ka;1T%LOdOgIhgc_coLi?9vfMrFEir1RJ{U^@MSsLEW#Ec`E);aJM3v(boJ z>2=gZUtluc!6F<^XEs)00q4&gph30Gmso>?MmeYb=cpBI!$lax`RE?)B=Q*UqQ4%0 zfTL54@n9(`-qV$_oD=`AsBe$DPs4d!zy|@$kHm^M39NJT;g?t&H zL3K?MudxK~EXE1+D|4L*T2Yz5hv9e(b^1?X6n0y0;z0U$Y(I)1`aBMKnVJ;ae+YG5 zk?jYT(oo=4$f8Xh&cHp$V$C(=;G1D=xZVfTP!*exy6=amiJq|iY8*}9kD90jwZMI- z`#wT#-DTwE8ZckcSjIs7BxmK%paQ>xv3S(_C*%gxV?TFIb|#KMT_0;rMBSHcoop?^ zRK~ri>tDitdj7ZCfjy{<_o5~`hC}dUOvYaH;9yRqR-B7E6Ekoa)*{6+zeG)N+}eqe z^v|N={~dJ*KgIscZ*J4jjUhZk3OEHdUWr%mI{NU;gH9tH@i@gmA=lL5elQnuGlrpK2{at>{On3f0(t zll{C673V$F-gjU${t@-m{56kts&t<*pal9(cUF{!y08e9;9}cfi3(JYx_%vMuXmuv zgQ)9|p(g$SRr+(7fETd_@7R82e!wZ!hJ5F_Zbb#?MkR0)U%vFs=y}H%D1Dg zKVa=ZE$B4rx=&CEevW#DN6d8ML}MQP!2ue2wU%NV?m(S^nX{ZfDo>&MJ8=}Awcf@O z`om`P4=Pro5jvo4*$hkGwtw{w=e+lYv2VSG`IE~+-G7T$qOhDb3WnG0y^xJS3 zc3~<$N%kYL300AIF&jHkfA#L-N-UY{{82iDTKP2$*Evs_=lqe$K$UzwhTtp61?E*$ zDYv6ayU+SQYQjsHjGtjH#uhn`R}t!rEJW>nEh^q7RGemv(sQ1s@OkKaV}#d{tw+4vCw%sVyy9~N{_;D-YF(~VX!Rv z&4_-pd~0f|eap)|t9|9(>fjf#qg^Rg)m~45uWt47dIJ@{de2(l({-NO<$nJfUtM{g zDX8<+)CV($mWD;Gc+&fmde0nhRYhfeb0E>**IVbWWvJ?>-e7NHVV{tya&Itq#D<6% zUquCRAMw>MulJf#Uv2Z@)LnfFi-Ve=onc zC#Aba6?`kfoCwS8mHfsOy#-O=;<=35=DHoJdMUK|!(@}2bZ^VUW#_*Q;L^V0i- aE>eP5^VhfslzuP6vbpWbFlOF}@c#n?BmH6k delta 3598 zcmYM#3rv<(9LMp40xzU^K}8hN7exW_!bMTh1SB-CSb|Q=yo8a>fnsKu_L?Z=B~8)1 z(bN=HX>m9|L5iIhkkpv`}r=1 z`fo7&oae6te^r61{r~fPh%u2=Cu1jk0~2s7rr~L9jZK>w6NXV3g#FPEGq5RU;x!zL zN!X{kF};oPnS2T{G;G8;Jce&G@)i!DKBuKS@ow}`ug1oB5+m>|w!quSUd+F!4F!i9 z!&;^z24hcbi~UgjvmZbA88ekaD;f$h0820hm*dm;6^_7QI`zdI)C4O~6K};PSb^Hu zK2#77U}vmCEqn!I@d0X_mtBUjzUfY(BWB)eG`x*4ZZ3<~(ZSb*NnMkT9f`2}4~?w+Q0TGc%k9?Klq=ky)tF z&O?QEA!@=k$l=UR)J6`YuA&CXJ97th;)ke6HX@9guQ_VLaMXMQQS*%PQP2ivpav{P zCC9s{WZZ~4(Fdpy9zjj`1L_KDY`qS36~E(5Y|kL|Uy8c>EvSe&s14Vn*7H52u!h1D z#7QUKf(qph)CrHEI@Y32ScjUh!M3-elNR!#PM(6g+krR%ORxfKQ5$^A>%K*wU=O|j zS1Bk0AyLL8Vk}O=NvIq+fJ&Nh;->|ou?xoGNF0q>xEY7y6(k6z8=VR;6G#VSJc9}sOLrK!Ih{aDnn&;C92;6?2bQT zEFgUwVIqYR+<*(Q9q$~!=6ybfVKuJ9C%CW~_yKaArg2X< zB3)3~JQ_K?$-`7!iQ4#a)O=TvbTdr|uObuIi}-7zcW7vYAE74Njlo!rI`L^#NY7hq z?DMPmB<;6xy&t(l*c6GQ3GN1KkTp#MreQ1zreu8?)$h$j;vYm|D-Db{yRaoz;ypZs zN%%1z6wO7{Ntz|QCr`x)2IgT3?Th)A(gFuj8$W}A_!BD0FQVS22UdSyU-vFsq8>zB z6H!?^*w)8mDD@X@{Wa9YCCK5-3LJt*P#b-O& zD^UyWL-NFYgBti7>hAtVzT8Y0nKTuXkS0@xn)oEP!5^$QQT-p<=k5Bt3wx3NKGV}J zm_De11Fg?k^D&0@MW_WTtb0%!bx;c&$1waAyWl_Q#mE8ff`d`HFcQPD7*q8AucM%e zPgu{PCcc3BXK@>K!Uog?iKI5e%oMzaSFjMj=2cR}k_Wk0Fd3t$uR*<*`%wKZqHorL3Kgn4?1+A8?uoppjSWHd&qj@(jOv$(qtB*23DaKI)N+j0&1e^8SaT^qE1?j>c7gm8Fhe4RAi2! zHugPg{EZBsyHGt1`l{@~J5+)5PHaSmj;g9(xEoBy7`@2Z6twVs`(QUlQ~wsDupaZU85bRkbFnd&qq2BA zHo+?N;CC2|=d3jtLj5}O>YMv$I(MDh**h&S&-p9ly&z|OShQd3!lL}bSG~oB^NPH) zr_G%^zpyAT&AHq*C!j1na*lH}GOLl}@h%A}+ZwygNsr6&c#^$|$*D=nWvddRR34C; z*x&gq;cAexb3nXb=#68Wt{*PFvA6W*hgCN=uD)Bf&AFdCF`#T>`s>c6^!P?jNakyv OvJE4?aB@aQ1pWu(gR+|d diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index c24c7004..0dd3f1be 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/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: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-03 19:18+0000\n" +"POT-Creation-Date: 2012-12-07 12:45-0600\n" +"PO-Revision-Date: 2012-12-07 18:41+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "密碼錯誤" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "您已經有一個稱做「%s」的蒐藏了！" @@ -238,7 +238,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "但是舊的目錄連結已經找到並移除。\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "抱歉，我不支援這樣的檔案格式 :(" @@ -333,43 +333,43 @@ msgstr "啊哈！PO 上去啦！" msgid "Collection \"%s\" added!" msgstr "蒐藏「%s」新增完成！" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin 標誌" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "確認您的電子郵件" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "登入" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "基於 MediaGoblin — 一項 GNU 專案。" -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the %(username)s 的媒體" msgid "❖ Browsing media by %(username)s" msgstr "❖ 瀏覽 %(username)s 的媒體" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr " %(media_title)s 的照片" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "新增評論" @@ -981,74 +1026,74 @@ msgstr "加註" msgid "commented on your post" msgstr "在您的內容張貼評論" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "啊，您的留言是空的。" -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "您的留言已經張貼完成！" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "您需要選擇或是新增一個蒐藏" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "「%s」已經在「%s」蒐藏" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "「%s」加入「%s」蒐藏" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "請檢查項目並重試。" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "您已經刪除此媒體。" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該媒體沒有被移除。" -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "您正在刪除別人的媒體，請小心操作。" -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "您已經從該蒐藏中刪除該項目。" -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該項目沒有被移除。" -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "您正在從別人的蒐藏中刪除項目，請小心操作。" -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "您已經刪除「%s」蒐藏。" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "由於您沒有勾選確認，該蒐藏沒有被移除。" -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 msgid "" "You are about to delete another user's collection. Proceed with caution." msgstr "您正在刪除別人的蒐藏，請小心操作。" From a4eef7fe91918cb35c73f6df319308176e8e3129 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 9 Dec 2012 12:12:07 -0600 Subject: [PATCH 105/140] Elrond's suggestion: have set_current_migration execute after each migration run. --- mediagoblin/db/sql/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index c6d8562e..92866149 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -217,9 +217,9 @@ class MigrationManager(object): u' + Running migration %s, "%s"... ' % ( migration_number, migration_func.func_name)) migration_func(self.session) + self.set_current_migration() self.printer('done.\n') - self.set_current_migration() return u'migrated' # Otherwise return None. Well it would do this anyway, but From 41fc4698c5e6f41438c270bf088495bd2e7db3e2 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 9 Dec 2012 12:20:06 -0600 Subject: [PATCH 106/140] Eeek! Set the migration number to the current migration number being run! --- mediagoblin/db/sql/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py index 92866149..f6a3dc17 100644 --- a/mediagoblin/db/sql/util.py +++ b/mediagoblin/db/sql/util.py @@ -217,7 +217,7 @@ class MigrationManager(object): u' + Running migration %s, "%s"... ' % ( migration_number, migration_func.func_name)) migration_func(self.session) - self.set_current_migration() + self.set_current_migration(migration_number) self.printer('done.\n') return u'migrated' From afe0afdb88727de854de48909e4eb28c1ff57c66 Mon Sep 17 00:00:00 2001 From: Nathan Yergler Date: Mon, 26 Nov 2012 20:24:30 -0800 Subject: [PATCH 107/140] Ensure query_dict is a dict after the contents have been modified. _fix_query_dict modifies its argument in place. Ensure that the argument passed in has a local name and will be passed into the subsequent filter_by call. --- mediagoblin/db/sql/base.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mediagoblin/db/sql/base.py b/mediagoblin/db/sql/base.py index e10e7739..ca0c8166 100644 --- a/mediagoblin/db/sql/base.py +++ b/mediagoblin/db/sql/base.py @@ -51,12 +51,18 @@ class GMGTableBase(object): query = Session.query_property() @classmethod - def find(cls, query_dict={}): + def find(cls, query_dict=None): + if query_dict is None: + query_dict = {} + _fix_query_dict(query_dict) return cls.query.filter_by(**query_dict) @classmethod - def find_one(cls, query_dict={}): + def find_one(cls, query_dict=None): + if query_dict is None: + query_dict = {} + _fix_query_dict(query_dict) return cls.query.filter_by(**query_dict).first() From 0f14c362c33408d4642372392fa56353946d5cdc Mon Sep 17 00:00:00 2001 From: Elrond Date: Wed, 28 Nov 2012 16:44:43 +0100 Subject: [PATCH 108/140] Fixing our broken CollectionItem unique constraint. This one seems to work nicely in all relevant situations. See comments inside the source. --- mediagoblin/db/sql/migrations.py | 46 +++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py index bc68caa3..274843ff 100644 --- a/mediagoblin/db/sql/migrations.py +++ b/mediagoblin/db/sql/migrations.py @@ -18,8 +18,10 @@ import datetime from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, Integer, Unicode, UnicodeText, DateTime, - ForeignKey, UniqueConstraint) + ForeignKey) +from sqlalchemy.exc import ProgrammingError from sqlalchemy.ext.declarative import declarative_base +from migrate.changeset.constraint import UniqueConstraint from mediagoblin.db.sql.util import RegisterMigration from mediagoblin.db.sql.models import MediaEntry, Collection, User @@ -92,15 +94,20 @@ class CollectionItem_v0(declarative_base()): ## This should be activated, normally. ## But this would change the way the next migration used to work. ## So it's commented for now. - # __table_args__ = ( - # UniqueConstraint('collection', 'media_entry'), - # {}) + __table_args__ = ( + UniqueConstraint('collection', 'media_entry'), + {}) + +collectionitem_unique_constraint_done = False @RegisterMigration(4, MIGRATIONS) def add_collection_tables(db_conn): Collection_v0.__table__.create(db_conn.bind) CollectionItem_v0.__table__.create(db_conn.bind) + global collectionitem_unique_constraint_done + collectionitem_unique_constraint_done = True + db_conn.commit() @@ -128,3 +135,34 @@ class ProcessingMetaData_v0(declarative_base()): def create_processing_metadata_table(db): ProcessingMetaData_v0.__table__.create(db.bind) db.commit() + +@RegisterMigration(7, MIGRATIONS) +def fix_CollectionItem_v0_constraint(db_conn): + """Add the forgotten Constraint on CollectionItem""" + + global collectionitem_unique_constraint_done + if collectionitem_unique_constraint_done: + print "Okay, already done, short circuit" + # Reset it. Maybe the whole thing gets run again + # For a different db? + collectionitem_unique_constraint_done = False + return + + metadata = MetaData(bind=db_conn.bind) + + CollectionItem_table = Table('core__collection_items', + metadata, autoload=True, autoload_with=db_conn.bind) + + constraint = UniqueConstraint('collection', 'media_entry', + name='core__collection_items_collection_media_entry_key', + table=CollectionItem_table) + + try: + constraint.create() + except ProgrammingError as exc: + print "***", repr(exc) + print "***", repr(exc.statement) + print "***", repr(exc.params) + print "***", repr(exc.orig) + print "*** Ignoring it, you probably have a fresh install from a recent git." + db_conn.commit() From ea91c183ff8c6c877d3403f354c92b18a3788860 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 9 Dec 2012 19:50:33 +0100 Subject: [PATCH 109/140] UniqueConstraing migration: Adding the explaining comments. Add a lengthy comment explaining all the variants. --- mediagoblin/db/sql/migrations.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py index 274843ff..66557912 100644 --- a/mediagoblin/db/sql/migrations.py +++ b/mediagoblin/db/sql/migrations.py @@ -136,6 +136,29 @@ def create_processing_metadata_table(db): ProcessingMetaData_v0.__table__.create(db.bind) db.commit() + +# Okay, problem being: +# Migration #4 forgot to add the uniqueconstraint for the +# new tables. While creating the tables from scratch had +# the constraint enabled. +# +# So we have three situations that should end up at the same +# db layout: +# +# 1. Fresh install. +# Well, easy. Just uses the tables in models.py +# 2. Fresh install using a git version just before this migration +# The tables are all there, the unique constraint is also there. +# This migration should do nothing. +# But as we can't detect the uniqueconstraint easily, +# this migration just adds the constraint again. +# And possibly fails very loud. But ignores the failure. +# 3. old install, not using git, just releases. +# This one will get the new tables in #4 (now with constraint!) +# And this migration is just skipped silently. +# 4. old install, always on latest git. +# This one has the tables, but lacks the constraint. +# So this mitration adds the constraint. @RegisterMigration(7, MIGRATIONS) def fix_CollectionItem_v0_constraint(db_conn): """Add the forgotten Constraint on CollectionItem""" From a64abbb10abf025d10dbc1a49979c7c8f4d74895 Mon Sep 17 00:00:00 2001 From: Elrond Date: Sun, 9 Dec 2012 20:14:15 +0100 Subject: [PATCH 110/140] Fix typo, disable debugging. --- mediagoblin/db/sql/migrations.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py index 66557912..b4c91eee 100644 --- a/mediagoblin/db/sql/migrations.py +++ b/mediagoblin/db/sql/migrations.py @@ -142,7 +142,7 @@ def create_processing_metadata_table(db): # new tables. While creating the tables from scratch had # the constraint enabled. # -# So we have three situations that should end up at the same +# So we have four situations that should end up at the same # db layout: # # 1. Fresh install. @@ -158,14 +158,13 @@ def create_processing_metadata_table(db): # And this migration is just skipped silently. # 4. old install, always on latest git. # This one has the tables, but lacks the constraint. -# So this mitration adds the constraint. +# So this migration adds the constraint. @RegisterMigration(7, MIGRATIONS) def fix_CollectionItem_v0_constraint(db_conn): """Add the forgotten Constraint on CollectionItem""" global collectionitem_unique_constraint_done if collectionitem_unique_constraint_done: - print "Okay, already done, short circuit" # Reset it. Maybe the whole thing gets run again # For a different db? collectionitem_unique_constraint_done = False From 78fd5581a9fec142a1236eb90508724281f7f5ba Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 10 Dec 2012 16:14:28 -0600 Subject: [PATCH 111/140] Remove print statments from this migration. The reason for wanting to give extra information to the user (this is a very special case migration) is good, but we don't have a nice "official" way to capture and present that information during tests, so removing this. --- mediagoblin/db/sql/migrations.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py index b4c91eee..99448bfa 100644 --- a/mediagoblin/db/sql/migrations.py +++ b/mediagoblin/db/sql/migrations.py @@ -181,10 +181,9 @@ def fix_CollectionItem_v0_constraint(db_conn): try: constraint.create() - except ProgrammingError as exc: - print "***", repr(exc) - print "***", repr(exc.statement) - print "***", repr(exc.params) - print "***", repr(exc.orig) - print "*** Ignoring it, you probably have a fresh install from a recent git." + except ProgrammingError: + # User probably has an install that was run since the + # collection tables were added, so we don't need to run this migration. + pass + db_conn.commit() From d24a82970ea34d90b684e1adaf9ddebacf215b89 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 11 Dec 2012 15:38:28 +0100 Subject: [PATCH 112/140] Fix CSRF tests with webtest 1.4.0 CSRF tests apparently passed with earlier versions of webtest, but failed with the latest webtest (1.4.0) package. It choked on passing a "key=value; " cookie as it split at the semicolon and failed to find additional values or something like that. Removing the semicolon makes this test pass. Signed-off-by: Sebastian Spaeth --- mediagoblin/tests/test_csrf_middleware.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mediagoblin/tests/test_csrf_middleware.py b/mediagoblin/tests/test_csrf_middleware.py index ad433fe8..d730909f 100644 --- a/mediagoblin/tests/test_csrf_middleware.py +++ b/mediagoblin/tests/test_csrf_middleware.py @@ -44,7 +44,7 @@ def test_csrf_token_must_match(test_app): # construct a request with a cookie, but no form token assert test_app.post('/auth/login/', - headers={'Cookie': str('%s=foo; ' % + headers={'Cookie': str('%s=foo' % mg_globals.app_config['csrf_cookie_name'])}, extra_environ={'gmg.verify_csrf': True}, expect_errors=True).status_int == 403 @@ -52,7 +52,7 @@ def test_csrf_token_must_match(test_app): # if both the cookie and form token are provided, they must match assert test_app.post('/auth/login/', {'csrf_token': 'blarf'}, - headers={'Cookie': str('%s=foo; ' % + headers={'Cookie': str('%s=foo' % mg_globals.app_config['csrf_cookie_name'])}, extra_environ={'gmg.verify_csrf': True}, expect_errors=True).\ @@ -60,7 +60,7 @@ def test_csrf_token_must_match(test_app): assert test_app.post('/auth/login/', {'csrf_token': 'foo'}, - headers={'Cookie': str('%s=foo; ' % + headers={'Cookie': str('%s=foo' % mg_globals.app_config['csrf_cookie_name'])}, extra_environ={'gmg.verify_csrf': True}).\ status_int == 200 From fc7b1b17eb430aee964c85f1ccf1776cb4be93c1 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 11 Dec 2012 16:55:11 +0100 Subject: [PATCH 113/140] Make sqlalchemy stop complaining about non-unicode input These tests output noisy sql complaints about receiving non-unicode for an unicode field. This was ... well ... because we were handing in non-unicode usernames and passwords. Prefixing usernames/passwords with u'' makes the testsuite less noisy and verbose. Signed-off-by: Sebastian Spaeth --- mediagoblin/tests/test_http_callback.py | 4 ++-- mediagoblin/tests/test_oauth.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mediagoblin/tests/test_http_callback.py b/mediagoblin/tests/test_http_callback.py index d769af1e..8b0a03b9 100644 --- a/mediagoblin/tests/test_http_callback.py +++ b/mediagoblin/tests/test_http_callback.py @@ -30,8 +30,8 @@ class TestHTTPCallback(object): self.app = get_test_app() self.db = mg_globals.database - self.user_password = 'secret' - self.user = fixture_add_user('call_back', self.user_password) + self.user_password = u'secret' + self.user = fixture_add_user(u'call_back', self.user_password) self.login() diff --git a/mediagoblin/tests/test_oauth.py b/mediagoblin/tests/test_oauth.py index db4e226a..cedfc42a 100644 --- a/mediagoblin/tests/test_oauth.py +++ b/mediagoblin/tests/test_oauth.py @@ -34,8 +34,8 @@ class TestOAuth(object): self.pman = pluginapi.PluginManager() - self.user_password = '4cc355_70k3N' - self.user = fixture_add_user('joauth', self.user_password) + self.user_password = u'4cc355_70k3N' + self.user = fixture_add_user(u'joauth', self.user_password) self.login() From 8ba4380ff72a3d21c0b0d8c876c39cbb50a2f922 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 11 Dec 2012 19:58:25 -0600 Subject: [PATCH 114/140] Setting the user profile back to 3 columns wide! Previously this was set to two when the spacing between thumbs got borkified. --- mediagoblin/templates/mediagoblin/user_pages/user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index eb3bde48..4f7b1208 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -124,7 +124,7 @@ {% if media_entries.count() %}

{{ object_gallery(request, media_entries, pagination, - pagination_base_url=user_gallery_url, col_number=2) }} + pagination_base_url=user_gallery_url, col_number=3) }} {% include "mediagoblin/utils/object_gallery.html" %}

From af6a43d140cd65989a6fe151f9df7bdafc622546 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 12 Dec 2012 12:29:22 +0100 Subject: [PATCH 115/140] More unicode fixes in the test suite Pass in unicode not (binary) strings where sqlite expects unicode values to prevent the test suite from (correctly) complaining about errors. I now pass the full suite without any complaints. Signed-off-by: Sebastian Spaeth --- mediagoblin/tests/test_oauth.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mediagoblin/tests/test_oauth.py b/mediagoblin/tests/test_oauth.py index cedfc42a..a72f766e 100644 --- a/mediagoblin/tests/test_oauth.py +++ b/mediagoblin/tests/test_oauth.py @@ -59,13 +59,13 @@ class TestOAuth(object): def test_1_public_client_registration_without_redirect_uri(self): ''' Test 'public' OAuth client registration without any redirect uri ''' - response = self.register_client('OMGOMGOMG', 'public', + response = self.register_client(u'OMGOMGOMG', 'public', 'OMGOMG Apache License v2') ctx = self.get_context('oauth/client/register.html') client = self.db.OAuthClient.query.filter( - self.db.OAuthClient.name == 'OMGOMGOMG').first() + self.db.OAuthClient.name == u'OMGOMGOMG').first() assert response.status_int == 200 @@ -78,23 +78,23 @@ class TestOAuth(object): def test_2_successful_public_client_registration(self): ''' Successfully register a public client ''' self.login() - self.register_client('OMGOMG', 'public', 'OMG!', + self.register_client(u'OMGOMG', 'public', 'OMG!', 'http://foo.example') client = self.db.OAuthClient.query.filter( - self.db.OAuthClient.name == 'OMGOMG').first() + self.db.OAuthClient.name == u'OMGOMG').first() # Client should have been registered assert client def test_3_successful_confidential_client_reg(self): ''' Register a confidential OAuth client ''' - response = self.register_client('GMOGMO', 'confidential', 'NO GMO!') + response = self.register_client(u'GMOGMO', 'confidential', 'NO GMO!') assert response.status_int == 302 client = self.db.OAuthClient.query.filter( - self.db.OAuthClient.name == 'GMOGMO').first() + self.db.OAuthClient.name == u'GMOGMO').first() # Client should have been registered assert client @@ -103,6 +103,7 @@ class TestOAuth(object): def test_4_authorize_confidential_client(self): ''' Authorize a confidential client as a logged in user ''' + client = self.test_3_successful_confidential_client_reg() client_identifier = client.identifier From 6af6bc05bbd3c54ca242cbda0e74c62b023fe629 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 12 Dec 2012 10:13:56 -0600 Subject: [PATCH 116/140] We don't need to save entries during processing... also adding comments explaining such --- mediagoblin/media_types/audio/processing.py | 2 -- mediagoblin/media_types/video/processing.py | 3 --- mediagoblin/processing/task.py | 3 +++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py index fada083f..aee843d5 100644 --- a/mediagoblin/media_types/audio/processing.py +++ b/mediagoblin/media_types/audio/processing.py @@ -144,7 +144,5 @@ def process_audio(entry): mgg.queue_store.delete_file(queued_filepath) - entry.save() - # clean up workbench workbench.destroy_self() diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index ce47313f..aa6a25df 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -135,6 +135,3 @@ def process_video(entry): entry.media_files['original'] = original_filepath mgg.queue_store.delete_file(queued_filepath) - - # Save the MediaEntry - entry.save() diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 09abebb5..a8bc0f2f 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -51,8 +51,11 @@ class ProcessMedia(Task): _log.debug('Processing {0}'.format(entry)) + # 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 ;) entry.state = u'processed' entry.save() From 13ab48a7c444ffd28a5655b8f80aa4479dcdc58a Mon Sep 17 00:00:00 2001 From: Elrond Date: Mon, 3 Dec 2012 16:36:34 +0100 Subject: [PATCH 117/140] Fix spacing in links to attachment files. We had """ abc.dat""" (note the apace). And this space is being rendered as a link by browsers. This looks strange, really. So fix the spacing. --- mediagoblin/templates/mediagoblin/edit/attachments.html | 4 ++-- mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html index 31084c30..6e7da0a1 100644 --- a/mediagoblin/templates/mediagoblin/edit/attachments.html +++ b/mediagoblin/templates/mediagoblin/edit/attachments.html @@ -46,8 +46,8 @@

  • - {{ attachment.name -}} -
    + {{- attachment.name -}} +
    • {% endfor %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index b870a8ae..8c2a618d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -173,7 +173,7 @@ {% for attachment in media.attachment_files %}
  • - {{ attachment.name }} + {{- attachment.name -}}
    • {% endfor %} From 248b7ba34639f454c6c4dd56f77433d3fed2e34d Mon Sep 17 00:00:00 2001 From: Elrond Date: Wed, 12 Dec 2012 21:25:17 +0100 Subject: [PATCH 118/140] Do not translate just a variable expansion. No point in translating

    {{ var }}

    . Really. This does not hurt the string freeze, as it removes a translateable string. So any translations of this string are just well ... usefuless afterwards. --- mediagoblin/templates/mediagoblin/user_pages/collection.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection.html b/mediagoblin/templates/mediagoblin/user_pages/collection.html index 7ea84876..f53c164f 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/collection.html +++ b/mediagoblin/templates/mediagoblin/user_pages/collection.html @@ -56,11 +56,9 @@ {% trans %}Delete{% endtrans %} {% endif %} - {%- trans collection_description=collection.description -%}

    - {{ collection_description }} + {{ collection.description }}

    - {%- endtrans %} {{ collection_gallery(request, collection_items, pagination) }} From 42fe4f99655a3411a86a2e13508ddc542dca8ced Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 13 Dec 2012 15:29:36 +0100 Subject: [PATCH 119/140] Migrate some fixes from base.html to airy/base.html. When fixing our templates, we should always take a look at the other themes and fix those too. --- .../themes/airy/templates/mediagoblin/base.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mediagoblin/themes/airy/templates/mediagoblin/base.html b/mediagoblin/themes/airy/templates/mediagoblin/base.html index db500199..6e177ddb 100644 --- a/mediagoblin/themes/airy/templates/mediagoblin/base.html +++ b/mediagoblin/themes/airy/templates/mediagoblin/base.html @@ -28,8 +28,6 @@ - @@ -47,13 +45,18 @@ {% endblock mediagoblin_logo %} {% block mediagoblin_header_title %}{% endblock %}
    {% if request.user %} - {{ request.user.username }}{% trans %}'s account{% endtrans %} + {% trans + user_url=request.urlgen('mediagoblin.user_pages.user_home', + user= request.user.username), + user_name=request.user.username -%} + {{ user_name }}'s account + {%- endtrans %} ({% trans %}log out{% endtrans %}) {% if request.user and request.user.status == 'active' %} {% trans %}Add media{% endtrans %} @@ -65,7 +68,8 @@ {% trans %}Verify your email!{% endtrans %} {% endif %} {% else %} - + {% trans %}Log in{% endtrans %} {% endif %}
    From d2fad5c9c3d6795cd5fccc0664207810bd0cfc7e Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 13 Dec 2012 21:07:16 +0100 Subject: [PATCH 120/140] Make "add media to collection" a normal This button used to be a css style (note: No contents for the ). Using this approach has various drawbacks. Most notably: - Not clickable in text mode browsers - Possibly getting marked as a hidden (spam) link - No alt attribute So replaced with a real . I have no idea what to put in the alt attribute. --- mediagoblin/static/css/base.css | 11 ----------- .../templates/mediagoblin/user_pages/media.html | 4 +++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f8a9e014..ac53f580 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -219,17 +219,6 @@ footer { font-family: 'Lato', sans-serif; } -.button_collect { - background-image: url("../images/icon_collect.png"); - background-repeat: no-repeat; - background-position:top center; - height: 30px; - width: 30px; - margin: 0px; - padding: 3px 3px 2px 3px; - position: relative; -} - .pagination { text-align: center; } diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 8c2a618d..cb06c7ba 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -198,8 +198,10 @@ +

    {% endif %} From a04cd2e596887e8d8f59534ffc3a3795fc9d4be9 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 13 Dec 2012 23:39:19 +0100 Subject: [PATCH 121/140] Small styling edits to thumbnails --- mediagoblin/static/css/base.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index ac53f580..a8184f57 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -371,9 +371,8 @@ textarea#comment_content { float: left; padding: 0px; width: 180px; - height: 156px; overflow: hidden; - margin: 0px 4px 10px; + margin: 0px 3px 10px; text-align: center; font-size: 0.875em; background-color: #222; @@ -382,6 +381,9 @@ textarea#comment_content { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + border-color: #0D0D0D; + border-style: solid; + border-width: 1px 1px 2px; } .media_thumbnail a { From 2f5926a65d4e56d4ab9c7bfd6b3de25a032b8be5 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 14 Dec 2012 10:54:53 +0100 Subject: [PATCH 122/140] Fiy python2.7'ism (#566) The oauth plugin used timedelta.total_seconds which was introduced in python 2.7 only. To preserve backwards compatability, we simply calculate the time difference in seconds manually. I considered monkeypatching total_seconds to the timedelta object, but it is a built-in type written in C (I believe) and modifying attributes failed horribly. Switch this to use total_seconds once we require python 2.7 as minimum version. Signed-off-by: Sebastian Spaeth --- mediagoblin/plugins/oauth/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mediagoblin/plugins/oauth/views.py b/mediagoblin/plugins/oauth/views.py index cf605fd2..643c2783 100644 --- a/mediagoblin/plugins/oauth/views.py +++ b/mediagoblin/plugins/oauth/views.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # @@ -216,12 +217,15 @@ def access_token(request): token.client = code.client token.save() + # expire time of token in full seconds + # timedelta.total_seconds is python >= 2.7 or we would use that + td = token.expires - datetime.now() + exp_in = 86400*td.days + td.seconds # just ignore µsec + access_token_data = { 'access_token': token.token, 'token_type': 'bearer', - 'expires_in': int( - round( - (token.expires - datetime.now()).total_seconds()))} + 'expires_in': exp_in} return json_response(access_token_data, _disable_cors=True) else: return json_response({ From 18a52dacca63a58feabdc929711590a9e889b2ee Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 14 Dec 2012 12:55:21 +0100 Subject: [PATCH 123/140] Use the correct translation mechanism We accidentally used the fake translation mechanism here which will not actually translate anything. Signed-off-by: Sebastian Spaeth --- mediagoblin/tools/response.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index 6d14b8b7..8edd976d 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -16,7 +16,8 @@ from webob import Response, exc from mediagoblin.tools.template import render_template -from mediagoblin.tools.translate import fake_ugettext_passthrough as _ +from mediagoblin.tools.translate import (lazy_pass_to_ugettext as L_, + pass_to_ugettext as _) def render_to_response(request, template, context, status=200): @@ -26,8 +27,8 @@ def render_to_response(request, template, context, status=200): status=status) -def render_error(request, status=500, title=_('Oops!'), - err_msg=_('An error occured')): +def render_error(request, status=500, title=L_('Oops!'), + err_msg=L_('An error occured')): """Render any error page with a given error code, title and text body Title and description are passed through as-is to allow html. Make From c843de8a57a24930e2c04c88a0201937937710bb Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 14 Dec 2012 15:16:49 +0100 Subject: [PATCH 124/140] Add example to the lazy gettext version to make clear when it's appropriate I needed an example to really get when lazy_gettext would be good... --- mediagoblin/tools/translate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index eead6413..96144538 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -129,7 +129,10 @@ def lazy_pass_to_ugettext(*args, **kwargs): This is useful if you have to define a translation on a module level but you need it to not translate until the time that it's - used as a string. + used as a string. For example, in: + def func(self, message=_('Hello boys and girls')) + + you would want to use the lazy version for _. """ return LazyProxy(pass_to_ugettext, *args, **kwargs) From cc81b5e55e6cead9e926e8ca11876f8511e6d4c6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 14 Dec 2012 09:28:44 -0600 Subject: [PATCH 125/140] Add comments explaining how translitcodec *is* used --- mediagoblin/tools/url.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py index 7477173a..de16536c 100644 --- a/mediagoblin/tools/url.py +++ b/mediagoblin/tools/url.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import re +# This import *is* used; see word.encode('tranlit/long') below. import translitcodec @@ -27,6 +28,7 @@ def slugify(text, delim=u'-'): """ result = [] for word in _punct_re.split(text.lower()): + # Uses translitcodec! word = word.encode('translit/long') if word: result.append(word) From 00da119ec30742ec37df37022d7a15bfd4c3cf07 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 14 Dec 2012 10:49:05 -0600 Subject: [PATCH 126/140] Switching both gettext calls to _() so babel can find/extract them. Babel looks for _() and gettext() so this is necessary. --- mediagoblin/tools/response.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index 8edd976d..81939a77 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -16,8 +16,8 @@ from webob import Response, exc from mediagoblin.tools.template import render_template -from mediagoblin.tools.translate import (lazy_pass_to_ugettext as L_, - pass_to_ugettext as _) +from mediagoblin.tools.translate import (lazy_pass_to_ugettext as _, + pass_to_ugettext) def render_to_response(request, template, context, status=200): @@ -27,8 +27,8 @@ def render_to_response(request, template, context, status=200): status=status) -def render_error(request, status=500, title=L_('Oops!'), - err_msg=L_('An error occured')): +def render_error(request, status=500, title=_('Oops!'), + err_msg=_('An error occured')): """Render any error page with a given error code, title and text body Title and description are passed through as-is to allow html. Make @@ -42,6 +42,7 @@ def render_error(request, status=500, title=L_('Oops!'), def render_403(request): """Render a standard 403 page""" + _ = pass_to_ugettext title = _('Operation not allowed') err_msg = _("Sorry Dave, I can't let you do that!

    You have tried " " to perform a function that you are not allowed to. Have you " @@ -50,6 +51,7 @@ def render_403(request): def render_404(request): """Render a standard 404 page.""" + _ = pass_to_ugettext err_msg = _("There doesn't seem to be a page at this address. Sorry!

    " "

    If you're sure the address is correct, maybe the page " "you're looking for has been moved or deleted.") From 9d5cd0b924fe790d27b4941c5d226fc7bde03741 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 14 Dec 2012 18:29:00 -0600 Subject: [PATCH 127/140] Adding info to the docs about running dbupdate Both adding info to run it when adding new media types, and adding info that you might need to stop mediagoblin before you run these commands. --- docs/source/siteadmin/deploying.rst | 6 ++++++ docs/source/siteadmin/media-types.rst | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 0eb67be4..91406f96 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -191,6 +191,12 @@ codebase, you should also run:: ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate +Note: If you are running an active site, depending on your server +configuration, you may need to stop it first or the dbupdate command +may hang (and it's certainly a good idea to restart it after the +update) + + Deploy MediaGoblin Services --------------------------- diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 5653217f..3b46c1b6 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -43,6 +43,15 @@ video media types, then the list would look like this:: media_types = mediagoblin.media_types.image, mediagoblin.media_types.video +Note that after enabling new media types, you must run dbupdate like so:: + + ./bin/gmg dbupdate + +If you are running an active site, depending on your server +configuration, you may need to stop it first (and it's certainly a +good idea to restart it after the update). + + How does MediaGoblin decide which media type to use for a file? =============================================================== From cacb6feae48fd2657f02d85dbe949580d0fa6b5b Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Sat, 15 Dec 2012 21:00:41 +0100 Subject: [PATCH 128/140] Release note 0.3.2 blurb On MongoDB... --- docs/source/siteadmin/relnotes.rst | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 56267eb1..3e09078e 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -19,6 +19,24 @@ This chapter has important information for releases in it. If you're upgrading from a previous release, please read it carefully, or at least skim over it. +0.3.2 +===== + +This will be the last release that is capable of converting from an earlier +MongoDB-based MediaGoblin instance to the newer SQL-based system. + + +**New features** + +* TO BE FILLED IN BEFORE RELEASE :-) + +* **trim_whitespace** + + We bundle the optional plugin trim_whitespace which reduces the size + of the delivered html output by reducing redundant whitespace. + + See :ref:`core-plugin-section` for plugin documentation + 0.3.1 ===== @@ -49,12 +67,6 @@ carefully, or at least skim over it. See :ref:`core-plugin-section` for plugin documentation -* **trim_whitespace** - - We bundle the optional plugin trim_whitespace which reduces the size - of the delivered html output by reducing redundant whitespace. - - See :ref:`core-plugin-section` for plugin documentation 0.3.0 ===== From 98b927250ecdce4bc96ece2908ce2c9b49b21f76 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 16 Dec 2012 21:57:19 +0100 Subject: [PATCH 129/140] Remove collection_thumbnail styling, so collection thumbnails are styled the same as other thumbnails --- mediagoblin/static/css/base.css | 33 +++---------------- .../mediagoblin/utils/collection_gallery.html | 4 +-- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index a8184f57..f06b0af7 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -392,6 +392,11 @@ textarea#comment_content { display: block; } +.media_thumbnail a.remove { + color: #86D4B1; + text-decoration: underline; +} + a.thumb_entry_title { padding: 8px; } @@ -404,34 +409,6 @@ a.thumb_entry_title { margin-right: 0px; } -/* collection media */ - -.collection_thumbnail { - float: left; - padding: 0px; - width: 180px; - margin: 0px 4px 10px; - text-align: left; - font-size: 0.875em; - background-color: #222; - border-radius: 0 0 5px 5px; - padding: 0 0 6px; - text-overflow: ellipsis; -} - -.collection_thumbnail a { - color: #eee; - text-decoration: none; -} - -.collection_thumbnail a.remove { - color: #86D4B1; -} - -.collection_thumbnail img { - max-height: 135px; -} - /* media detail */ h2.media_title { diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index af332537..ab5e46ea 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -27,7 +27,7 @@ {% for item in row %} {% set media_entry = item.get_media_entry %} {% set entry_url = media_entry.url_for_self(request.urlgen) %} -

    		@@ -35,7 +35,6 @@ {% if item.note %} -
    {{ item.note }} {% endif %} {% if request.user and @@ -46,7 +45,6 @@ user=item.in_collection.get_creator.username, collection=item.in_collection.slug, collection_item=item.id) -%} -
    {%- trans %}(remove){% endtrans -%} From b28005984c8109c0af8aeb5c1a173730c7d7bb97 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Tue, 18 Dec 2012 16:46:20 -0600 Subject: [PATCH 130/140] makeadmin and changepasswd had swapped help text --- mediagoblin/gmg_commands/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py index e965dd57..19793ec3 100644 --- a/mediagoblin/gmg_commands/__init__.py +++ b/mediagoblin/gmg_commands/__init__.py @@ -37,11 +37,11 @@ SUBCOMMAND_MAP = { 'makeadmin': { 'setup': 'mediagoblin.gmg_commands.users:makeadmin_parser_setup', 'func': 'mediagoblin.gmg_commands.users:makeadmin', - 'help': 'Changes a user\'s password'}, + 'help': 'Makes user an admin'}, 'changepw': { 'setup': 'mediagoblin.gmg_commands.users:changepw_parser_setup', 'func': 'mediagoblin.gmg_commands.users:changepw', - 'help': 'Makes admin an user'}, + 'help': 'Changes a user\'s password'}, 'dbupdate': { 'setup': 'mediagoblin.gmg_commands.dbupdate:dbupdate_parse_setup', 'func': 'mediagoblin.gmg_commands.dbupdate:dbupdate', From 4d9b426ccfe4b6a3c875e75399011d7cf25aa379 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 18 Dec 2012 16:54:07 +0100 Subject: [PATCH 131/140] Try ipython-based shell first, falling back to plain shell Signed-off-by: Sebastian Spaeth --- mediagoblin/gmg_commands/shell.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py index ec1ab535..4998acd7 100644 --- a/mediagoblin/gmg_commands/shell.py +++ b/mediagoblin/gmg_commands/shell.py @@ -47,24 +47,21 @@ def py_shell(**user_namespace): def ipython_shell(**user_namespace): """ - Run a shell for the user using ipython. + Run a shell for the user using ipython. Return False if there is no IPython """ try: from IPython import embed except: - print "IPython not available... exiting!" - return - + return False + embed( banner1=SHELL_BANNER, user_ns=user_namespace) - + return True def shell(args): """ - Setup a shell for the user - either a normal Python shell - or an IPython one + Setup a shell for the user either a normal Python shell or an IPython one """ user_namespace = { 'mg_globals': mg_globals, @@ -74,4 +71,6 @@ def shell(args): if args.ipython: ipython_shell(**user_namespace) else: - py_shell(**user_namespace) + # Try ipython_shell first and fall back if not available + if not ipython_shell(**user_namespace): + py_shell(**user_namespace) From 5ef7ab084f246b81897e248590be3a61898adc77 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 08:18:19 -0600 Subject: [PATCH 132/140] Added documentation on how to add STL support, and notes on running ./bin/gmg dbupdate --- docs/source/siteadmin/media-types.rst | 36 +++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 3b46c1b6..26852842 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -77,6 +77,12 @@ good/bad/ugly). On Debianoid systems:: gstreamer0.10-ffmpeg +Add ``mediagoblin.media_types.video`` to the ``media_types`` list in your +``mediagoblin_local.ini`` and restart MediaGoblin. + +Run:: + ./bin/gmg dbupdate + Now you should be able to submit videos, and mediagoblin should transcode them. @@ -117,8 +123,12 @@ Then install ``scikits.audiolab`` for the spectrograms:: ./bin/pip install scikits.audiolab Add ``mediagoblin.media_types.audio`` to the ``media_types`` list in your -``mediagoblin_local.ini`` and restart MediaGoblin. You should now be able to -upload and listen to audio files! +``mediagoblin_local.ini`` and restart MediaGoblin. + +Run:: + ./bin/gmg dbupdate + +You should now be able to upload and listen to audio files! Ascii art @@ -140,4 +150,26 @@ the list would look like this:: media_types = mediagoblin.media_types.image, mediagoblin.media_types.ascii +Run:: + ./bin/gmg dbupdate + Now any .txt file you uploaded will be processed as ascii art! + + +STL / 3d model support +====================== + +To enable the "STL" 3d model support plugin, first make sure you have +a recentish `Blender `_ installed and available on +your execution path. This feature has been tested with Blender 2.63. +It may work on some earlier versions, but that is not guaranteed (and +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:: + ./bin/gmg dbupdate + +You should now be able to upload .obj and .stl files and MediaGoblin +will be able to present them to your wide audience of admirers! From 3fe3b2229c82fd894bc4d3e8effdf26cfc7780ea Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 08:22:49 -0600 Subject: [PATCH 133/140] Docs fix: Adding proper blank line after the "Run::" --- docs/source/siteadmin/media-types.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 26852842..8fbce5e4 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -81,6 +81,7 @@ Add ``mediagoblin.media_types.video`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. Run:: + ./bin/gmg dbupdate Now you should be able to submit videos, and mediagoblin should @@ -126,6 +127,7 @@ Add ``mediagoblin.media_types.audio`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. Run:: + ./bin/gmg dbupdate You should now be able to upload and listen to audio files! @@ -151,6 +153,7 @@ the list would look like this:: media_types = mediagoblin.media_types.image, mediagoblin.media_types.ascii Run:: + ./bin/gmg dbupdate Now any .txt file you uploaded will be processed as ascii art! @@ -169,6 +172,7 @@ Add ``mediagoblin.media_types.stl`` to the ``media_types`` list in your ``mediagoblin_local.ini`` and restart MediaGoblin. Run:: + ./bin/gmg dbupdate You should now be able to upload .obj and .stl files and MediaGoblin From f4fe38d8e0fe60e7b81601219a9317f75d79c980 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 09:19:50 -0600 Subject: [PATCH 134/140] Committing extracted and compiled translations --- .../i18n/ar/LC_MESSAGES/mediagoblin.mo | Bin 22664 -> 22564 bytes .../i18n/ar/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/ca/LC_MESSAGES/mediagoblin.mo | Bin 22414 -> 22314 bytes .../i18n/ca/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/da/LC_MESSAGES/mediagoblin.mo | Bin 21486 -> 21386 bytes .../i18n/da/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/de/LC_MESSAGES/mediagoblin.mo | Bin 22473 -> 22702 bytes .../i18n/de/LC_MESSAGES/mediagoblin.po | 143 +++++++++++------- .../i18n/en/LC_MESSAGES/mediagoblin.po | 26 ++-- .../i18n/eo/LC_MESSAGES/mediagoblin.mo | Bin 22487 -> 22387 bytes .../i18n/eo/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/es/LC_MESSAGES/mediagoblin.mo | Bin 23124 -> 23107 bytes .../i18n/es/LC_MESSAGES/mediagoblin.po | 70 ++++----- .../i18n/fa/LC_MESSAGES/mediagoblin.mo | Bin 22310 -> 22210 bytes .../i18n/fa/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/fr/LC_MESSAGES/mediagoblin.mo | Bin 23318 -> 23218 bytes .../i18n/fr/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/he/LC_MESSAGES/mediagoblin.mo | Bin 24055 -> 24165 bytes .../i18n/he/LC_MESSAGES/mediagoblin.po | 135 ++++++++--------- .../i18n/ia/LC_MESSAGES/mediagoblin.mo | Bin 21486 -> 21386 bytes .../i18n/ia/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/is_IS/LC_MESSAGES/mediagoblin.mo | Bin 23160 -> 23175 bytes .../i18n/is_IS/LC_MESSAGES/mediagoblin.po | 70 ++++----- .../i18n/it/LC_MESSAGES/mediagoblin.mo | Bin 22507 -> 22407 bytes .../i18n/it/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/ja/LC_MESSAGES/mediagoblin.mo | Bin 22055 -> 21955 bytes .../i18n/ja/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/ko_KR/LC_MESSAGES/mediagoblin.mo | Bin 23479 -> 23379 bytes .../i18n/ko_KR/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/nl/LC_MESSAGES/mediagoblin.mo | Bin 21950 -> 21850 bytes .../i18n/nl/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 21090 -> 20990 bytes .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/pl/LC_MESSAGES/mediagoblin.mo | Bin 22322 -> 22222 bytes .../i18n/pl/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo | Bin 21660 -> 21560 bytes .../i18n/pt_BR/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/ro/LC_MESSAGES/mediagoblin.mo | Bin 22636 -> 22885 bytes .../i18n/ro/LC_MESSAGES/mediagoblin.po | 139 ++++++++++------- .../i18n/ru/LC_MESSAGES/mediagoblin.mo | Bin 28344 -> 28560 bytes .../i18n/ru/LC_MESSAGES/mediagoblin.po | 139 ++++++++++------- .../i18n/sk/LC_MESSAGES/mediagoblin.mo | Bin 22312 -> 22277 bytes .../i18n/sk/LC_MESSAGES/mediagoblin.po | 70 ++++----- .../i18n/sl/LC_MESSAGES/mediagoblin.mo | Bin 21666 -> 21566 bytes .../i18n/sl/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/sq/LC_MESSAGES/mediagoblin.mo | Bin 22826 -> 22754 bytes .../i18n/sq/LC_MESSAGES/mediagoblin.po | 66 ++++---- .../i18n/sr/LC_MESSAGES/mediagoblin.mo | Bin 21582 -> 21482 bytes .../i18n/sr/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/sv/LC_MESSAGES/mediagoblin.mo | Bin 21812 -> 21712 bytes .../i18n/sv/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/te/LC_MESSAGES/mediagoblin.mo | Bin 21728 -> 21628 bytes .../i18n/te/LC_MESSAGES/mediagoblin.po | 28 ++-- .../zh_TW.Big5/LC_MESSAGES/mediagoblin.mo | Bin 21526 -> 21426 bytes .../zh_TW.Big5/LC_MESSAGES/mediagoblin.po | 28 ++-- .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo | Bin 20847 -> 20709 bytes .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po | 73 ++++----- 57 files changed, 684 insertions(+), 779 deletions(-) diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo index 06dc2263662a9edf7f07163fa97ead4f31ad4092..d8d02dedf687d84ff1b6faa9efd627ec18d77c03 100644 GIT binary patch delta 3637 zcmYM#2~bs49LMoL0)l%z5>!B+AgCe1BSBCb5nRv*l%ZfQL9Sz&qq!8OJzPQHF)xnHb=6&$;)W<$wO?+=|+Os$BuT zORk^~jGv4AMe+AfbCv%8x!A@mn&MB`1s`KFMz%E@fVub#uE22IilMk41MnEO#^cz8 z=P(8Lv@=UG^VxMSx>FJHl-V-g7=Rg+>z{TS3~-r+Q0{<%=*CFwhCFJS$e3&dY9Pf( zA2tVD;1Z0$m8j>d{rC4_82#HxE`qtyh-r8kb1*#2Y&aHUDt?A);0mhYyVwdJqXrg2 z?+RWkj6oNw<5cW{d8qg1p(0g=o$22`;$lAT!xZ$icN&_6jK$tSe(gQ}X#nd`9aW?5 z*I*DHK@I2xcE)qq0qCm{}j?pRKta+_lo`HH&GFuhgzz|I1P88-t)C59!in~ zR0s#5X0Q;|@hV)68&DBQV44bT3Tno={L^#OQ8O+@wYS_~Uxn(Z78QwlzuzKD?z09i zin!6yO&;JZ)JP+`I@>N2dr_W;ip)0j;9(qtf1+~3OFT8x&ruy6#8^CnUTng_m_+3e zoQqM~|6g%2gNjBZ?<}XAGlLQ=pj?Xicm_3)s5o{44#Vg07P_%hyt8ZiVNc4VaU?Fr zGQ5DCcs9B_iHa2%O#gP1i&yauYVGowejtv+AS}U9oQw+b3{=jPp+dbD-B^R_;0y-i z6C`~skkRNlH-=ya>ivQE-~J!Tg&v%U&te&l!X21{0aRw=aO{JtFcVK^wP)9+%nC{ z0T*)CSU751rl4{p8#Ry-*cPXta$_zkiI<_C-|WA?3w2-}K}F(wR0MsETxgBcS=b_6 zgt^#=Y9Kz{31uH_MR_1Q0-quMd}aK`%f@N z`@b0}tn81&PMC#Cw(+R7szegkYEd)0guH7Z{hhB}7HY{#u_Z1-4QvHQ;d)fa_xkI< z#G#byF`NFa9T`}K1=x$E_!}osjw9nVkP0MCY!C8|-9(~j@tMv+RE(N=z(6Nrk*HkA zKt;xjn)&P44ogu>R*62%xP}YOpdJ;fv#5~&fJ(BEny>SSKZDc{u)3ur;D;W9rfZ6RPq$~9gpg0Dk?YLM>V_w^7!O7J%*|H8`8G9bDXc%6y(gXIvj)7 zZ~_h-=FGGT)$uNj#Y5=DpHb~34tKtGvoVVDL7agXP!sYE;c3laE*9V_%*S7lJTp(O zlVr0{GYHFbcEeaygB92lt8p}*#WL(cBjmAtiY0g*+hWd(&cRcJZM6UQaS_Ok6R41# zMkUi3REV#llI9_5peR delta 3751 zcma*odrZ}39LMqRK@{`a*{F^eV;pWoy>}Et>EBLL=#1B~5T9TQ=CyMg`UDx9l_4KH!IuVb4b{;- z)cptOkIzv9`Ull+Q`V&e#$z}RMb*znuhwcM1%+xos)3!TH7h~o#6i>y&ZAzugIcl| zsE|i-Q!{g87`}#mumH7W<*0U#qXt%mjLpusXZ;oO+rAt3a3t4tn25a@_9~oqLRQb#qb5?)k@#!oC#WC~ts1pvw~%-3 z1!@NE2!kROfeLwdRLGN14Q3+2uqmj4mE4IQ?R0NKoB3p@S?~Ip%I=qZ(upZUW zE7Sl&8MZ>4jCye}DtWR|k(-8mY!+V%X(6iN?Wp%keAkCip+AaRs#BPY-dYNJaRTum zy5>QJa5ZWMRj7_H;WoU9ihze{DzuAGGv2_Lo;!$|aV4s~i@y51sDA2Dk#I#e=(Q#k zwC2G$9VcTM9!8CHVpnI|6=EXSM^TZf!DM`fGqDF@RBo(C&GaFvqdzekpW|4J;35li zaRm8i6%>fJ{e}71rkj)PYf&@UgOjlm$74W@GmvSxpX(y*i80;HB5?|;y>~Dki*X8` z!Zp|`w&CQnVw_9=c8)@0jApuXFdnsbo3Ih?Mt|Icfw&J9;?Gbya}qVsA21RhAV;eO z(7W30iyBY{>baR1fCcDP1MgALF8C1j;9l&3Cvhs);wT(I`TtBwCh@=~#do`4Lou)kxmjAE=16 zV!CQ)3Hsr7R69E`2+L73{t6Y5Q$El2BK~^d5)~QvBi6ade7DoVOEOFiho?Bddg(Zr z>pbL?w!;{SXD|?dMqal^*bM9OK0Zf2R@2+DC8rjvZo|A3h_2Q6R)BU!ngUcIDp&?07q0B(7 zbtz8ATFh2`Kc|5$sEB=x!B~cx=`mCUzDIVNRbzX6gmLJ{tn^+2hGH6Wlz1(h!k1L! zp+XeKf~%oy)Pqw|2gf4Rny<7ZZ=!a=W(>!JsH8iKTC>MU0$aO*&di1)eOMk6WjlykvKnlPwWxtT!A|%R z74a||B8z2D^!m7Gds1{3ZpQ581dH{W>CS7vmDd_-bZD1DeA>?RPt2$Jd5h+Dk?XA zLpA&g^EnX zdn{~(vmHmFLc9<=;BwUa+fW^qqCXz@)mNdG{DPOlQVPwuDnl=7q%otMU%l~2U$zd% z;uYi!vCz@ZuihA(&vhAUrh#Lej@zOp))n<$7OI_(kS^^ODjB_voRcmN6|zKBG9{xzJQ|fVucHQTfijF1k6Frs0uT&CE=Nc6R`-7;7UxH;_QwJme!5D;5 z7=VeWh@|>V_ubFLK&{Cb3OmjwU##38vd`6R$)Ki@{KdpASiESFXTh@E#rbb6^b{;u zn!7~h_yTTMCZ>+|t1N0=9pQHOjZ98SPfbg5_i?+M=1fSM\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -744,14 +744,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,12 +908,12 @@ msgid "" msgstr "هنا ستظهر وسائطك، ولكن يبدو أنك لم تضف شيئًا بعد." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "لا يبدو أنه توجد أي وسائط هنا حتى الآن..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -981,26 +973,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "ويحي!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo index 091056629af666977409d05ed42e217338cb8f53..ae6216cfefec7055ec32d2acb0e96ce53576f610 100644 GIT binary patch delta 3632 zcmYM$3y_vo835q3?!qp2T`mjk20x2}2FUIP#4hD7uyR{O5CkI?L`XAG9Fbv3{1FF% zNg%^QyE8(m2n>OaR)l#0o3t>eka2??N+p{S%fdpf=jHon+WB{%bH2+t?|IMregAIS zQ}p=mqWtmll5ZwIZGNl#e$+mC|Nm+0lG3Mi|H%G4%Nka8O{tMn*@O497q_vDPqT=> zWM@9llRUyY?(de;@RaiDZH>VWRGgpEI(Ia(UjOg~*?>jmDV6H?W-)WD7q;*xmf;MU8e&9OEdS;3W3yp3)S~<48Wv7~oHgf!}8* zo@E49YW7H8CswnZG4V)V%qtl8EoWqEHT#)AZPi%Gr&!0@p4mVPDVFpV`lP%4i2xpC zOtgb>{t1@wAS0j`*pElpoA0qN%gh?b2Qs#39P^Q?7L6ESE@Q9eF=}BkV+9)+H*RBW z)w7J0zr$GBzu1TUT|A2Qj4fNr7bb? z&IP>7EJJvLBiPBZq9~gLLAMj*9}Et)~~n-(xKu#Az}R>pYuG3MKx*N6ds z!Wig9MgVP$6rW+-*v>Mdc*+^6t75FI+Mh^i6Jy}njQi#l`b!uYUe4I6HT*JnGVaUw zl#eKqA&e9@Ggh#QG4UpD=64tw7-E@`+B(LHr}`7uEoQ8^l`-De3dgrICfdu$#NmQ3 z)0XGcs~U5h=#x_iyqytg#enRwYvNG-<&4Zc!dm`3`;$e z_i{Y%;$ixvX6c&9rThk;<|4KX%W7xuF!?t}dewob{65PdOtv*^IZ*#eZgj)3yhgnPH-N^2QK`wXY?BqPAO&t(ITVN5uVIZk5~ z-))Qq-O1@(&sy`RV;Za2NhO}<1}@~v%d(W7;8^_<`HJG1K!?&TjQbyBUtZFbWuTcC z=r3S3moYNCl@Y+BjD`J-`AFTH8nKtfW{JJ-%80l(E7^}#Y~TRSVSl!=J0E6bXcvq5 z9Am;m?98K#K>p0gaH&Tr$J{vaM!Th9WU@c>!Z?l947{&G+ui&qEH7h1$Uv^9K8Z{1d_nwT1n;FG*4@Yt*J)!AM zu3+y;zH0dZW5u5^wyfjitTuWuigGlaO6v+9VTFF5DOs)6GPX3oN28C%%lsnW;tY;! z$^QF&klXZ6(AzoPGd24b+{1X>+E~Z`a2AJI<~pw72zC_B5;ih2v8&ME&n{8F)mLUk zQ^R&H7{ShLU~J7qMoO>aAg*SPKjv`0#JKN6MnIo17F0Do+rm+dt!iX!(M-n5Z|2~5 ze%5MS@4znlq|TOavFSR-3Laym@;IYt249uc$PL_}|2`uFU!9qyemC#X|Coz-yR_tZ zlo#_u#*1u#LKtTLG+HC}{!5I=AK?%lU_550xR@PgXa9aLXOaH**@Hi12R_MC9%LC0 zvm=i%GWrI`@*Sq?i|(k--LP=q2VJf`Z{N!EJLbyjYH~I84Yi}U++TC9Q#-PucErB@ OHS>%2T{dF+!2bcz>Xz03 delta 3740 zcma*pdu+~E9LMofy=oP0-HOiBR&Vr~r_~EBTBQ`N7FBbZxfP8nQ8P+Cf?_e38KMmp zq1IJWrppMH&273di6Jf&2^5|-g(jK?|ct%0hM*h~%bF-Q5O04|~? zx`X=u9(v#lR6ws$853!JklD z_7auyFuv5v92kt_F$qgiTULh}_b@83BS>uKbVv4IDZk^M`gAFHQqN)8k+Ds)PN6B z1HC~7(1Ea(;yBcUX{h4KMrE!5`It%kQcBBE18+t>SLy11ic0+<)K;CqB6K#<(1W?; zgY23@R0@})R&WG0aU*WRtEdbVvP`A67`5Ux{L+2?|7OaBlmGq*4fpW_7VK^j#X6{wZ|hMMRphT{tyfgyA< zu?UAyf94j(QhUVIZ!; za$JUP>=#Y59EV~ZZoxmX5G(BDpL#G4>{hD$$fK%15y_Ux#uO|?MP82@@ElUN<_Rie z0W4SJ%*PhE88yx)*b?hdEB*qNkrOUY^&b^5Be@4BAPf;0l`m&LVJRG%$ zu{aE8V>%voU4McauvZ@|W9jHef4Hk(fWGvnAh()1s0Hjrl4crFMg0=BRX(gTg85A} zjan{@#58<{s`g|yUK931MVy0yI2{%6BJ6-p)ZT7K1yqg7P#vm9E?{T;-F4lQRqDPd zY_0ddHw~pW1KZ#*)LSqfJK-Ya&@-Emh)q2zRP|H)_KD zXv4#(BD{=&%x`Yc$is)IRQ0D4%W)n)#z!~p&&h^mcOXhWSws*O-o z%9By|rK3`w>vAHJTr&$xa36+Y&|vZvN+W5o_1e9I8gL70;#%B<$59iE$h1zze3wpC z&D5b*ehgJ?7f~6wkDBN;dSK`ft0p2bhrZoOV=RrOSc8|)fgf;QD&ksHaW!Egw#l;o zYn6$M=`X`#{0p_>X}r7IvJwo(#W)goBDa_aE)#}Z=Yq4GhKg+)YEOekSbx_YIFbHv z9EJOlTg-FZgM+e(9-A;0gIJD=Egf~zO~!ou7}w%GOu!PNnTvbTOZ6I%YhCDs{(P|p z-Ek{=;tp(u)u^pGfJ*5}jKsTWL%%%hXpKcZHwhKcGz`WS=z~?Lt=fz2^u8RSp_O02 zD7=r&e^gjDO*0=^v^j}df&XYLl^MucW!B>+Jc}RV*fCZH?x0d1NE%9UDi-2Zv|%dy z9\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "La URI de redirecció per les aplicacions, aquest camp\n és msgid "This field is required for public clients" msgstr "Aquest camp és requeriment per a clients públics" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "El client {0} ha sigut enregistrat!" @@ -744,14 +744,6 @@ msgstr "Editar" msgid "Delete" msgstr "Esborrar" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,12 +908,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Sembla que no hi ha cap mitjà aqui encara..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -981,26 +973,26 @@ msgstr "" msgid "Could not read the image file." msgstr "No s'ha pogut llegir l'arxiu d'imatge" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo index c511196af0f574f556ec1b468ae9d181d3a95ec0..9d9955ce9062515df3b7f145231ed872af2abbce 100644 GIT binary patch delta 3637 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 PZkKab%l|vc@z8$(zi_zh diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.po index 12466d58..c0677f43 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "Dette felt er nødvendigt for offentlige klienter" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Klienten {0} er blevet registreret!" @@ -744,14 +744,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,12 +908,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -981,26 +973,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo index 793fb975ab157d834381be3a632287c1146c5168..6374be42ed3d4f7767b64a127b33ebb772a9b98f 100644 GIT binary patch delta 4008 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 OTyDF2;c#-(v3~(aYZ$Ts delta 3817 zcma*pdr*|u8OQOn%T2&5M8NwC0s)gX%c6*QL5kodK|mo!O;T2NBim3Gcaa9PU6mvz zW!g+6#ze^^nMm5HQ*S$_ofz8;GukF&Y~nCYiy5U&%ouett*w(*$EM#O@6Pn!GRWtg z_j1m2p7Wetj~sV=aMTgGlor3w@H51}>HK>yQN92DJUY&p8FU}RS-2hDco56+9NvRt z#~YJ@**FGE(Sa2>7Ax^{tV0jZn_$cX#zf2(8uxNxKNjL|aSv~Pg$wC#on#Mu7?bD^ zVjO;m)9^e_#A`?_<_;>Luf!)}I9=wPe zX#8Yjh`~%oeoX;?6u?r{{aV!hhcO-lsDRo~<91^fzKT=vMC|%U7|~wcprIFUq4w%F zsuq&iP(_}L8fYej2;E z@IyR`pQ4L!H)8^$-iIwX4_`tR;RjfXUtt&Kuq>LUA62aHAXzp;sKBqHY9Wb&p{z^> zYHRYRk$>))Ra{WSK2%0pQK{XAO6?BRfG;46GjE{+c^9=6!${qk>!=mqMP<@S8a3Vo z)Pz~6@fM-RSreh50Q{&IcA|>oC#YiFk6O`ds1%+;4fqLa3x;F;tEjE`I|gtnFX{QG zQG0&?m9Z!);2Ws6*b`P*!6TC(nJ<&fTk z>V625uoqQCeW#sazQ50`HqIQODydeu4i+ZN(*z?f7E5NS7j6H0^kl7Z0FPy?Va=fzyX$=$}B1 ze+sEf^E=e(x)w7&QewX_6Sb#HV%A|c{pMKz8PqX+1y#)hs0mJEDW1hf{1$7mk&RX@ z3}8BbjLPU2sQ13c6pVZmyWwOM?b%q=aa@4~xEb|gFY=*g_Mrwoj&I>-xEyybv;#bY z+R_V{fj5zl3X{y>nz#V9&>|#&h*?fUE2~9S@uQfDU8uc!5mh{IqXxKuiu@u@!Y@%1 z{0paICKas!Jg8z^i{r5iRRhnV=J`F===@)yp%oS{wu@{DDrJ?Z>+5k7dXW=qPU9Mg9XgozD3-_b;{1__Y3#dT; zf~xXcs1+4g*dNs!QN`s&W#;>+Omw0q-iJ!{VbrPk4XU{RisSGf7||z_<2&|*iKwlZ zj1<1f!E9{6Y1oMxXfGWfu)fSO*jqJFGLS|D#?E*4L=w3 z!SERt;%y|mCYQ=ms=TO`Y{y>wDQat`R@p1gMQu$bYUNL&p5KKU_a&TwCr}w3M7{sV zD)O)6GQx!?&|PhR2kb`*+bmpRe^iE$gJPnn|A<^iw$WHC?Jt=oY@z=L)JjX)a9NEC zpaE4wAq?PoY{t^aYP)Ltv6~COLcQR5&|X;`*3l1QJ-&}iFzq2@j$j?CCcecvm|tU8 zcRgwg+faeNfluKGYGE7J*a1iO(n#RK9Soy`bj0B{R4sI&h0mfU`Wb4E&&T?IL+xcI zQ7Z7&s4Z*3F}NEiVlV2r_G2C%L6^?|5RJ#U;ADA>Wtx!1m}AH;n7hb!o8@cm{`0tt z{>Qin*RHcyG>q%%r}Nz$!Y5;1!rAoe8||<4ZKyyGp-1O`kOqZnZsBw+eRwo7(}))R z9#rZMVFAuy7AIDtPQ@xrML%lATTvP9#zfqSDYyqqa4(viyl{@?_4%S##%*%uwl7Vw z_{l414z{-Xn>zx*w(t7<;pR}FUG2g!x1(hfCnZKVX5>2V35K==JFKqYwvg5C4Tpaa z4Ef5VhcX)y`VwbsjrPo_az;OzwR=pTx8U`}8taKbtG}+cMNnZ&i++u<*>JnkZoi(mJA%UxPlwBSBBKPeA+!yT@Mkhd+|>g@=I z%B*m^*Wb}?Ee`uPb1UF&TNWO@)H2uSj~;V};{LxiO`lht6y3V0#gSfTFQmij^oO?i z!(o40dGtSvn-crJSGgm4v+|HLda(M9\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"Last-Translator: cwebber \n" "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" @@ -67,7 +67,7 @@ msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse." msgid "" "Your email address has been verified. You may now login, edit your profile, " "and submit images!" -msgstr "Deine E-Mail-Adresse wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Media hochladen!" +msgstr "Dein GNU MediaGoblin Konto wurde hiermit aktiviert. Du kannst dich jetzt anmelden, dein Profil bearbeiten und Medien hochladen." #: mediagoblin/auth/views.py:188 msgid "The verification key or user id is incorrect" @@ -223,7 +223,7 @@ msgid "Wrong password" msgstr "Falsches Passwort" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: 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\"!" @@ -249,7 +249,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Trotzdem wurde eine alte Verknüpfung gefunden; sie wurde entfernt\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Entschuldigung, dieser Dateityp wird nicht unterstützt." @@ -319,7 +319,7 @@ msgstr "Die Weiterleitungs-URI für die Anwendung, dieses Feld\n ist msgid "This field is required for public clients" msgstr "Dieses Feld ist Pflicht für öffentliche Clients" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Client {0} wurde registriert!" @@ -344,43 +344,43 @@ msgstr "JAAA! Geschafft!" msgid "Collection \"%s\" added!" msgstr "Sammlung \"%s\" hinzugefügt!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "MediaGoblin Logo" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "%(user_name)ss Konto" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "abmelden" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Bitte bestätige Deine E-Mail-Adresse!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Anmelden" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Diese Seite setzt das GNU-Projekt MediaGoblin ein." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -753,12 +796,6 @@ msgstr "    %(username)ss Medien" msgid "❖ Browsing media by %(username)s" msgstr "❖ Medien von %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Bild für %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Einen Kommentar schreiben" @@ -805,7 +842,7 @@ msgstr "Eine neue Sammlung hinzufügen" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" "You can track the state of media being processed for your gallery here." -msgstr "Du kannst hier den Status der Medien verfolgen die sich gerade in Bearbeitung befinden." +msgstr "Du kannst hier den Status der Medien verfolgen, die sich gerade in Bearbeitung befinden." #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:89 msgid "Your last 10 successful uploads" @@ -881,12 +918,12 @@ msgid "" msgstr "Hier erscheinen deine Medien, sobald du etwas hochgeladen hast." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Scheinbar gibt es hier noch nichts …" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(entfernen)" @@ -946,26 +983,26 @@ msgstr "Schlagwörter" msgid "Could not read the image file." msgstr "Die Bilddatei konnte nicht gelesen werden." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Hoppla!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "Ein Fehler trat auf" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "Funktion nicht erlaubt" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    Du wolltest eine Funktion verwenden zu der Du nicht die nötigen Rechte Rechte besitzt. Wolltest Du etwa schon wieder alle Nutzerkonten löschen?" -#: mediagoblin/tools/response.py:52 +#: mediagoblin/tools/response.py:55 msgid "" "There doesn't seem to be a page at this address. Sorry!

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -992,74 +1029,74 @@ msgstr "Notiz anfügen" msgid "commented on your post" msgstr "hat dein Medium kommentiert" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Hoppla, der Kommentartext fehlte." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Dein Kommentar wurde angenommen!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Du musst eine Sammlung auswählen oder hinzufügen" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "\"%s\" ist bereits in der Sammlung \"%s\"" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" zur Sammlung \"%s\" hinzugefügt" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Du hast das Medium gelöscht." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Du hast das Objekt aus der Sammlung gelöscht." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Du hast die Sammlung \"%s\" gelöscht" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 f2d82eff..17f38425 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: 2012-12-07 12:45-0600\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -309,7 +309,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -746,14 +746,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -917,12 +909,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -982,26 +974,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're " "sure the address is correct, maybe the page you're looking for has been " diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo index b5e6398b54e86a81458ae80cd6e333d4ec1c5ac2..28500ceb5c8ea9993f433a8a92644b5df615b139 100644 GIT binary patch delta 3637 zcmYM$3y_Z2835q37Q4D}$!=Jd@@F>|MRr$MmNwR1EK-S(h=fW^M-!LC-6VcP8`2^j zNfWJz3MP|lM`biMnbN9CCp9C}3lT}AYT8s)GL%uhJ+J?tsrl`5&iTLZocFxv{l48} zKPtHJMnU$Y(&pbw{+;x{i~s*>8NL7iJJ~v=FY12CZoJA`c5ai>P>$yfT+a^N&SJjB z0{)!W@gPt0DEslvwkg%5luduu=wYC|T}o@+F_aDZhp*2~SWuc$k$y)OGQ-Zii7riz z6jPeS2xJDWkruHP*RY%$7}xL0f4`Sy)=!5tTKM99*7IYIWrwnq#&HG*@D;`crx+7| z&Jtc_1Xg7ANL~pmS;|;=0DE!*!;^5R&X!-v95h?q6aCK^bmd0Ny>Vo6UjGQO=`{^N^X2F7qV`|t`MXSMK; zaVKZ-F{||E$L!A%+lr!Wbfv?R_RBiw2?9K6vlls^8LAt3@>3E)oRY+tBm`y z?d2niq&FjlBN;n*oU!mmKE*AJ4D`0mNNqpHj>r2E*FDVG@p8s|-^q{fWGu9sk%_~3 ze?v!}P48(;^+l(QI^ZLWNXu``J$8-kqrZfanH{X-&p3^rF>0epK4YhEFc#X!D(+_! zPjeJ&436evc8TZzZH;*b-lw`tV{gjsU?%U>U(Sg)68j=~IpSd7g206K%hc)7hLeSd;5ZKCMmF+S9Ks^c zc2`^N~Q8Tm<^1`7cnN>K!uxr z%E;I;DxXwu+s!zIG0#10#RZHVuV7?kb>4OP?>E-S|5tpm*}&$4l>R`QO7m5iV@*Gx zHPQhN<#|RxHU09n!eafIbbFe^>-Z2q<1+fBIk%+blb-j(9@A0AFT4L_H5v^(F(9|I z!;FZ}uqDqi!;36q`}*7qs~6krH?Wkq=f`I;iuh4RpxGn+DpoQs4-ll zt%DuUJJ`r=jQ7APUeC{2!ooqh;%v(Zu#AzJ3i|z(rcvFc`HUmj%y?hC$SS_g6+A^t zXVbk6xhmhpNZoUch<7q}wvVyU5k^42V>}gS7y;hxH|1whE z?aR5xyF25(a0_p?ep;sy{)Cq~P({vT&8^OtFK`@>vn#8H=6?GP=R*CZ?838*GcIn- z9a%Ly>kncCHklncoysmPX11Hg%NlW3zh3T(~ZjD;E)6HH(s?`JGLixJRjUMnuf z^)E6O+RI4&ent_#%VoUC4Cju>)yPJwzx48mY_3@TXdsI3pWMPC2OCAVgHcScFjD^u zMp1skcq%UD$6Jod1>Bt##_QRflNgzqLZ_PM^G?3bT`b6s&b=UBqT^2|7%!aiF}a0C zQ}F2?F6Hw)&Kt(&c6yGn^DC@kv)fYoDy#D@&HE0cMmi~^sI7W>*QM+(jfn8~yq$mN zB;MMT3+%hxu78lVob4qM0Y1yf$RYOPpXig?Oz_s^y^IAeaVD!L<}$jL-_YMkN1jbr zGztwASv^u#!d7g@h`55?IglCN$DUlt2eL@^Jb(W{>Z$K1GtF;`40cVbcerWafyAn%E4-;*SU@HkUxqaGOE7p zu3TVsjGCItO6#Zj8l$+0Q9Q?4%?pg@w_-|4UuQjUa&2DYav&?7pxv^R)-}Tx>nP*`5dbuPxY9P`ajTalhJ3ZNuQYK~Jx*%|xee Sz~H+6d)}=5R-ua)Rs9c7>6Zfl delta 3744 zcma*pdvJ_b7{~EvC6Y)4aS7tKE)gNAO~^&0Nrbo)ac_z$A`M22)gs7t5Q-{8wM|f? zCfe$ZTUv}#x7Ov4c1Baw7<3dhMaQ5nX{Y-A<=vV7+nvpR&U^NK&w0*sp7-56+U>fu z$K|`$IB=8ky2@W`{sMz_^xx}VxLF$x?_)a*YhdQVZkUM^uqkfANZf}ZcotoF9_wQ@ z{))d~B7WP@th<@dp3;b+Bc_pAEau`$u3U({ICeF52JVfDZ6pR@KDNS1$f;I>#As_! z0hJ?j*>0?dN3l7cL7jiS_Isb%0~$@}c!71X2?xp85(nZ49E|0dgf~$GL@|p7?uKEQ zgbJ(=24N0%z@ey#i?Iu?L|wNRBbnb0(`bw5u>>DrBF=2)4D>M)n^hujJH&?q_yIN1 zb=3E_F%X}l0{RCvZYcZG0%I`>vr+vM(WkvyOhc(ELk;jgYR}41HL(-5f>Wpqub{T9 z29@#-e5sXruqD2N$>>FG*)G($`%!@%L}Ig3&DnpY{IdUx>o|bpyBLQ(2zv=m#!Gk& zr{Do*>4q&?PEX816=w;iVg)Y5YE(eOC=?ZOA+mc`hFVB@EAp?EAEJXgv@@tZyM$b8 zHK-LdBMr(_8&t|Wqf#D^8ZZkx3QJKdIEb3~EUv=~s0@fYQ-z~(0MyiE3QI~_np808fu=qs7$!rwfZcG zhW0!R$Kfcf#4k{h=CyZjyAq7!crPk5S1|#fVLo;xjjD|@)JpH5CVGq=@i`8`HXP(& z5%#D4Y!3~xZBKAEHtFP4`%=^jDsU85;cyI&b^;lT+c{o_FJW|NGdGS#jrS(T;szXz zNAPWoh^c+@*#?}<{C1K?UF^tmCt)mV@7}=x`~U;70z+^cD#f3nYUVI1(C^WWw~W`C!c!>f`Z6b}be4t2YI+IQ~7! zSz)(iC-OlUM1LN-aXdD`h1d|+qHeFP*chw){ijg@UPNW^57c?V?4L5|YePdR>5VMT z`d~JCaVQ?ZEDT6>o(KIfg5xn5hJ~mi^`ZitkIGOfHpOp{dbDa(rvFAgH-dWA-j+Ud z(MI1sQXk~3t6D6P?P^qZ%2cZHQj?FP2qj0YOcrB`SDp9p? z9vkTXzwGb0gBtJw>Mn3m((SM{7{SFkna zW;uI23$sZBvucRFe-a!|$hD(d`VR0h^z zB<@Fzdk%H|4OC`-LyhwcRsF7P)~PD&p6&mgMy0qA!*LyIqOGU__MwXHBx>T*sDN%` zZE>N_58^4MiK0-c?}%NnJ1)TS=*IJXeNK@)q=Uk=a5hlI(;roQlW;T6L=|0dj`Mv3 zRO&mUiZTb4;_?3e8K{6)VH8$iAby3)%wc3#t=dOp6pe`f&aYkp>Om1UfOKO9swNhp zCfbE8(vISM)N}b~Sb$n--XLe?6R{)5({Ti@_It%|++e3hd`oDkxGIo`pVb@UMA!>+ zIUb35_z5bo$G9D1csO|Q94f#XR7PTlId{uIq|4@F1s+3|3F`ij8)^0@PQz80&wj??O{B{rxVN|Idz_1b zW1QP^K1MUYZK9!~`x-l7HBuJ#1XVogW1U~aaj5&Z6brEe+hd(^&aYl4jN~{5Loow` zaS(=J9)@8)D$~=k?i3pHsxF5Y*6B1SBh<|+y35q!S+feJ&MPXO{o1qw@6@?PbJULY z@^w{OqegCzC&itRnAS5X-jnR{gpSCKA6f8Lk(YDg`@KG|AkCfVNl1+6t@BdTdL~qr Sc*+9)@Azw7RV$M2xBnN#54dRn diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po index 4bd19dda..3b1dce48 100644 --- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/eo/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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -744,14 +744,6 @@ msgstr "Ŝanĝi" msgid "Delete" msgstr "Forigi" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -916,12 +908,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Ĉi tie ŝajne estas ankoraŭ neniuj dosieroj…" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -981,26 +973,26 @@ msgstr "Markita per" msgid "Could not read the image file." msgstr "Malsukcesis lego de la bildodosiero" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oj!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo index bbc0efb0661430919d9324ebb663fc431cc8d677..98dbebdd7e6fb0131e1c6e14479a4e1455e294ab 100644 GIT binary patch delta 4364 zcmZYB3vg7`9mnyLkPt9D6C~jwxrC?kN&*BDUI_$=Bs>Dht6;cEF3HkmH{9KggaJ3g zOpzkcx^|>Mr;UZ7Rb-^g@X%T)QK+pr(7{p>uq|~elvb@yi$kgX{&Lr$Gi8!|?z#7# z*Z==NyIeY&)OIu}dOaiMdxn2k`R&i|zdNdR|KHWF#ymvx8s^|#%)@@&jG2a&*bAS< z-q?zr@B}8|FR=@@;SIci1$eZ(F=LF0n!j){j2l@!jM++$X;?)2Tu*Pnqzq%yXlG*w zw6GrzMqV`~$eK(QY9ZCg943sNaSLYQ4%GVx63>reCi9!OxJc!}`&ft{VmbECG-ftd z<9K`tHNYQG1Am6;co(&>G-g-u(lHk^P!o^G;W!7?uL%{Y797C*<^?V`;4v(~{0F^( z>X5aVZz4bDDgI~y&!Z+ffO>uiQ}7gOL2u#!ynxyG3HHTK%&Pl?P$`;@QH8343k|Rw zm8)u0E%;G8*oNxZib~aKRLDO@?d+e}2XlD25Q|VLYebE^9<{Jd$Xd)cRK$OnMf~;P z05@jg5gdtM;wBu*@-O3ltig@UG6FxuahT4wRFow+5m#X|ejl}HY((wqXz6qnAp7Oi&{uNDn(UD{hAt7 z1j4AuHlxP-7HYm-Q7$y#&rk!sg<8N>REYnD>X^zlR6H4|(Dg^{ESEnDX$flJ#i)MO ziS}Algqu*Q+KfJY8PzZPAn{Oqggr~3qZ{SQE!_7xAg8g;=f6hgK8}B1^XUYeAJ6MGaX*c6sJdavP z{~??Nd<;k9U(v$8L%mZo2_L4t6c^!UY{AROC!Se4j6%g{FqQeuO)j3mPf)p=%l13q z3QWOO*a;m}hy$paX+ecLh87+|O>iDl@g7n>rUR?ddlsf)5vqSFwx9n+T^fhbPd%icwze92rIYnZsP< zhN}NA5+##CT#K;?wem1(z#T~8nv2EjPbs{N8Zfocvl|YiorRjP2z8w1qf)jSyWYAOi`Ws5Vm7{x%IPKS zf>%*Ba1;ArXI7JigHS1)gxbIpsMIu|#%so|I{z(PC^S1!0~|tiJc|^pxrqvC@5x>@ zPsDQCEm(7qyYYsEIEkpJC=tNS&Ls>BL_hCvc%1 zEJlT@8XrI(4#F_1h;}F1ui#MH7cmp>U|;OQhlF-I43)ak*cD4qRX-Q?UNh$6^D~rx zE{=0U9j+w2jVhl1pa$$(=IyK(Dz}BG1tkF$a@odE*Sk{^dBZN_})U7Zw-CQ7imC`Y>+}-*C7GkK>VC%7MVf6jdB37^I^{3C|&CU(>LUs>ga+K(wb2w_iLk2;RuMumDm4#JZ- z1h3&}?6ANKaRDk76HzHxii%7GGck(#T#4aB_!17+`TrFcOS$nGvUxLmp)p*V7jPQh zLZ#r5MP5i7@E+|~aXTJ<+}mmKV(?ghio0f!e?&%)&dU?;q2H*}s7$ zsF3c%k@!05bbO3YV)`;KRa-Eb_I}L9gQ(+r8VRZSO`?4z;YW%4pQ5V%D>S)7Lb;Y* z7yqK`isabVaoywFdfd(FRFG%o6&2@Cj6IuYsgXavIDcIHXkK=5$C{w)+HUN(1$R5o zh&X|;ZPhuk#)1K{TVvB>UyZGcZyk3%DYe!Y3^*}g;hvnfBX*t7wQ7TbuoLjr1ufh1 z+cf=7ZLO~@9?zbzDXCYvZ3Sy1uB+#ffaSPu(2XCMSd`q;wE_{R>3=%J{$BiccPCV9 zyY;qftqs;W{$TvgNv|gL47zLWaFFF#rEYD5uPGRNYD!KDOLXEtnv$E+KcGj9ULUOS z`ssp~j@4k- z+aVSZ95{JQ$I1 z+QURde7xDd2Px# delta 3975 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 OO)l?dpY>Vwy8i-to*6v= diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po index 903aa2af..e1249591 100644 --- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po @@ -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-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n" "MIME-Version: 1.0\n" @@ -202,7 +202,7 @@ msgstr "Estás editando el contenido de otro usuario. Proceder con precaución." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "¡Has añadido el adjunto %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -317,7 +317,7 @@ msgstr "La URI para redireccionar las aplicaciones, este campo es requer msgid "This field is required for public clients" msgstr "Este campo es requerido para los clientes públicos" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "¡El cliente {0} ha sido registrado!" @@ -349,11 +349,11 @@ msgstr "Logo de MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "Cuenta de %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "cerrar sesión" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -388,15 +388,15 @@ msgstr "Publicado bajo la \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n%(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -830,7 +822,7 @@ msgstr "

    Añadido en

    \n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Añadir contenido a la colección" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -924,14 +916,14 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Parece que aún no hay ningún contenido aquí..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(borrar)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -989,31 +981,31 @@ msgstr "Marcado con" msgid "Could not read the image file." msgstr "No se pudo leer el archivo de imagen." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "¡Ups!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Ha ocurrido un error" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Operación no permitida" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    Si estás seguro de que la dirección es correcta, quizá han borrado o movido la página que estás buscando." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fa/LC_MESSAGES/mediagoblin.mo index 155ccd223a8b9a1d8c00552fbb4fb242161b7fdd..ba9aad9b8dbab82e195723734ea42e3fe05c1c9a 100644 GIT binary patch delta 3641 zcmYM#3y_vo835q3E%%$b8!QV1+v0-AZFk)z7965DGIf&O;$^N}kn#fuF1RrM~?qL@m zVF7=^9z4!Ve4Eugd_zj3Q_7{kC=At5^6`|u>4}M~Q$KZM)?qYH%ggM?E=G;^!Hg}M%v^-3Q6V~5$k?l9MlLL8tl%-m zgL@cT^#&v4e`T!fLzZ%oo5!$@v1Kb5{eG1(v5hpB^cW-JPnU>)T-d8&8V_;=|HX|Q zV*2fThArG+l;M1bHSBI#k(Biu%OzaPU5p78OO#07k+e&xk+G0w#=;-&FaGi`ZP5^W z_I-Lby}?+)9~q&##0dG{7$LvP=&+M8S$yipm`D|4i{?`PrWQs7Rx={ImeJoMjPbVR z6r#hQGCDfRn7}zkh_5jo>}VO0JVlJq4PdOS+*gFOp3!j=0%vd(KVTXA4arW; zcn(v)n+v#!ZEUAEUb=gzMCGIGX#Dh^!eU-#?A;v8FXSS2;1YJ>Qbved89CF&2=#WB z@dd^JZ?PjkqV!3HW)t_7u`}x!&rjn2&i?|1xbZ&T!ZzN?{hZDMjZ-+2pXOH9^H&_t z&d%g!PT>ZgqEBiNu4!DsCwYWR**G%Gor5FA-x%q%hRFWw6s1%ouH#t8nE7f(hg&Fd z)2ob#wNv_}F_!%?HZl6Shh4dXvEp@%h-}LHX#V=v(c(YBg`FC{Q;^c{83TMlhDFDZ zu#)>Yk?r)BP9@b@u8d$8^#*!8&1MhY!Ao33pHzQq7O7RV%jqYKAG`LPLY;=@+HB^# z7&Cr}kpoBQU6Wp89Lqm2a^yY6M6R(HdyL6e+@F!e6^#2QFs{#GF+azM#7g?4+(W)& zj}Neg*Qn35&_+iGPcTBchuyiKMf@3KrN5?=mD*Xte^cJ2qOsX?6eE8WZ3vYm{9e!!U6^NfYO z%n12!^6jTNP5nGa7(Z3q<|uI<+gU0jV=JyORmCiFW- z^8TH1s=C)_k*Q^@d;xFZeY~BknCqu-R3TPyhOvV4dH>7`^~;P1^q!POU>FCf&tnYu zW!}gq7@_?kBR8I9^mmw%Bd;^I@FF88u1*sFm_WD5Syopt9=w&2boGqApUD_#E+eE5 zGCKYS<1}n#BX8nP`| zMn^wA#R&B&#)|*M=j&g*!DIr)Z^8@wfe{g{|DjdiI{1(gSSbW}e^%PM??M$VtW?U*VIi6V9c4lW|(A zg(o64kCFWwIK=pAyMlL2I?5{klfyaGtRm~@^ChlibX4Ay{n|}tbTpM+xrm+lc}7H9 z^RCWcU&jgBzs^)%v8uf6-ut&dU-kN-gT0p~IDn3*Gd7`F{a#2bGin delta 3744 zcma*odu+{T9LMo*wN=`>v=nu%OVv^3w6wH!YboY_7iFExI_X$-YQ&j3!pcO9m6-|? z+th8k(z&ETOx?DHxWq7_5|Q*G>3KcR@A7?~=lgtrzjJ(#UrDK- z_hxv&7slTW{+sh35TxFJe~;>zwV?Yuw!)CQW^RndJ~$a0;wEf_d$AUtK|j2Jp?C>z z<1I|U6ZOoxn0f6vjTjEZ)HieC2wcvc3ox0!U$_%E6*aff=#QD$46~3+&4bL*R-z_U zjErTaSR0REV?2$zzN-4X*X%Kk1{`>Uf!Kgf5=P=69EpRm7!&ahDnL_4QQ%k%!9>)= z(y%6GU>h8Y8hAE#z~!j>%CHgRTLq1lcmX~57!z=2gcIm1WNx+%`Pd=8G=X!dfvQmF z?_mJGL`~=)RNP?pr3t#QDW;>2zl~n))j}FdRUspIo&V=Rh%B|fg5oFUP4W17=@xDo`LM16`~eW+>HEd<%c*x9olKso?SuiwO6PW zM34q$ss$?L?NKR@Lj~-MB*Vs{CNdMXMJq83H=#06ipp#`D&8?K4Gs7cD&Qkjpf{)q zG-BFHaXjkAKB(duipt!0IOZPj7SLGN7}x^V>gAiI{0 zO5q~Z3J#(MK7*_AGAaYvEK{kSgcpM zANxhq7U4kLg+=%Tv#~Ia{8JD1FwRL;2zgZXCnDLhp_qdCsF|0d0-i?d)}Ep=7RGWF zCl71j8dRLMSQ~etR{R4hBZqw+??V1{!5I$p!i)I1AC>QR2Kbr^Q{ZFBA-jcrFf76O zkr{=&tL#0jg^Q5eZ8?VG3cQW$k&k)0I+@yo?7BVh(jdDQ#%oN!da0O9zcSHT!QZHv zH%xMBp*iwSvMAK!*%MVO!>}Pv!n&A;T9_9#!4;_MxBAZS!v;G4BMqhGGV-zOd}*)4 z+2Cn737LZ(MFn_<3LMzOdCclzIQ?d*6?aCSG)u+Cn1$4%%|qR{1smZ`CP* zs6wSEljR5FD&&c?4H$t(eEmyUll}|Tz;94bM>vHNf{l^D))t#!I;v(S`Hn9~ZB+@@ zt$zM#D8NzFj4M%3!F8W6PL%C`srX%HG zYjFsk$4qQK$f=F_sFnVPdV20*Tl^DseZ*VNuijK7v~9=c=>3C6E{%}EPW5|GD=5M- zxEqJ#8{}idiMADsu`{L)b$)c-M+IDoF5H1*@ggq9m|@P3(hi(L|0)LS`A;T#76$GxbO?MD?`1*)jdp=#z9YNAh3PebSkXMi*er2ipmLi17At;0~h zMmK5E)3P32)Sn%oq3XYd?eRILU`u8Zj}uV=SE8!^AeP}}RG?+!onO5YRGghy8;@ZS z{*21VMW0uF=WnXdyT$I8U#l~tM!US;!BPB0cbGnV)~xL5b8}|rzVmK&{`5IHd1|}z zIbEJozkZb4-90KkA*EYloIApyjFc1l!&J3b+fkFM*H(k;H+ S\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -742,14 +742,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "اوه" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo index fcef90d89b7c272e5cad1f51fa4514af56220aa3..b01068329326662cf5d7d9e65443948b719139a1 100644 GIT binary patch delta 3637 zcmYM#eN5F=9LMo5^60=PP*Fg&RB(Au?EAi0R!+7M&M<9 zfHyD|PjxU$HuKp-8vPiE?r64!JF+p8{?$&-gaMIeq4c|9Ai6LXdn1>c2icQNM{T4K zS;JOgTilG%xE*zUt^fOajADJeLL-3%*d2RvaRz3hj;sVV?^@Kx%8q*#xm^7_8ajiF2MDy zG6?Ts8io^=iqeC_un5=TKGcSyC=?a%VC0m{iwdL=75Ii&@=yKQb_R52hmd>iA}WIK zQK@=>O8Kv-l>dR6FoZM_yv3k4l7c#-=}7(B0#pW8p)$J;HD3j4y&XOpn(!oQqAREk zG@(-b7wX1f!cg%?VzT zzUc0v4sZo(r_sHf$IgRE^w*#=a|BcHD=fg@P_^MDpNjMg)I#Sl5ig(@A7CyfGdLDk zW1OD<^E8$-a0jV78{gZBpa^HsUx!oh8fqhPeRvXZ0uI5)=)#!3&Qp_x1L)7jnYand zu@QOW+3bE4DsIJK*0*11yoygzXE%lL192_}VG)MmLR5;EqiUucmFk`7!sDm~u3<2? zBIRR&>_*qQFcdRU_vhe$&;Lvsy6`m|h~+p7kKuR>U~n`}#FwxdJ@^e~VJOe!W*m*{ z@hbAMF{Eo8mf-u?fD6$(*r}ZpgULT@*i8mh{VhnAERwtq$4u1DSD_}{juft)MP;lJ zDId!q>^7K(nr9BS#S&D+rKpT-^1IdleRVSVAHf%U8Mq!`b{n-&EfvOT*iCd}GiKw! zRA+%Dem7zm<9m_Ytp@d8ID${`4Dzv0hC1HCMEViDz4Xt{?W2*&KtsBd;@?p_&d6{a zi4?AlMMbvQZ#gRRJ*da=3~J$?2sKH0rg72`(BCN=EHt-ZF6N~pa6VAXK`lYxZ&to^tXRrsBpsue*1$G(r zN`HjfKr?bm7BPza$I-~8p`9;4MY04Va3yNua#ZT~p(3h7O?($M@js~I>p0q}jozrD z>yJwP2poW3REAe$JnkM%{`I(>@?Ur#b>kE4gn?t6)OA5E7>lY64{D=%s0|dNHe7;A zeHrTLDsc%mAg5!Axy}o&2*=XjmP`I)Y20E!sd<8XF@SHCk^Pu}A7d}Pf=cm2RAz$5 zIT?vZMU?CB7h@3pZK#dDi-oukr(-kLqSrUxc||@$*0#(EX1pWJhkEhUA%$%};bQDL zktnee73mAqLLpu!L*Y1!z8hy?h2OiVqaHHJ>~-{F68cWkPzLVdd~CtFIB&A^#yf{K z^k1Mha&U_C@3|3`8Jp@%l!%MyPQxvD78OX&H0LQ7FAkA3hys>(xNaVE|}6;}=_p!ulOmtizkpla(wR3_>$SS^jY^M$w;x zJP5W7EuqiK1lRoHy65fYwyE2lb}67PD{?}7SgPCQ&K#aHY-g3*rA|uv@RYQ=Q|>c? IT(q(8zX|!7u>b%7 delta 3744 zcma*pd2o$a7{~GFN(f?U5)u*NS|do^L=q%LEV0IxSTjUYQcW1ih%VCBHIy)DjjBq9 zX0)QkjHsv>OQ)^2Vmi#&#;6LdWsJS5t!2>fFYle{zs*EG=e+lQ&w0*sp7UONzIJWc z=knGD`+scwT;yLH{`m)}_utR$re=|J?_fI&Y-Z-c?l=IaVGG=Zq4*Ux#2R$rNo<0r z@d{qXIQ*fxSx+;s{X-*)3sEnbMdMg3;mL*Am%c0588{ggTRQq-CPrWua;p_1G1@9r zK&8lBwhJ5KVGP5gsQWL~eeN~8Pa}j2FR(s_&`HE_9FF5~B$i?VUPTSinpre(cMQY? zRA2+K0j6RHOhZjvfL*Z!_1ta@WqvzAqb;7qV!V%WIH#pE(5FajR)PH5e*P$c6R3$U zp+3Kk{`eRb&~wzdjoFu07>%uQ5bFAL^lGo(rJ+xYzJ!GJ*dE{k=X1=82hi3pZ9%m35U_Yg*~trVZVpjcn)jv zRourc-7%cy#A7O|IE%3lmf=D?jS6Tqg`y&!jqIK+LoK8ydQnnYfgqhflG^#e1p;meWHPJ)th>vj;M$$>e zJRC~>StSj!ZGYoD4C&-l`x4X&$}j_~a0~`?b^@7%Tj(#vm$7pfGdE5^jrRsd<2syx zhj1|lMb*9eY#nAZzkN@mK6YfeSs0DlyA|k%8_*xiupySCQv4;VW)7eNJ&ta?j=Wke zfY~)}Z&X12Q1@kG02ZNF1H3~+r{DwBjhnF>9>9rs4Tobg7YF0}*c)pw1$7paVIVHW z_wZeGv0pT85e~y0xDFp+E-s59|I~xsig8jENFG)F2}rgq4U@1475OgIfJc$KwLeiA z3u3t%rx5GmTGTinVI$muTJc^~Mh^M>z9;$D4K-Zoho|s_i^}&n6J4Uh*c}UubH4R@ z;Q;!xP!nwRc@P`wdE{}sfO;=n#Jl(h@@toSIfn4oqTFn#mj>CjeAKtzdhAQTO`?

    H5p`i?H#aD0_&cItZ z9Y^)iF)`bYdLP_J-R~mG<`{@7(g;+b?T{EO3fp6rufG`eTs7+WeuunVz4j}O^;~#_ zDY%9WZ-6H-7|)_!95;OZ=ctK-sJL(pNA-JQASRq*};9jhl}OY(8q7MW`aI zz+mRLoirxlH>lLLWYjH~hEMS>zK%BsI00m&INy3pPy<%uK&-_wbkoskIf#*X1}Q6h zfLd78AZIJnugqY!E>mAucA`_3>84wU}xa|s2Z7xD!v8i zhbvG;w;GlDEvTZe9PB&)=ef|93y)FfyVVfq#v!N&(@}4{*{IYl#7^i%)y7s-pa)O^ z96<$q29^5XP+NBg^RZ2;Q|u+F2mk&bF19XDbwDkIOa12!1u?0GaQ z#iLM}$-^$V1ht^;zJ3k*)4zub^dZi`XI>iPX-psPeCt&rmu%t)=UZws^3Jd;$UDix zMmlfA;h0B%DHh@#)Jn5PITPh$C;A1bSNM9&z?(k%r#V~gT}R_JKB&YV7&_X?z+lXw zKLe-XcS!wN+c8dYW+5k$|2Q~b)5)mJ%tDP*g0JIVEWyZe&O$0MoBnxZE4`M)@{75U zf=%%t`r$ED%8p|YoGM#?`nI!#T^8iG7Yr{Y@;#l*wjq z;bl~fOqoJPnBTlKR76!6hbNKjnm?nvF#|og0F~kjT#hxU6^_kxzV!+)l>U5FCRbtr zeuB-h+;_baL+BsI`kV+mS#`eY?0TIF`!{y;)4A)+g1K{ZXD-Mqm^WiqZqdy7d4+06 z7x8gb_xPi(Dp&A`wjNJ!cWhizd_s&T(c@`6Zfs0??wff<+!!+?XF+a~JI)gu7sIda T>ys28TUG3-_WQq+lyvzQFMY`y diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po index 98b5b52f..39480ea9 100644 --- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po @@ -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-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: French (http://www.transifex.com/projects/p/mediagoblin/language/fr/)\n" "MIME-Version: 1.0\n" @@ -314,7 +314,7 @@ msgstr "L'URI de redirection pour l'application, ce champ est requis\n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -921,12 +913,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Il ne semble pas y avoir de média là, pour l'instant ..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -986,26 +978,26 @@ msgstr "Taggé avec" msgid "Could not read the image file." msgstr "Impossible de lire l'image." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Zut !" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.mo index 2db7a9a97d2ee4dcb774618f04c3b12685dc3887..d38d893844134aef63a3b42370f0a3e979a2c59a 100644 GIT binary patch delta 5107 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 moI7qG_Xy#ZqfU>V&}V=6l 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 G<9`5FnqtNP diff --git a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po index c953cc03..8041742b 100644 --- a/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/he/LC_MESSAGES/mediagoblin.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PROJECT project. # # Translators: +# , 2012. # Isratine Citizen , 2012. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -71,7 +72,7 @@ msgstr "כבר אימתת את כתובת הדוא״ל שלך!" #: mediagoblin/auth/views.py:227 msgid "Resent your verification email." -msgstr "שליחה מחודשת של אימות הדוא״ל שלך." +msgstr "שלח שוב את דוא״ל האימות שלך." #: mediagoblin/auth/views.py:263 msgid "" @@ -82,11 +83,11 @@ msgstr "דוא״ל נשלח בצירוף הוראות בנוגע לכיצד ני msgid "" "Could not send password recovery email as your username is inactive or your " "account's email address has not been verified." -msgstr "לא ניתן היה לשלוח דוא״ל לשחזור סיסמה מאחר ושם המשתמש שלך אינו פעיל או שכתובת הדוא״ל של חשבונך לא אומתה." +msgstr "לא היה ניתן לשלוח דוא״ל לשחזור סיסמה מאחר ושם המשתמש שלך אינו פעיל או שכתובת הדוא״ל של חשבונך לא אומתה." #: mediagoblin/auth/views.py:285 msgid "Couldn't find someone with that username or email." -msgstr "לא ניתן היה למצוא מישהו עם שם משתמש או דוא״ל זה." +msgstr "לא היה ניתן למצוא מישהו עם שם משתמש או דוא״ל זה." #: mediagoblin/auth/views.py:333 msgid "You can now log in using your new password." @@ -136,7 +137,7 @@ msgstr "אזור הכותרת של כתובת מדיה זו. לרוב אין ה #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41 #: mediagoblin/templates/mediagoblin/utils/license.html:20 msgid "License" -msgstr "רישיון" +msgstr "רשיון" #: mediagoblin/edit/forms.py:50 msgid "Bio" @@ -192,7 +193,7 @@ msgstr "אתה עורך מדיה של משתמש אחר. המשך בזהירות #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "הוספת את התצריף %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -226,7 +227,7 @@ msgstr "אתה עורך אוסף של משתמש אחר. המשך בזהירות #: mediagoblin/gmg_commands/theme.py:58 msgid "Cannot link theme... no theme set\n" -msgstr "" +msgstr "לא ניתן לקשר אל מוטיב... לא הוגדר מוטיב\n" #: mediagoblin/gmg_commands/theme.py:71 msgid "No asset directory for this theme\n" @@ -307,7 +308,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "שדה זה הינו דרוש עבור לקוחות פומביים" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "הלקוח {0} נרשם!" @@ -339,11 +340,11 @@ msgstr "לוגו MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "החשבון של %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "התנתקות" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -378,19 +379,19 @@ msgstr "משוחרר תחת הרשיון %(username)s" #: 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 "מחיקה" - -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" +msgstr "מחק" #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 @@ -759,7 +752,7 @@ 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 "מחיקה לצמיתות" +msgstr "מחק לצמיתות" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:31 #, python-format @@ -768,7 +761,7 @@ msgstr "באמת להסיר את %(media_title)s מן %(collection_title)s?" #: mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html:53 msgid "Remove" -msgstr "הסרה" +msgstr "הסר" #: mediagoblin/templates/mediagoblin/user_pages/comment_email.txt:19 #, python-format @@ -794,7 +787,7 @@ msgstr "❖ עיון במדיה מאת %(username)s #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" -msgstr "הוספת תגובה" +msgstr "הוסף תגובה" #: mediagoblin/templates/mediagoblin/user_pages/media.html:109 msgid "" @@ -805,7 +798,7 @@ msgstr "ביכולתך לעשות שימוש בתחביר הוסף בתאריך\n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "הוסף מדיה לאוסף" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format msgid "Add %(title)s to collection" -msgstr "" +msgstr "הוסף את %(title)s לאוסף" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:51 msgid "+" @@ -833,7 +826,7 @@ msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:56 msgid "Add a new collection" -msgstr "הוספת אוסף חדש" +msgstr "הוסף אוסף חדש" #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:29 msgid "" @@ -874,7 +867,7 @@ msgstr "במידה וזה לא:" #: mediagoblin/templates/mediagoblin/user_pages/user.html:65 msgid "Resend verification email" -msgstr "שליחה מחודשת של אימות דוא״ל" +msgstr "שלח דוא״ל אימות" #: mediagoblin/templates/mediagoblin/user_pages/user.html:73 msgid "" @@ -896,7 +889,7 @@ msgstr "הנה מקום לומר לאחרים אודותייך." #: mediagoblin/templates/mediagoblin/user_pages/user.html:101 #: mediagoblin/templates/mediagoblin/user_pages/user.html:118 msgid "Edit profile" -msgstr "עריכת דיוקן" +msgstr "ערוך דיוקן" #: mediagoblin/templates/mediagoblin/user_pages/user.html:106 msgid "This user hasn't filled in their profile (yet)." @@ -905,7 +898,7 @@ msgstr "משתמש זה לא מילא דיוקן (עדיין)." #: mediagoblin/templates/mediagoblin/user_pages/user.html:132 #, python-format msgid "View all of %(username)s's media" -msgstr "הצגת כל המדיה של %(username)s" +msgstr "צפיה בכל המדיה של %(username)s" #: mediagoblin/templates/mediagoblin/user_pages/user.html:145 msgid "" @@ -914,14 +907,14 @@ msgid "" msgstr "כאן זה המקום בו המדיה שלך תופיע, אולם לא נראה שהוספת משהו עדיין." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "לא נראה שיש כאן מדיה כלשהי עדיין..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(הסר)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -977,33 +970,33 @@ msgstr "מתויגת עם" #: mediagoblin/tools/exif.py:78 msgid "Could not read the image file." -msgstr "לא ניתן היה לקרוא את קובץ התמונה." +msgstr "לא היה ניתן לקרוא את קובץ התמונה." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "אופס!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "אירעה שגיאה" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "פעולה לא מורשית" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    אם אתה בטוח שהכתובת הינה מדויקת, ייתכן שהעמוד שאתה מחפש כעת הועבר או נמחק." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" @@ -1045,16 +1038,16 @@ msgstr "\"%s\" כבר קיים באוסף \"%s\"" #: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" -msgstr "\"%s\" הוסף אל האוסף \"%s\"" +msgstr "\"%s\" התווסף אל האוסף \"%s\"" #: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." -msgstr "נא לבדוק את רישומייך ולנסות שוב." +msgstr "אנא בדוק את רשומותיך ונסה שוב." #: mediagoblin/user_pages/views.py:292 msgid "" "Some of the files with this entry seem to be missing. Deleting anyway." -msgstr "נראה שכמה קבצים עם רישום זה חסרים. למחוק בכל זאת" +msgstr "נראה שכמה קבצים עם רישום זה חסרים. מוחק בכל זאת" #: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo index 488d8dd24025bfbae6a3ea1f1c80f301daa856ba..32ec1bc29025e7bb37d632f1b409fbf11a6ea737 100644 GIT binary patch delta 3637 zcmYM#c~Dhl7{~DkkVSC?0Y#MS1}-3rfZ!5~3n-{5u8bq5;*2AjN(n{yKLi=5jypdCxiT`@GNloO6HK=k@YF zFZcDJR@;rgYy3y>|CgVR{{Oqy&a69!-(Vy@!g%b~-YgySurqGPP~43Hcm%!hGi-~e zu?a6?A|C2s7H8(RA816=5!TV{CGJSaG>+>#IRknHnfY_v1%1$k-LMaGsbwHB*(6jT zg~%MX99!c$48uy)_0^v9br{V2c9w=OC$3@&-oP9T4K^Exg_w-{Q3HI78u(WX#7C&W z{FzIArz7)VV)I`;& z^9QgMo6Jl!b1kDwl=^C_wF1A*vRNQ7hPpx^XvZt4^U( zeham-Kd>uCa&Zc#p|)%(YTV~gft4Y#*hW;w-wGrDI#EqWHXg(ne28TjMfi=l7w6&{ zW*LY#FbM-$mWnb1Q*jQK;OnS>f+-XgZ!EG)mWx_QA!^}kyODqD&noHAp1pzGYo|~v z_!^a}CRECAqf&k!HJ~49V(}J^3M2uwMU#;FwYjJaEJtOw1U24^sQI?IX=uQYPy?Ms z1#k_O;uh46zAQt<6NE}#1Zriy_)c-AMIGQXs7S+lI*(lj#&En6m6<)5fG4m3@1bfVmwala@1rLA1bgF2%*7@gjd662 z!4(*x=l@e0OX#?Y)Scz@aaJ$~^EocT33whANJL+r1RRTl@Mm;kc$D+h48#5$&%h~I zf#ukUyzy*CG=+*A(3kn`M;f#7E^6;4uzVk!g{^Q724E2?#Y<2%Q;tgYR&?P3)CA|z z7ym}e$9#xJ*SXLi(@^(k;(yQo6dJm49uB~AoQgG=gI;uw#Bn$Tt1tu4;V|^)nOuh> zaShfZ9~(uwvT-TCibt>rb7P&_IT%a+nZp|BQ1w4TvSdNzbttBxB43Uguo5X;JBrF! zBT_z=!m_<_8fu)G*cz9jR$Pk8NQK7@p7T|4uB=JrbQ-8H@oO=OVY;6l{yrunFfOAIl!>Y)vV$%eEi&V|U3-BaM!NWGC`%sEBJ& zHBgJZYwR%UvAm3`k(;PMnz23lr#LGPMHR6Nb$u%8{8$Xe8K_JYBOh}=%eVIUT^xta z$e1>Qjn)9mP^nyxfmnqKY^SIHP2|b4cQ6b;N9xX+Q1`V>bru$iyh1D%OEC}0jN9sI z_|fqvc0e!E5rUmi0YszDr(zJMqn?V%sDP%U2A+pqumbg-*yZW3Lv7KQs7zc(-G2w$ z>iKV`q3VB(T0sPrrvZ~tdzFuxcr|KeRoE2|qf*#_+Ohy11r6L06<7#rAw5wkAL8jB zf!Q37#Te$dS7?;s32emS!<{!;XDU-wzY6thw+B^}Um?k|2Uvm$PdEY9V0VtsqV~E8 zdteJ{<)KutGTaxnWy$Ccr!j+uRy@iI-4Y)Qp|bC&S4= z2#O%Au6Cc)OD9J0B@u2{~h%d1dMmC3&R0={*!1-51fz*6K1wPUyrTW}4op6EQL50GS9pC_GPyJ9Tj_%W(>iY7UkdI44a zA7B*o+c_FT@eV5Tev_R6Gf`E)7?rY3sDXY$Z)}tA4Ac%=bKD30aS$paDISM=&SxR7 z49i37)puDh*HiOre``0(yLL!YgHLU4=d_4`#CTVH+R%j5t()UrI!H(!nvhg`D1N37 I7aflL7h58UGXMYp delta 3751 zcma*oc~F&A7{~E*1qHz+L_tslcLC802q1uh-W&!(6KvwDTun*SMh%z5 zFl8LIFpa`dGi(~kKxZt?ig6sJ#_ZJLB-wwvuF%m~(Hg?8J48V`k8ynGv7qJ~) z!t3}W#^9G7jTvl=%RHpfp9B4$GbS9T;X3Xt!C~}movgsaQFEJt9+-vQFbBERIFUJ; zji?D#AY+*$*cMM=AU2?`Z*Dp7GUh%Fe-1pu*62?s9)mCyr{g57z&N~t3J}aF3LJ^P z7>AnJ7;J;d*bCE8124t_xDIt+4F)j2IZ2}jUPLF}#~94-Vg-5+nVZ>R9qkSr7MPGFpfnXpNB5()e0I)RT(P4Hq@R~plad(Y6bPE8?T_Y z>5_jw5q3^?~faQhwQeq8U@@-^GC#%d}VGd~CvN zxB!naN+brcoFSNuDo!U3#a&o}mrxU$LZPUL7a_Z6%1{fb=tlmv@)I1O4ow4U&zg{X z%@foLx{wBCDg>4CeyEg3p#ml$$uJqHiR7cUXe0VzB`O0)P?@bo#rwiVLj#^g1-yp} z^b9qD0H&=JN26{WjVhirROT{~kICjsDRrU(Z$aHx;qD(qrM?EWRdtw$uA4M;<23R? zc8vp-!cx=d_;q6o4>IT{rgze{yJ&}yKpAf;#BnNYfU5*tLU%6LD;vSF=3d2ink2Iu^cn7 z4p*UH|CTqODaZMYZ%)%_jlEfJ4u+%lZasS74)nxb=#6_&DSjVSGbd3KJ&$2{3wgB~ zFGg3~1k{8^qOQwAFDycr0xYMYr(hH6!rd5wCvg_u#8e#4!Ev}26R;7JP|xCU7=vqY zC9Xgl`$f}~VhUDcIX*xKmPL_&>cQNNvQp(s9##EuNVZHGCSnn4=0{Kg8<4s+f1onv z$8r^C3AVy5s5o1(Emosed=!lYd>%$bpggE$*~Y`F3l752!E&Za@y1+c+A# z##lcx&m-?D^D=s48FIVXgzaz(UdP?Y$E=REw&p0Z>*j`w2H7?3c#Y{-FCK@{|2)oG z!6VenJH}hJ5Qw~!OgGfynSiR5RP2nI*a7oV3v;3-xE6JNrThG0^r!EtqoI^sKtARN zzO>iv+2Bc-iOj)Np#n6a0^dPje1Iy_r|#pehFUMQb{NR`rdj7}KP=IvQo@Jt*f?U)JR-pp!MD5ve)WFTCl|8^9?8YOY4920htN<0a7&WmH z)I!Qo8Gl#D8Q)aVNWsI%lVSeCmDp>9^{clR7tnu=3RU%ALCVB6Zi>L)&HPw^ciCnParCFJy9#` zk4kAWD)3y?eG5@3U+T6L2hiVud030OFJ!FCDw5c-RtnQlD=0$^yaPAmK2%Z0jbhdoidUnGZmawFhp2%*MP=d}x8I?*{IZM2Y#KesTfcfGsF{W)TaR5T4y0d- z%FH3;9b~@3EPR9uaOMPS#mCTx{%P!u=W#Orj$CR+GAd28236#)b2JKR+(uP+Mt25!MscoPTfIJ23LJFtzO|A#bk zIPes;ck|M$7fL=VWs6Z;QjAJ*8LDR9L8ZDH!>}GTzzuATou^n63PxR*fZjMAb^jb} zdHxG%Xy(f?0(asptVb4Yf>=JgWENlo9>65LhCHbzbei?6Hy2mXZ^lT>o^I{&dMu}Z z0Uel|Zq?3N45$9g&oos1{xhs!y$DRCpN^XOTd08hQB{8tm9gJYML3mxYK4WUIImz^ zT#sH@j>^a`w|m{^51{u*PSnuYS{Qw%wyMJ(Tc0JPe8TwaJ0N#)L4hN;IB#*`3kw}Z zxl8kws2yI!>Du$LO&+y=oriU|+Y`c~V-knNMcL!+cAx3fqGmW=%`4)|2xR3(0>8kH@uMm diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po index bcb0f925..34f97df5 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -743,14 +743,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,12 +907,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -980,26 +972,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.mo index b2157a190da1e36c308719a8a274a9023e4bf706..23f9f1bf26fc8b10cd378a1603d50b0f27e7d794 100644 GIT binary patch delta 4438 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 VIQo>wMMTv5>Ri5cek-G@`oE`L9%}#q diff --git a/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/is_IS/LC_MESSAGES/mediagoblin.po index 61ab89e6..04a1f7f6 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -192,7 +192,7 @@ msgstr "Þú ert að breyta efni annars notanda. Farðu mjög varlega." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Þú bættir við viðhenginu %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -307,7 +307,7 @@ msgstr "Áframsendingarvefslóðin fyrir forritin, þessi reitur\n er msgid "This field is required for public clients" msgstr "Þessi reitur er nauðsynlegur fyrir opinbera biðlara" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Biðlarinn {0} hefur verið skráður!" @@ -339,11 +339,11 @@ msgstr "MediaGoblin einkennismerkið" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "Notandaaðgangur %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "útskrá" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -378,15 +378,15 @@ msgstr "Gefið út undir \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -820,7 +812,7 @@ msgstr "

    Bætt við:

    \n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Bæta efni við albúmið" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -914,14 +906,14 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Það virðist ekki vera neitt efni hérna ennþá..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(fjarlægja)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -979,31 +971,31 @@ msgstr "Merkt með" msgid "Could not read the image file." msgstr "Gat ekki lesið myndskrána." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Obbosí!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Villa kom upp" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Aðgerð ekki leyfileg" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    Ef þú ert viss um að vefslóðin sé rétt hefur vefsíðan sem þú ert að leita að kannski verið flutt eða fjarlægð." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo index cd60d011e06292e1c1a0503c1f4910228cd7c2e0..dad0aec4162caae11ef5750cf10ddd6a3b3b53d5 100644 GIT binary patch delta 3637 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\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -310,7 +310,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -745,14 +745,6 @@ msgstr "Modifica" msgid "Delete" msgstr "Elimina" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -917,12 +909,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Sembra che non ci sia ancora nessun file multimediale qui..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -982,26 +974,26 @@ msgstr "Taggato con" msgid "Could not read the image file." msgstr "Impossibile leggere il file immagine." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oops!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo index 1b45aff215f8f48bef70d033b00c5f518fd161fe..1ebdba168fba92cb639146252a8bf0dd3f5165b4 100644 GIT binary patch delta 3641 zcmYM#drZ}39LMno0YOnrNVzIU@D9jDAn^t&3W}h3MHXTxGmOX!k|27R1YVIDId#pN zDK!5_+8BqA+!TIO^$HCykGzq7>-=k+|#@Aurk&-eE`pC5N>s&}&A z@^aa0`0L<5kpF*rs`me1M_*$GQT+vj@C8OfpxjG)2iHDk8YBLU;7H}|&&bn-IBjk+&7qYVRaC~~VwMAl?7Pz%XH z<}gLr3oFnEt5NsYIj)~ZZ{|0bDY$asCdOeWrr@e$Fc`g16UX96Ohff6Mn$R|2Q$CfN1+r?V>Ct$um)Ozti`;8e9UIPw1AIL6V;)v zA4eBFk6O?r9E`2#i;vJB-I-PGA*dsoigtx6m4XJyLY-9(Di;b+JJ^oucnEb=7f>O; zhuYa+=!Zev9Eb6!BU_CccLQo+n~=4b?Wl-<>O=f>p^k=RY``#lhMRCW%Wuacn2Tl1 z5{jJ|gC1;4NtuY_a2b~10n~!LNfae-IC4rR6}6EZ)W$al5P$N|RMVg{JBai(7f?I+ z85OE-RLCEqLjD9bU{Aut=8ZpUAyKF!%0Tkh4cd^L6o8t^OBK$lSq z=s<<|Z&XKDwxQ(lLWM36wX84*avb${Q4uai9n}`h$9hyh`vBshBnd@@ zFbTDTO{j@?V-0?cia;paRA{47JD$y#?khm;xCAxcPDlF@)I<%aNHjZaL5|#R+9)jM zf}f2%z%{6q`V6riyF?75UW|&&VT{7>F$@1heFgjWcjP z2I~1gN1>30n@HZ7l%duRmf?KrC76!aPzwnh#*=_EaST2{8~P8oo|*|bih3q4z%5vg z?Z_L?WR4(FaT~fazqwCgDLz7-T{_!$#y8Ogm!Ui6p+a1U%9(OhsB6)N$59hpLsxu> zq>piCHM-A+ZWxd1KLuYs{|hMS#^pE~%W)yrV+uOaI1Ojv8@L-2@d{2rH=fA~oQ7rC zjC@QI;Y!BU_#vLbJWLI@a;G7j_%nxTqe0pK0*R9GBCg{x9<}l!)PU7U;+k(!5o<@% z$HcMi9=HfK&Jyf}t5G{HMMY$b!)=c1yCaDIBrfcyVULqBH&7G2O@?XUDvZRVn1Job zTiW-m>29*I59VMu79bxpcdXUF0y$;Vg!-|2V5bmI!@5{&6J{tUP{ zfEQynYJjg%17AT8Y(?#`1N-59^#rw`08)JW#j9kdvOa9G^=p@jO3G>^dgcTc<8P=1Ws{*w-uE#8_u^n| zK<&I0b!45WBYT8)e+piS)(*l^p^8QAWHRaqQc=mX6m^zsF$lM#a^x8H$Fr!=wxIgA zp~ky~n(!`ayxvo+aRyBx{#rl`4a({{sE*mFCFKrYdkW4+*o7phiJWEq z+7;j!>Yj{l!%3(Cm*Obgh+1$Rmg94bQ2T6a1NErL^+~f{-G0c?+06zD&RnQM7uM8%Ge PifKF*xz?GR+K2oH20EPi delta 3744 zcma*od2o$a7{~GFN(f?0VvF?_NkpV>A`4L!OHe}WQA3I}H5o<_%!uXHlIqlqC1}M^ z#aN25rA1A2gtlS~Q;cGim?}k3s+*A%g~+|N1h@|<&?^StjpvCFf4x5v32 z8o0*zyT*SD{sV*5`|t05U9*;SA7E*#u_3O<#<(AAVmW&79M-`LcoT16 zJbqo@tdp5zf6|EJKvV;>Xw1MR+&Krk()WbAfxDsRHVgxB3^vCsbzt2h(;I(USf3&qmzW;*dK@B04&Bt{0SAH8KWq03b`y0nDOlhjaGOL3-A%fbvOqvpe8hkLQxS!yKRv?Idc?E+O~YGt>$i zkp^X|B`W2SsFcT|0;VF#uo0+5;cLw zOj{|AL*3W|RXpja%#A`mHkL1?v;Y-&1?s+He}6kF_4`m;Rf@Uj+@hfyGsp+owH#Cm z7ob*f2sLmyF2{?g4CJs(rFIHx#qaZ_>$ag*T!M=CjsN&{)Hs!>OnAIiI#z>*_B}9KE;99l1>`tVqfad z_R=8R_6JVIuy$^>zlU1EIvkEAI2eN>+=-0BP4pMxs~8b!=EV`Hc(X7Xi*N*%;zA6G zs(SNT5sqhkJ5HlIwq?0l7>(My4=?~f!a!VyHE|;<#XC?na|AWfGw8+J$g9}R zUo>q2_QRc6guh}A7RHi)>cJ{w-BbmWM^%3!k}XTe6wF7>d=Dz%Nu+M=2`XbDELU-+ zVKrQVin9u9;ZD?wKSyPx)bH_5?jW5^-9fjuxJ-u;mo zitL`fgEes(a=U$ub+8z3;x^=CA9i-{KZ?5VZ-)liwFq8g`qj(8uJkV@x+@4ta%bKi zRSQ1kon#59$8!j(RwiIW%)@%P7`3of$jj6=psxSIfBstxqwid#p_JT3KK2V=+UrO* zcqry!CYGTBgm-ZRcfer!38M6MA?*~!Z3eXm{XPKx8IjEJb!EpQvmBGuXVypj}o0%r4iM2!B=R;+@ zuZ}amrPJt#qmd`WKE)+?1~1`ADsv*nzV2543ZzV|6jhv$ktA9Ol{p&+pe9s?dP=Th zb9{=euu-a8BMIne&wA6)o(;!lI2*Nsm8et|qxN_+Y76$Fisv|LFTcmu_yAQSb$hxm zs8*=V`cU^LqT=;JjW@6-`B%WH98jQlQ4?5;s_GKdjb*6fIg3i&Wz@>9qf+_;6*#n) zdtY@K!I$M=T&t2YR>vQpFvF5_@~jDs<4 zfcuVLjhpCyhrE4l2GPB^2^H`-Mq>qP!nM-P7Gf55(s3M*^#@gD&ar7UvN$jwwdX%z z0N%que2A)%C#V$HU^ePEMNKpYldunJfVo&5ccCVPj)Bk2!AvSd53H$KK(OdR6=>TSeq`ZsV9_ThCo56dwI(}uZwJROVZe~CGmPFnS} z9KdMm&(70O^}oPK3?py6dn^Sz<1AFb&rnr=5m(_8RG=lywi<3n#o39qundFnG%6z( z{9f^&uTY3dcGF(3?d30`eRkfIDLL6QbMvOY^>$8v_Ke(VYDedDx+JAR z1Fz4Q?2U_0Nl1+KCHZ`{hh)SK%bA^<&o!}qCd|x9@y7e&;$!*fx-KaRaU})583F${ Nendb?aPr|+{{sD*yej|z diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po index f902893a..abbf5b26 100644 --- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ja/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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -742,14 +742,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ko_KR/LC_MESSAGES/mediagoblin.mo index 5ffc82dd3c7394069472f1f944c79b0cd33b2c20..e7602e15301f853a511c844db0dbfee96e4adfac 100644 GIT binary patch delta 3637 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 ZBQ8FMkM8T8ln_@_>?rsAzk}pP{tHJCza;\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "이 항목은 공개 사용자들을 위해 꼭 필요 합니다." -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "사용자 {0}님이 등록 되었습니다!" @@ -742,14 +742,6 @@ msgstr "수정" msgid "Delete" msgstr "삭제" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "이곳에 등록한 미디어가 나타나게 됩니다. 하지만 아직 아무런 미디어를 등록하지 않으셨네요." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "아직 어떠한 미디어도 존재하지 않습니다." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "태그 정보" msgid "Could not read the image file." msgstr "이미지 파일을 읽을 수 없습니다." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "웁스!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo index fbe19c5128c70ad8e3cf4212d3fd1b30b06795a4..afa8849cd7a07c9af8669877e19f9a5e7b253e7f 100644 GIT binary patch delta 3637 zcmYM#3v7*N9LMp0^-3vD(V}ZhX;GK96m^-Sic-3v?zTfQ5!DgetX584LPd+sm`#?F z=`5I}G{zz>Gi({Av(05LTe`V~#caYBEc^cUzR8-?^Ld}=ec$KufBw&Nj_wJ#x;wys z!xOaG_`Ak`4FAtURQmt#S`)JuC|<`ne2OX9Ho|NWj=~mLfvs={hT$O$z!TUQPhve@ zz%;CFYSzQdZ@0Nfq9Ur9*&5y$gc+32GbTY$F|r3dDOhfm~0GcAU>oI zTZ|2HB}QQ->iKH-{y~hSe>=rRFgLDXZ@h`w*ecR&B>FHNccU8k3DxjJ49BOafrZk$ zf)|eM(SzzZ9XsJ@)O*FKNR?qM{oA`-EWv}AhN&%`hGrpSv3bbHmhq(lyo2hf8g+j! z2H`Q(fWE+3ynxa80NY>~y{bL|wM3cdSEzEhPyo2QIx#hkX5oA)I@x!i7#tQ{K-G7q(W=<0rIXLN6p|z zRH*7vA-|6b`Jbo;LkJU-w>GGOq@tE+43fW=kBY!zRAfs~?X5=jx53Ya8r+X+=oD%I z*H9sTf_gESX()L-sL;irX4alBh182`cmnD@pIe@fif}P%saD`z+=F`0-;#JJNs>_^ z%tFmzDXQc3xB<7JB9P2971}h^j7RaM=L%3WEZk@4i8HQektO$A9TyY1 z(K?Lrle^I0b)4<-QhrsFuuC76rnPy>nS$WFi!*d6a-Jhn-6c1?fmOnDOK;R-Cn zOUQ|5lafeOEXQE_x4T@tiVsk0m&^16aT*5UbPU7Us1O&Ta;6Lw>P;Ardr=*n!(e=l zq>lwM8a)?}p_qYse=z>H|MR%egEO%Umf?8ZgV`8BZ5xaz> zkM(BS4R8Xgoyph`7ocXm1Qn4LuI29i^*xCHKyGZMVrzie52y}aC&ScmC8ppfI0$c` zI*3hk29}Otlyi~SZ6Y?t$rwzk zd>1)u><`qojOgtchx}Yv3P#{i*F01b&vfs<>DF&VZQCkTBo3oaQ2#M5v__BcWgNf) zYowK^4o{#$`7MUyHB@rmaqI6RJIfxUBG-X>ab1edDQ`k`TxBe`0HrZutjZa*glR)IBC8Hua0Tn49s=q??X#W>; zq3mCaYTzT(NRML@-bSryQ&PPX#-N@XieB`gX1X2K@NU$A_oJ5RC@SO^u_<1`;dmGO z(7&Y)aJJ1{JV*H!=3_1KQHN14I&0;{&XkLg=vft(<7HH`&LBgz1j|taslr&?g_`+k z)BwImCFQT^Z^K2j*9lQi)Qbb$au#X^qtS!;sI@G@c36SRk$tERj-i(3JgWX8D)hgg za^yEuJIw|=M|r|v;;#X`NJSHzjB02ODx}4z(3PQ{TaC(*9q#>4QSY6=M)(aX^jA@l zyM+bVG}DPhDRRWvHdF+^%Je%8HsE;E8b{+6?1&+F1e5S2Dktt?Bzm%(J%+4|UG$denZ59OfK2+1QWoW1NLIF&DFFO#|M9 zA-EkAa2Mv_*GQ8VmF@h9y@DE84Hn{gR7Cv)M>r?hBpgS@Ld?fgs3hq$()qQUik&Dw zM-42IUX%;tu`?Fn4BUdH_!p9wRy2wqFs#L3Y&qIFy4xa4=eH$X1ahMsgRlZ4@GVp} zZ%1vnqZo~sQ6YbbI;dI@4mF&Onqe;Lxp^3ht58c;;kq65TrGCd{;%U=JQdH7sMy$- zoVD8KT901plQ|w0p#ofv$FU4E$2duK5(iLzh;y*}ShGdA1>>+0FDp`AP}?#O6Y1X; zagm4bqek`sldv(Bnn^F5iK9^s)nEgxLoLB~sO-Oon(<@Te^8MLVRqrz7}*dOt=YEk zxTt;nj9CXBHJR4n!0cXM1{}!rWX6W2rNpOX^h@o#sUjs_h1B$Zsl5)=rmP9%p~>z3 E1!8lSOaK4? delta 3751 zcma*pdu)w&9LMqB(L<}HrnKr_rP``9r>$01(W0)UrDfKcdnX;Caj>cKY_qP0U~W^h zjb)4yD-}$bO=qXfg--G7Hbfo(bJ7Z9=F=VI(j-xXpH+z++3ap;Hn*d8Y%mzrW^jb;^U zLFLF?WTp^bxW)vlIE4qkL%r=TQ^g zM4i8jZhV4T&{Nd7f#f9|W3e3$LLGk@E#<0&hC)?}8ek(TXXU7x*oE3bHR{G6P${cN zg*=jz+L;&I;)|G!K2*voP~#p%E$j%gHdEb({43iHR(GDNe7 zVP=WLwrr<2W}=F-7*lX7F2>8K1&yXqRK&B8?3q&3M#|e0f9?Dz2dG0+gUZ=e4I{0?8bZWn6DRjBb!JI8OJ=DClGge#&!%QT^( zoCo0xn2S4cFKVS@yV#FiG4`ZiiHgj1jK{w*AA1l+)kZ05r}t13J;JW|1V>>&FIFh7=Rz6LcAMQGsjR1J%8NM1A7tQi zT#6;=B40GkG8~2#xE_DU0xb0qf9k>9_t>EdB95y5BqUlU3scdDTKRs|fHg?nnm?f4KXBF7z1^&Jg3-u3$xJ{!p7R}-V{7^wF&Ota9z|ZJrp7sc(>eYK_4rzTBvK*ih|F!e zqH;A6b8tIq#lN8@j7qU1mW)C4(@{m5O3_kO%06(;*I*d^i%5zsbC1SC z4zys~NHh?1s@e3YA+Q#^4*M>-JzeR-Uba2xWiF3GB$(wYoG-j(8OhqpP=4=Cr~RriwfyAROoJ_uKxv91C0mS=i8(1 zi^4!mM1_6;#^6YtgFftpw+31KhSPY)0fo@R>rDf`g356TZpL@92}TTY{#|a_%-y>--o>H%ys0^ zHO;ttCJx3ixErVwr0Tt367>>tL7hb{X z7(3Fgk=3|^{z;6%X^gIgtwhzr7Z{5da2nR5ig{8NX~0^Xis7RhQfZmRG$wPv!sd7b z{qO<0u?|%Of1;|{&35&;MWPm(h6?$3OvKkwHL?%2!-J^nzDIw&he}ypgXG_xZC@CU zJvfns<8dkyC36^ws(I!(EXRJ%*PQ*!$FoM6Rm>Kit%qf_$pm5&YDKiUvGv*f-sU7R%bk#qJ z=Ur6+A%i-3y?r9$6H\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -743,14 +743,6 @@ msgstr "Pas aan" msgid "Delete" msgstr "Verwijderen" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,12 +907,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Het lijkt erop dat er nog geen media is." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -980,26 +972,26 @@ msgstr "Getagged met" msgid "Could not read the image file." msgstr "Kon het afbeeldingsbestand niet lezen." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oeps!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo index 2953d8000474d6a3218b6851707e6972ad43e807..cc6621150adc5fe67670668ca31501c735569c53 100644 GIT binary patch delta 3636 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\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/mediagoblin/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "Omdirigerings-URI-en for programmene. Denne feltet krevst\n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "Her kjem verka dine." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Ser ikkje ut til at det finst nokon verk her nett no." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "Merka med" msgid "Could not read the image file." msgstr "Klarte ikkje lesa biletefila." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oops." -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pl/LC_MESSAGES/mediagoblin.mo index cbbed538c793897ffae5c6c2d319f545b6ed302e..64a4d00fbfc2b5b932f7ff6009527a3f465fb993 100644 GIT binary patch delta 3636 zcmYM#2~bs49LMoLvbrD!Dk3OP5I0<6A>=kHPGY&0 zW{SCx4Q`QRE*aWpYBS}SdyZOasZ&{vm3@ESHxmPV?m73~bI$*N{^z|tyZyd?-_LtF zJm3xE=OTYG{QVuI*8e{jL(Q7dyo9m%2$L|nu2~Q4kM(gmHpI;sf>r2;$FL3_$Ln|o zlW|{|SqC$(-QuDp9g+3S7V}0AOs9SFDQ7^xaI;|AjnE%m7>&)5N6mw*$p)hql8ek? z)3GL&U?i?UJzws-e*hzx->SI?eS!zq6U6|web;ZVZqF< zb)7LOch~M=C?Im%)tYgjP3@`KogL)*d*lF=JQVrSdE&f9Cg0} z1MmoHL7!q%JcEt!9yZ1hW>tSYYKwZJSE^#_(_6$^JwxAmi<0!n3s*N1-sYrLDCOU}mcm#9sI%Z-AIq^l23!&O*?`Iytrsh!Gpxu2~5XZn2pVn zoe3wQ?k~d-tUzA3{irSc5U*l2@@v~VIsu(W%EjvQ>9w90x_G(J1mC7Q$0{t%S#fLB zirvU(jdj8>9O5$%b*u_dHL(!JpT#vqJG)^2Su631aY&O&X$TgXR;ZA0qOs&N(mf>}EM3kY8W zeuj1N3@WlKsK|atWg?h@P(-1q=bNBTM*`}(HmLWzp%#*Zs*OC<^CiCf%TNnnkD)sM zo4HVmKfuQLrLTPxwc;9-xFSzP)?%Ge5x#;Rd=pgz=THl}iptmxR3H!VNdVn^0icKe zCfJVoZ7dfnaXCK57%K7w`LuHyO0Wm*ou~!gMhf2o>0FH|7>%E!PR9+@#Qq*<&!bS8 zNy7-tL{6fOM1B9*A}$oc7SzfsP!U(52CT+#ypEdaA;w{NhEpS{sIAFDMLHZc&S=zx z6EOkjVJyCjI`*Gr_|E@bI&^Fr_H-t0jvBy?N@;gY#Ga_grlN}LHPpnVs6E|?daoQc zK_$L~7w}0<@F}K%^H5t^)XVD(aF7l~_yumnOQ=ZZ^>$WXj4fzyM=kU;>iJ994DX{d z7M|%$6pI10JNfK}*|aloATGml{NBq&5*I~T&ataR9mm_KJ#N~^IbH*BA?*?@z?yx{ zYGENN6H71-SK(mXkI!H*vkt-$sIAzJ%E%#%LT_6Rz4kNLDpt-aRDAj>d-O=INx>)F^Kj}oQXeUsLp>r`S7Qsz~@ZV9?nJW z)naUlTTu}nM`i3Lx-pXQ0x=u){2*+ElTll=5W{dSs&=-co;&bv1GdN78(cEd6F4z9=7vFo$W7M((N)BG818)jnx-bXEH!cZrJg{ahT!FcAk zkGY`U>>5U30{L%`>6m~Mu@Fl!9_tKuzU`7wTh|dur47Ph9D_=AzOOwQYtf#LB+a~N zaR~)+uIDH0{VjBKjj~NCv3u9myAvCdoa9PM@8a%UwmiwDhC8*3J7w>_q+|YjH>H%t F{RgnclGOkJ delta 3743 zcma*pc~F&A7{~F0vM8XSgo;}i6cG`*Y%aI}DlVwFp^ao_5;6pddd)@@uS=wklbTBf z?lVD2BciuShrt=wz!`H~rpz$~$31j3Yb>pizCYeO)4wrzKj*yneb0HG=bZE6g@YbP zsyv)GJ9_Rg{M_JQcm8?$sQ2H`qjtvhp!*nKN5A&Q*f9!|aW=k&yRZ`;#x_`w9(W1; z@e1C?MvTKV0mj4_<1~NLh~Pp*pfQm+8Q1aTG8{tRqoXzOP*iNwur+33H=KjqYKo8; z%|=u}rN~^S3ftmw?2L7&`x{!mcN+7QMi3X8(F=p<48#x|hf^>eOED4epa$s5EE+fp z{V)*~SSosB8iwIS)Wn6@7uTVltHw^uZ)#}t#7kI&PcaVjgROz~AhDTpcQ)% zC3}e~c^F?RGdqUhEF6dq)RI-A#yx@x>?jhOIo+A{SIMurzi7a*^qa6h#uIii&c&;E z6X)S~%o2qmq?3SYsLfe~gRu;k;T2Rslh`QQ#JR}onG#eYrQN8%GC#%z_Mxdmt=U!N zS@RN=K`>=drFx)B-Un6kXw-lyNHI(%Dv*5C5^cl|xC>Q*DpX}%sPRrXX=uW8r~x0L z25LqH(21~B;#ky!$*9dU5mmXF$gi2rhe}$68h8upxl(ukD^%&LQA<^edFZ@LLk~`- z9#q%lph~zBmBCTe#Pzrte?(Ovhcs2%0#wEy^P&4HP#L>WNP zO+#z$hi~9?EXQw9kxmV@j$IM%!SP!s)uz3>H2z#eqc zFb~JD|I8s8RNFkq1sK%Z+U;vl8I<94bYTYigj<2k#QpTw;s6ZqV~hBz zu@+ZhhlrLppV^9YnctkE;f1|OcMe9P)^0tv#?R0b%didZMV0t#)Sjt91^NTp@E-DN zH9pL)aR;FS8jiXz3w_XmP7Sb}hEBmI)Q!8bAJ*Uuyo=*-C>KZJM>q)UF$HxNhe9f@ z#bR869;_Elvl7Q*C2qxMn1dzJ)Svxenxd^z`B6vh{zRl&W+En`0~L7{YQQ>V-}QO`Tk8`ohXZo6Qp(3A!szg32qeZCuSEEkJ2Go6%!{q85(i;djB)qVk%-NFROXwJSj{d}hCg8nzC`VXp~I|zMx!b=9+k)p zY)JqEnBOd-k%Fs{gJ4eKW_*gxxQd-QUyiU&#eGbs-<}Tzn1LJwlZV^!3+#r`Db^_& zkD53ayJIn`GG*x0U#|l+IFjZ#>V{uY8Th1Hkq4qO?v6Tkk=PN(q9)41FkFh-Bc-UN zsYGR3gQ~y@)O_bL92-;J=ihszbqe~poq}45BGkm|Q3LEit?_=0!U|MomrEW~7N*%PCjR>pN)&|2O>4bXG6mEi!~Lq8RjNh2!qd)Np4)2u+_ zQ58wWP|QRHz7#dlTJ*%7ZujAM`sGd<88n_?IgS`({rCC~a$-#ISnD`upw@T|CgNc% z!TadI_s4Oh@D{2Pk1!0M<5Ub`wkep8ld%@H6i$B*xk_Tg5Zr=V(@G=;^F7YMb`z{k znvMJEe~IBZW}-?va{)b$cidyq?*cz|8 zy^dPL2Gr(kLcKuRkcKjhK;G6S9b<7hdf`FT{Vwc+7g0;}5CiZZ3}$}gPhE6lnA>EW zPJcF%ys1W2;&0U7h>_GY1y|uPJc;}86@H3)r&&uB%OGj=bFl&sq60HCt$^w=ocYZy z8Y-O+b?$|s$UZb_7=#;e0PaSW{5%%pGt~VHXIg*twxgErb5tc==z}MbQk!$`{zdeq z|1)|~O>^6ItzB-b-U~\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "Przekierowanie URI dla aplikacji, to pole\n jest wyma msgid "This field is required for public clients" msgstr "To pole jest wymagane dla klientów publicznych" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Klient {0} został zarejestrowany!" @@ -742,14 +742,6 @@ msgstr "Edytuj" msgid "Delete" msgstr "Usuń" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Tu nie ma jeszcze żadnych mediów..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "Znaczniki:" msgid "Could not read the image file." msgstr "Nie udało się odczytać pliku grafiki." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Ups!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo index 4a027c1cab5a025a6758ef9fba49187cb95db25b..2cad018a45822ed7b63261bd77fff7c728d58f61 100644 GIT binary patch delta 3641 zcmYM#3y_yp83*9AEY|>yML-Z_LBtCXyT~F7B`cuZ)IvqY5)dyFW{jpXLh7G^u`~tp zMw%33ieWf4gyCgMXcB20H3%m(QEX@iwem8~z$i8L{Q7pLo!x!TcRT02?|IMnt$U*G znT>U|w;MV>Q2gxkH_+d|JLl;CKl^%?GRWau9LytZ;&DfnGKuH#7~ajke1u*34D0xN z_TV3QfV((`PaR##=u&FspvFl~^!s8d-}l5MwmRO~tLm_>p_DF;k7Yd@c^rq)t)-3T zRAw_1nNMSs8`+I3*^jH3`!}>--^$*`FFQ0kx$p+ZaX+WCZ|_oOaz0!53#Nm2n2tYY zcOGFT*2U;aUUv><12b?7Pv*JIb4!>^E$8vZFF(>)#;qK~<~~(NSJGU{x9GRr=3gdo zKQqt<=K7QD$ZgDoUf}WE#bfy)2e7MAbN&Qoi6*m_RL#;z2bVHyHJ_=4Ynce{WFCBk zS*qHiQP(bDR(j%U*Avub76xM)3})<`6+MZaMRz* z$GDKU7-aAe2AG)Z-tWL9Yw2DW-)=xX9BFe(2hlk!iP4m(Se;L8AJBF)Sa&8GS-3z-bu$YgdY)8F@)@z&Hd(&4X} zj&?8;*vF*!F!Nw1VWfB(nA8nqA{**oQrgCJd=c~9{PyE-GZ|jOEY%7w;wI*~S|9mH zk&IwcIF*UuR%YPUT*HT%42%$FQagr;_#FRo-?dD{OPT)eYCr!NGtg!x6Fb{|nU=g( zc57VhLjOi}!0VZr_8U@dyEcw=yoAZjqip8$yp$g?wJ}RR6X`FRfu7?D+{Rfvz_U2o z$+LMA2WJ2OR%5XfZ&2Np>BFiB7VrYcOL-n&VJ0&0L_2{q_$B^>jT|t%+BFk-isMUo zAy;rY_tG1$Tyl~^V=Qr4q3)q!cF)3cm)XZ`w)%UTHPcj3% z!cP1Tl~1WRo7~sPE^K9C4{}*cH#w&O#mvas`aXRaqoWhwrovYc#7deq#?8%j! z!dtkLe#=zpn#SvRFQ4I6oHeSdoz0`<-xy`L6RG|ql%>)juM^nH%=|{C!&Owc0MLm$5q>MFjFH<^tmW!@F-r;etjV`u^ZZt?`prkj=i1V#AIR{#Z+oLG_uBr zIhAb|IH|v#c@J!7Qn{Pm`DXj^K_>E#X=jzs*pGw8SKGIRd2Sy2@|*MuDK*~1pHgOO zrAhdi(G|>qi`a+Dn8<#}&Row1KF;ilXPF5-&vg6}^L}`bdA_44vLpkTi4J7?JCW&c zEPH1EPt-{D&)~7VnpyiAvsUYwfp_v`{*{TiUg=9(8O{uF8MAa(GZS0Pq+ z?&mcAj4j45?`z!5#xF}RAL2sZq%yM`UT3~`pEDB}dq(xDzKlO`yq5hrM1`h!Co-9w z%Vg#nCh|LZG#{j$TQ;&bKx2rGVs$}!xxwgTCAhY(zoLznG zW^ke7$CyaF=rx(@%@a6?vv?*wT2|4mWe-#21EyCWyVIG#YL9Cqf){xK_wziSHlq}E zSXS^6ZsTdZe5SV`A7DCsj;C-h6Iq?nm-Ava@pUd>w{xmYT*G;eze7vs`>#>&#C~?< z0Vc)ovKK#P-gMp1ttQ&YOrVv?)I4_LYGy+BGXZU87rw-v{4;y-9p=7&@zm`9F9zJm-rq&6~sWAu5 SEfbo@Zh5L{L%o~&H~trQ>6$43 delta 3745 zcma*pc~F&A7{~F$A}EV%sDLO6E{Ny_Wf4?BK}c{zv_eG_uSy~~p{Ar>T*%TX4Xwmb z$0pQtG>ud;of0$5(i!(LM`$9M8g*Q9N}0;OKi)gjzcI+?ocF%(InVQ)^PX$XUYE*G zTpaZs-QP3(+~Qw1{<(Xq_utQ5Ut@yk-oqZ~-PRZzhGQa5!{@LPJL6$&jc3sXFQN}# z#zy=Jqwt${#tbsXVg97imkWK{8xw}(aUD-C!=dzDI$8rKpkm8HH_X96%tdZBB}j~B z11g{jWG-_M+u%v;f_13-8(Kbh81sNeCoVk0R@jM74Ekd_PQWo(fzkL2YJdP{(ZJ#8 zjnSyUlF3`KWm^JNNlDG`875CQ2-ZE z6E&bdZ$fu`iVEl-)VN-(OIHlT033@J$Mtf zWX-6O_u@lkWz;>=+W8Io*ZzSIKWUKWM--`gd>u4kqjsI1{g9 zJ_<8T`;!^^0E#hMhQbDMa_d%6B0ySU~QVf%g3S>TNi8f#dtVC7dAgZ#}sPVpb(9ne6p$5E* z8t54+fX;-i5=WvQOhj#-OjPBjAiriBe^k;E)WDli&s8}4dr+l6gj%W-n2(OzH1yzj z>Opml9aX}Ws0@ywCO(TB@hYkUcG6U73s4!q!5`hX8Vf>-DI4?w~5+65OK0 zc+k+Ad*cf@39E2FD$Uun;?iTDyHUDuZn}39E4&diJ&gnS#6Mufc)XyN@x!n2j25F@|9| zX5$Gg#SVR2PCiqPGnwDi(rAStq??OjsI_|&-SB;M$8FdeccMzX7qw@OqXIpT!PtZx zt;UntHEt{_py8*FEh@n4&i;Mp=UP7Y6wlmDvbX#&ePCn)Rp&PNA0W94fF& zsFK&C5`2Wd%x|91NJEcd*5(+8OX;u0oA@`*!W-;Ry%oboSl@bir~tMiMKq^yJvO61 zma$Xymh41T@+5Z03#dxoLq|Irf6?GoHa_9jYd7UbELys>myuH2``~4;>|Iqi34#X_Cr;m29@bo zsJ+mD%Gfi-%D5|br9S}md@5?9EOf_tsLC!tE%{;xjmb1lVik5uwIclj70}PfnPdV- zTVFaE$Pr6|eu*|5mdUpsE8O*g2vzE}r~tO3DpiZE@DVDYC#d`U$bt#YK=j2J z^wImDLPIxBM7;%tsK_gjqL}-r?}oVX)=9VoljtADM0|v6FlvJJt#=f|=?|W0Rc;2B z(?5uIOwO_@y$8dX-_+62QTY)2U>oZ0f;QBWM4{f}EL5Niu>jw8e%_3(^aHZ3qcsS< z=?_6=oP?@Ky3=vkhJH4BD6`z`>K}dQxP~qq;T6nJ?|ykj1qJrJMfpXAGiKY1^Ipwg zsCHN}A6Lh>Zy#*4#Rf-4#Se*&u*KMHUK7SgWZ9SG7jsWU%FB!F@xf8H$fyW@bzfZk WkjUy1Tb0}Y9Y4dhdUni}pnn1AcD8c> diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po index d1d098b8..66a28516 100644 --- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/pt_BR/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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mediagoblin/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -743,14 +743,6 @@ msgstr "Editar" msgid "Delete" msgstr "Apagar" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,12 +907,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Aparentemente não há nenhuma mídia aqui ainda..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -980,26 +972,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oops" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo index 07bfd9b29d0b69dbb6d64850759079ebb659a8e6..dc64a04b2a3f56b636ae496c46b7b0cfdfd01337 100644 GIT binary patch delta 3983 zcmYM$3s6+o9mnwl$V2cId?1hNMMboVJbZyMvKkZ=f|?+h)G03PO152Cx(^H)%_6im zRwbEWrl!P6oJgltrc>EOscqGc#z!YkVvV-gNx4E_N};3>R@Z(|X@KH8XkW5VVW3b{0-jWOoOJW+}z)XzR(cNmjuOd|D( z7>5>S;xyz|<3Q$Q)}kg-kBni0I2^k$4R@pN?~7hPf@2xqyh$OR3zu;LUd0NWFxHq= zSda7ZAgY7EpgR5%Q*a11u|!5!@=|aLrlJO(k2CNQ)N^g9Om*NS#y3Bu@H8I5A}kzl zcjQ9mV!n@j%`^OH0((#c^`Wl!<1jpdn$T&Sgm2?S`~ovDiBZ))6}3dmFsxKnQcwp^ zpw_A$wHLgo2zHctSlc<#c9TnMKOvlOGyZ}p3OV*0&_bJrGwjy&eJ5U*aC5`;+ zLLUv~co=8nzi=x~XZn}$05;$jMwx|IaUP}+mNumWi*X~i<4dRsjb)=~^X4I|WGYdC z)T07_CX@WL|IBV0v}XH|XU$1e1RtVObq$sB&rm79jp{IgG!eYXKux3&wM1)?{c9Rf z83>{>+m7mQJ8Hb=!W7iu0IH)mQ4_d=O7T6^gYkr+&6A2sT^1^`Df}p<4phgrsORdV z^=4Ft+fYl@i5@(JdM-Skd}x!*LZz?_6~R{2z}@&9_M$Q{i!hbiB2>gx{OCR}D&lrj ze>bQ_@u@CSEsF|i^+sDpZ1;&FTeZ=v=^ zCHYjOzd{Xk45#7=ti)@$9P?>hfg#M&`Tre-78))i`_5EMvm@Auk5O;OYP^7&NLCIf z0axN2{1h$Bm~Nk%2XQ9#^;mN?z1ovOHj`*#rx;KhJtQv#BXBbM`ZRIj6+JCFC52=6ZuK1TZ;oXPlRCB1IJ0KSK}@F_gA#6HiZrS|dj zp+$QH`I>k6c@f7s>=YlwEb8Y`d*p988Nb0)%vx$^CLihAEWxmD*h)bu+J{=>pQBzx z{iuu_Lv6x$P)qYADg(*vTt&DL)3E~e!fL<~*o0b&AhNAY7f!(6;xv3`8Tp?<;T{bd z$l@)d2Z~V>C`V0b9p>P7P;0ymHQ|?0k@cZcKZqLmB&y#F=*7FydSjX0&o1O^2Fk+r zF26@jYm>5^|2$wOs>3%>8Tvh{!;erCO;};4coJq)pNE=AEhWe-$`nn*o9g4>X<`4c~i zG=rV0iPvK%ZpK^;e@!8i!jvjIRZFmi`XQW&8T6)^mLcyHa}(8`U2Sj1O5{KoFFuOD zz#rid>i%sU^6fZ?@mRWslZMMNLFd2UE|>_$ap4#$mBT|`ZAC~DeTJ2P`JpLQ3j z<2|UQ`Wfo}W2hx~A4lNFsD3}ik@z3X*7+a7v^UT&2MNyX#PxU?6onHM;(f`$31SpphhCAZPL+9$q7ucoUVv#d+{lfj;FRv_8!546(cX>&(zWtGRqd0g(u{K-E|8slqfqTfe- zL1)lyYJ9CdM|1bbmRCh;W>h356%|+oC5sA+dk*AVOQ;miUsO16Rso;nDrX>=SL1iK z1ia3m&%elO-0W^>aQm&r(SpMj3Iy95y}poZ4$~bdcq1-yb?yfV50tqBjZS~#=`K6C zkT-H<(WaOJJG7A3+T=O+lE>{2c|#tv)MJG_OpPf0KCiRXlzCdLP0n+@r@JDv7cWjo zJJsECy32d6*VF8FTD}GkG3vpdre!;l*ZeQ&$mh!jV-u?g(eLy|4lJLVJd%h#ezz%e XTY*rZ=gjI4S5 delta 3765 zcma*pdr*|u8OQMh$ZZj#+{Fto2ny=ra#avz30_Eyf{HN`6Wq#1w?kN5uvTkk6G$+| zc8pS+(U^8@OJkBrjBdz9?W7?SGxd^bQ=MkCMLMYyZ*A4-ZLrSt`{Ui2{@Wec&pGeq zInQ~{d0)7CJmS{75y7G4G5Zal3;a&v_f(8}|NE>WTTs(yu_zD)_zfkvCWSP$RW(JKZSc}_nJ(l2QRG_3Z zW5~gzAwQ;oFD0-5b-n?0{!tu*K2$>OsJPoP6Axe(9uFTsk3p@~EgHJn&LG6WD z7F3z%p#oK-mg;d-se4c}+KUtL1Xkb$)KVpIv*M;8Ax$PKu_9c8RT-@REE?S$cm|K+ z@6k!R-@<63&csbvhCf7Y!e8TDypG#2mub;7hftgKeWc3f0xI!qsJ#%&hGAQobkx#J zn@IgRXCC5!GHyjxqzzTtEvVA&Kn2``OwRlamBpF4902YUUNFwVj7+ zum}6`GAhC6Ec+>X6KCo9AEu!SB<2`Xj0Mf zT7rYP4;?I+7hgk`(?mJ#icCfA=4Hs_O)FO6ZdBr@QSq)I+s!0UUR9>Bi25tgiyVl= zBd9=cVLT3^W_%7+(hFfPh0hP;e2(A1e@C!)D4P<WJ(l9Pu?ByPJeg()^*E0d zQ-2MVRAT?N%Ea;Xv+x_7g$j_$mmBL*CEkTp(Y%K*Gw={TNZ(&>&-6IP(H}xh;2Y$D zF@Hne>L#heerl!$X=wLXq63>yZ>SbjW&EfT?m?CA2OU@zXo2JEi1XZ$6q zf|oH9|AKnq#1Ks5WT4Jx+x?&^rlA2Ukw?#>X`W~_q44@L&j?3^6K8!bzoK1O< zo-*E!-M9~@W7<-C7tcpkXf3wmX)MI@N9;sfkVoG{6J5uv(ZZ*YeQkE)O8gXG!1U$z z^@p&Re(-lRqG>eq5I=?MF$zCNmFz4k@DNVKxJKJNR3+Rv8#kkt;xOvEPcRn$h-2|8 zD&Ad8#OM{Hl?j>@8tXVvjwEUJ;bSLdPALfT_sp8B4Rv&F{>$Jgu#vtBH?C=5;J^SbXveHu&4xyc@cF z{`QtuZ|8=9uS4y^PEPl=l%<6l#{DNc)SR9dk?Id@^mkd?{96K6ho`f1t3S|M6Z&~Z zQ*>X<GB7vtR-GX_F9ep4y$^jr^Daj z-sJCk+T&|0+TedW^sZ|l>i?QesHJQuCe$#`8!@idXKnFydAgWKz~APn3H`acI;L-K a-HV~~bpw&1mlo$b`c5=n3LRW=Huk^1^WzNw diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po index 364a6017..4929de7a 100644 --- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-04 04:03+0000\n" -"Last-Translator: George Pop \n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"Last-Translator: cwebber \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mediagoblin/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,7 +212,7 @@ msgid "Wrong password" msgstr "Parolă incorectă" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "Ai deja o colecție numită \"%s\"!" @@ -238,7 +238,7 @@ 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/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Scuze, nu recunosc acest tip de fișier :(" @@ -308,7 +308,7 @@ msgstr "URI-ul de redirectare pentru aplicații, această rubrică\n msgid "This field is required for public clients" msgstr "Această rubrică este obligatorie pentru clienții publici" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Clientul {0} a fost înregistrat!" @@ -333,43 +333,43 @@ msgstr "Ura! Trimis!" msgid "Collection \"%s\" added!" msgstr "Colecția \"%s\" a fost creată!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "logo MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "Contul lui %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "Ieșire" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Verifică adresa de e-mail!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Autentificare" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Construit cu MediaGoblin, un proiect GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -742,12 +785,6 @@ msgstr "Fișierele media ale lui     %(username)s" msgid "❖ Browsing media by %(username)s" msgstr "

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

    " -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Imagine pentru %(media_title)s" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Adaugă un comentariu" @@ -870,12 +907,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Nu pare să existe niciun fișier media deocamdată..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(șterge)" @@ -935,26 +972,26 @@ msgstr "Etichete" msgid "Could not read the image file." msgstr "Fișierul cu imaginea nu a putut fi citit." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Hopa!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "S-a produs o eroare" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "Operația nu este permisă" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -981,74 +1018,74 @@ msgstr "Adaugă o notiță" msgid "commented on your post" msgstr "a făcut un comentariu la postarea ta" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Hopa, ai uitat să scrii comentariul." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Comentariul tău a fost trimis!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Trebuie să alegi sau să creezi o colecție" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, 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:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "\"%s\" a fost adăugat la colecția \"%s\"" -#: mediagoblin/user_pages/views.py:266 +#: 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:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Ai șters acest fișier" -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 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:317 +#: mediagoblin/user_pages/views.py:312 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:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Ai șters acest articol din colecție." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 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:393 +#: mediagoblin/user_pages/views.py:384 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:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Ai șters colecția \"%s\"" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 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:443 +#: mediagoblin/user_pages/views.py:434 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 90d2cfdabf7f8a36965b3978dfddb1d6be406de0..5cb985ec96e466d119b0efcfded22e3ad5149776 100644 GIT binary patch delta 3955 zcmZYC2~btn9mnzWScHfW1qrA`o+yh8vM59_$`cTXAa1xoZQ0%vA;2S#CkCTFx0WzQ zO~f>-aj24+RBcOMCc!M4My=_RnWQrKi$W?5abu0?;fVswqkdtW)uAogm@w+`7>stD zgwv2)jRTpJS%I2JEi#7j;$65K<8UA9{(->tS22e1&3Ou;T=)=k@hX<#Ju${C!CK70 zAEG+AhU)mw7=a_GiG?w`f){~F7>yb@2h(sV>bWjdq;}wB#y3w<*n+QOHfF_I9XXM? zm#`iHEZ{tJ^XH>OMMQu?b`V^{i3hJN+wO6&M zTxdnDpcnOEKWeMqMuq$n)XM&f6EKmRb1@IKWgVz~A4W}V8!{Kui;DP>IO4Ah12mN4 zAkMH6xMQKf}K3Thfp((n_?Y12hO72g^J8k%)--HgLhE5QBFLy z(jTD)dL5_Y87#*exEM2NEWu5fp!5GGg?1V~MDos*O|w=|hpVV}Vg%uyci|2kM&5X4T`Gx+k76j}n?F+c4&FxXT_wv8#`PG2br_B= zREXPAIkN*5>OQpN3Df}ZVJQ9+Ngor;Y;>O;!!Qr^{387N{8v%Xjg2@1ci?I~j%8@0 zu?UyoeYhVT_%oc3VVud`ScF^g0`kWc6RuM1z=Jr1E-X*Ca%V7|_%nw2fCgp%2ofa| zOfZys>6Lq;+j*ahz%p@V{%z`5UxS>Q;m0F2WrJzP!ZV`@X^5a{Tal60T-U8 z;rBLUev7%(Pmy8tZSLSQOw6_-;zs4jdDIK&3i8%A(Q~Y?T`Fn<(=nI+99T?!GdGvx zo2cXs&#^vs`92E!Xn2QF3vfB{)$w~gU_WM3e;G*+b0c8HJnLIA2Q`rm$UDhAhpfT8 zhI;N6Drw{M_+sK>R3uu^iM|dB-4uR<=WrQu*ItfiV-?z`aS9G$GX4&u(cEvH`xtDY zYDX<#FLI0dC29-82rs*8#$g2(U?!1y3|Y9(ytUAJ7nk!i?-)~qnsGNK;ENcAXHgOO zHHP5dQIYx=>i)3~D-sJ(6ZQn^hfvS|Jm5vtbGLB1&i|Jbv?oc6td6RXsF|I(3SSSj zM-^I0Hy;<%{wzL)*H9fk%n=F4UW~wlI2B(&h5VgB{ax&#{uwT0eB&*){`uv{CvEIK zz5j&vlv3*rH;h}TXLA;noG0Y95czhS_cpbGhK})Su5{BW_6LBM^ zp^p0#s3d)3De>n7nNMkm#L1P`%xB>w>LsYqHK4M5BhJFZs0sf9wbDyC2EV`v4C2gc zf>GFw_o1F2MBV=}R-su={Nr%-a;t+jyg+>mD$5I381r3S$F+C~71B8?tz@i5O>`$t z!NZt=XHb#2joJ7)c3~AwehK8laqF#j z^&s|Bk0ayK@f0q`Tc{*T=RK@Ftwlws7l-jW(v>+?Yklov>#Qy7!cS=LLAKmyI_j;j z-F8&ScA-|*gF1c(k$f~CV;*KVSRro3Mbw|iQ2Yq(coS1Gw9!hwbWEb2i`u$sT!21Y zqVxY2g=c68cUpV>1KdhI&1Fmz4&Wmgxq-~bUd*%cKP5azJ(tub7-j@_V|6p($1C^* zKF@wCaDRPwLUuAP@z15N~VxD5((#GAx>+zzIILMpx%OU zcpRtTS&YR$1lmV%0`(ZT^)ID#G)c*wN%nfD-x;|+$p6ON9-IH6aeG3dirt&rTix|e zdz;(oYW05}n`}#IZgts9+@7|2uYo4F*WT^kwp$)7e2&bC=71C!sVbxY_CQ=Ope4AM0*vqTiKnZ@t%Ls@xrY zuch_}l~(wx(#pcZvor0PdHGrM`i^DT7gEW}$a*9(@o!jJ9`%2#^8dK5&ZcEWG@Kms EZwK%r$N&HU delta 3779 zcma*odr*|u8OQO%O%&Ek5CJ8aJ3dk8lAF zHK2A>znd@#58yaFKG=Q%16r$F6!hTtsI|I> z%7thaR3pzobu;?ncdM501rCScLtkrHbWY^*b8r(j=hq1}w?a2GN;^EPTAr%+2VfaIOIiJI|!R3yU*qxu_( zdSMc(zv-xc76&M30AADsTT#ie6P1knQ8PM(3gLUG4nIdN!N6es8fqzSV+)SsA>F?n zwe|;55euOPd<*ryz5Yq?I|28u)pv!K=8K_nYF3ha)jR#3Nh?;Y6&J_Sr1P#(}#`J?_db?^=0sn+`cpo3f8b)1?Z(uQA!BR}(=D>6ct0;8iKHQ9B*>n7v z*Z7);efTQIuwY(1ge<3ta99yZM`iOOWb(#?CAb4M@N=mCE+gq?VhOJzlRJ_4tD_&$ z5RShg=Cj? zo)o%>Kc}o&PXo`JEvNwmu!x4&a4z)=g;uh~aSG9gX+WZAcB6i*PT@}Kb9nn~{3B|c zjUwJM6`klpR@pQSx+6e=cbE{;hxrCMJ52IaD+h{E4>luFH$O)5)0{;`KY>oE=kTPfHm1hEz0Ld_s{274H*P)pH+ET7qf3-L5M znYoSlYvwa&S;_c&98Y}!HQ>AWC}z>=2rNfMU>Qbg|8Jt85Cu>V>_$c61JsD`4A$dI ztq$g+?q7*of)>=01X0hQMS@}Op!RuQnbjV^2I{}Y3XGk@>8ky|l!7|EjzjStreg$q zMrLCVRw0uyU*MM*H*tE6OD^LSFhJcF zg3n_%^*2!iJcp_HH=Kl#%dCk^UPk<%rJ7rR$lCv8$-m9;(gVLKO&BY9&|`3Y3= zw4jpfEj)}%S6fH$Z9GDK#Tsi{-bH0~Hknp{PotLZF!E0G30}lhwg8WsyV!_}svXO` z&$jq^iDRz2(_3P9ISX74{+v_n1+J3G1$j-PPDicJ-R^I5cXs$n?Cv)2Q+{u& z&u^dM@wRz8z5b4MozJ;_-qJ32yT|+dMBm2HG3SoR|95IT!$N&U2{EB>OOJ*J-z?7v q{jPj@OfY}(#b9?zPN=y0WJK_<^{!A>P1T4{x4R)M^zGVT+WrgbKLiv2 diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po index 81a64c9f..f7ae7d29 100644 --- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-03 13:23-0600\n" -"PO-Revision-Date: 2012-12-05 12:41+0000\n" -"Last-Translator: aleksejrs \n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" +"Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -211,7 +211,7 @@ msgid "Wrong password" msgstr "Неправильный пароль" #: mediagoblin/edit/views.py:287 mediagoblin/submit/views.py:211 -#: mediagoblin/user_pages/views.py:215 +#: mediagoblin/user_pages/views.py:210 #, python-format msgid "You already have a collection called \"%s\"!" msgstr "У вас уже есть коллекция с названием «%s»!" @@ -237,7 +237,7 @@ msgid "However, old link directory symlink found; removed.\n" msgstr "Однако найдена (и удалена) старая символическая ссылка на каталог.\n" #: mediagoblin/media_types/__init__.py:60 -#: mediagoblin/media_types/__init__.py:120 +#: mediagoblin/media_types/__init__.py:101 msgid "Sorry, I don't support that file type :(" msgstr "Увы, я не поддерживаю этот тип файлов :(" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -332,43 +332,43 @@ msgstr "Ура! Файл загружен!" msgid "Collection \"%s\" added!" msgstr "Коллекция «%s» добавлена!" -#: mediagoblin/templates/mediagoblin/base.html:50 +#: mediagoblin/templates/mediagoblin/base.html:48 msgid "MediaGoblin logo" msgstr "Символ MediaGoblin" -#: mediagoblin/templates/mediagoblin/base.html:56 +#: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" msgstr "Учётная запись %(user_name)s" -#: mediagoblin/templates/mediagoblin/base.html:62 +#: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" msgstr "завершение сеанса" -#: mediagoblin/templates/mediagoblin/base.html:64 +#: 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:70 +#: mediagoblin/templates/mediagoblin/base.html:68 msgid "Verify your email!" msgstr "Подтвердите ваш адрес электронной почты!" -#: mediagoblin/templates/mediagoblin/base.html:75 +#: mediagoblin/templates/mediagoblin/base.html:73 #: mediagoblin/templates/mediagoblin/auth/login.html:28 #: mediagoblin/templates/mediagoblin/auth/login.html:36 #: mediagoblin/templates/mediagoblin/auth/login.html:54 msgid "Log in" msgstr "Войти" -#: mediagoblin/templates/mediagoblin/base.html:89 +#: mediagoblin/templates/mediagoblin/base.html:87 msgid "" "Powered by MediaGoblin, a GNU project." msgstr "Работает на MediaGoblin, проекте GNU." -#: mediagoblin/templates/mediagoblin/base.html:92 +#: mediagoblin/templates/mediagoblin/base.html:90 #, python-format msgid "" "Released under the \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -741,12 +784,6 @@ msgstr "Файлы пользователя %(username) msgid "❖ Browsing media by %(username)s" msgstr "❖ Просмотр файлов пользователя %(username)s" -#: mediagoblin/templates/mediagoblin/user_pages/media.html:67 -#: mediagoblin/templates/mediagoblin/user_pages/media.html:73 -#, python-format -msgid "Image for %(media_title)s" -msgstr "Изображение «%(media_title)s»" - #: mediagoblin/templates/mediagoblin/user_pages/media.html:102 msgid "Add a comment" msgstr "Добавить комментарий" @@ -869,12 +906,12 @@ msgid "" msgstr "Ваши файлы появятся здесь, когда вы их добавите." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Пока что тут файлов нет…" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "(исключить)" @@ -934,26 +971,26 @@ msgstr "Метки" msgid "Could not read the image file." msgstr "Не удалось прочитать файл с изображением." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Ой!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "Произошла ошибка" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "Операция не позволяется" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" @@ -980,74 +1017,74 @@ msgstr "Примечание" msgid "commented on your post" msgstr "оставил комментарий к вашему файлу" -#: mediagoblin/user_pages/views.py:161 +#: mediagoblin/user_pages/views.py:156 msgid "Oops, your comment was empty." msgstr "Ой, ваш комментарий был пуст." -#: mediagoblin/user_pages/views.py:167 +#: mediagoblin/user_pages/views.py:162 msgid "Your comment has been posted!" msgstr "Ваш комментарий размещён!" -#: mediagoblin/user_pages/views.py:235 +#: mediagoblin/user_pages/views.py:230 msgid "You have to select or add a collection" msgstr "Необходимо выбрать или добавить коллекцию" -#: mediagoblin/user_pages/views.py:243 +#: mediagoblin/user_pages/views.py:238 #, python-format msgid "\"%s\" already in collection \"%s\"" msgstr "«%s» — уже в коллекции «%s»" -#: mediagoblin/user_pages/views.py:258 +#: mediagoblin/user_pages/views.py:253 #, python-format msgid "\"%s\" added to collection \"%s\"" msgstr "«%s» добавлено в коллекцию «%s»" -#: mediagoblin/user_pages/views.py:266 +#: mediagoblin/user_pages/views.py:261 msgid "Please check your entries and try again." msgstr "" -#: mediagoblin/user_pages/views.py:297 +#: 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:302 +#: mediagoblin/user_pages/views.py:297 msgid "You deleted the media." msgstr "Вы удалили файл." -#: mediagoblin/user_pages/views.py:309 +#: mediagoblin/user_pages/views.py:304 msgid "The media was not deleted because you didn't check that you were sure." msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой." -#: mediagoblin/user_pages/views.py:317 +#: mediagoblin/user_pages/views.py:312 msgid "You are about to delete another user's media. Proceed with caution." msgstr "Вы на пороге удаления файла другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:379 +#: mediagoblin/user_pages/views.py:370 msgid "You deleted the item from the collection." msgstr "Вы исключили файл из коллекции." -#: mediagoblin/user_pages/views.py:383 +#: mediagoblin/user_pages/views.py:374 msgid "The item was not removed because you didn't check that you were sure." msgstr "Файл не исключён из коллекции, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:393 +#: mediagoblin/user_pages/views.py:384 msgid "" "You are about to delete an item from another user's collection. Proceed with" " caution." msgstr "Вы на пороге исключения файла из коллекции другого пользователя. Будьте осторожны." -#: mediagoblin/user_pages/views.py:426 +#: mediagoblin/user_pages/views.py:417 #, python-format msgid "You deleted the collection \"%s\"" msgstr "Вы удалили коллекцию «%s»" -#: mediagoblin/user_pages/views.py:433 +#: mediagoblin/user_pages/views.py:424 msgid "" "The collection was not deleted because you didn't check that you were sure." msgstr "Коллекция не удалена, так как вы не подтвердили своё намерение отметкой." -#: mediagoblin/user_pages/views.py:443 +#: mediagoblin/user_pages/views.py:434 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 993943576c49bb7e77c2e97af0d6164fe8099cf4..d84b09c4ef6747d877aa3862fc5617333511db0e 100644 GIT binary patch delta 4372 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 delta 3971 zcmZ|Rdr*|u8OQOn+yf#P1w;f_2`a)S3koRS00l{cfTE;QqfuB123X}{DvfShOLanG z6Sql<)iSoxq}oB#wVDvq!Al2hrx#6IV`DUFjFTz0NyQ{p$Jp=BcW3%nnU&8u@4oLj z&w0*sUhM3(z20l{T#5~P$?)?5|HknzC{(@w{alMQCYkO(aXdzhG{%V;I1g9gXxxqQ z_y&gIAlmROj=*>EWBd@a@pP0i4;te!U(uM%g~`#zq+Gd2VA48A!>S-EERVQkIAENfG z8&wngQ7brwdhmVJmfb?7d?H_JWll`Q<(P}Ds4Y8y8uyo|z>XoYnNtbuzfyj||HWlo zNPh@3aT;N7#>eqIUcxnalvy$`k>yOsVpMT<;0)Y_oA6y!K#M386>&YXd!`e$knSY% zua&>a1?tcYp!V!M@~pXqT0tCXP^OYmDW8N&xdSy|0g?=}6cxyms4eQk7~GA@Krbq@ zKGb;q9vYhP3~In@sDbXH0*EJUr8o=q;5=0El%Xw% zVB)*zl&PIF04WymSbp|6-YJirN0#) zz_dxm*l{Upymm~-owyW_<1-jD`QDq)?8L{J-<+fojHxVlC8neHZaW6z%NT^aFbsQ8 zDSjPQGkvH)e~)&&io9A)D6?zaJXAn)Q1{hfD7Km@H#;|PbuU;`Kz)qwr%r7tu&mxbTzoEA9BK`~ifqcw`X=DjU@YZ72 zO}U2#b!RqWJx}gJJ|-a7D#AQeUeJUy949t_xSrqF^c{G@-j8&{eFge zVTH1PI=-GH8X+`tP{(OD7GpD(;1Mjq+o%a=&#(qwgj(@qs3Kj98fP7l0wh`sThG-sOxi36Ic1K*Px1c zEo!2z$Xnd}7$@K{)c6;0q|X1xG_;cI7>>751B6i08Xy&w@>!^@T8;{2Gg2m|3snQh zktCUqP+OKr!6-8mPywf*j%^mI2P8NEdpvl07t%@E~d>1E`c<^E-@M(JfTU z11RA!I0iLQ7V4CgqiUoL6R{KZ;_5+V_Eo=!&_Tbiko?Ef_>>F0p3Pma)E6#CvhZx zjY?7E0@8%zQ3D;sv3Lw8;5pR&H~a<`TPu%6-Jgl7p&1y2mHz%RTtdIeL!*X9KkmaM zHdc|IKo!$<%)qG&tqH40yEimK*2sG^Nw7G4p?fqK!@BLkb= zn1Vk=ZP^J7#fvxsuV9qU|G#OdifxtF3n&Gv>6fBb-h-S#GlWh|Uu>yBo%ki5 z!EM;j#!kV~D(kP_27HPBTiA>hORXaRHBMrFbA`ruj96yRd~97|jq8(O)?v0!zZ zE8m{&%*uA~(S0-Wr)T*(oGAezEv_c_Mwjnr**2T^NYpf2wRe0)qW8|U#VO4E|7W%P zN~ibPLJRK&)anh({f_tf*fG9+xr=Pkh0S(XON+b3?yjwEZ*kT6?&h7adAG#Hd*7Sc zAGW~#RCA+yb)9c-e!eZWq@mGeFLAdtt!^_ltJk#GHMh5&`nmlHS8Jnto+)W@H@EqM zXAcK@9Z4y^go4j(kriv!kp_FItD*jhHg8-}skb0`oOe@ES}?J&l2?nG0|FcBT;7D@ z0q+L;e&6#YXM(&#X=A;$Y1@6lWj_k=mQP9Wy;VNR=B-Un_I**YCnU7dU2k`{w|RT2 G*ZvoRN*3V& diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po index e412694f..b866501e 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -196,7 +196,7 @@ msgstr "Du er ved at ændre en anden brugers' medier. Pas på." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Príloha %s pridaná!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -311,7 +311,7 @@ msgstr "Presmerovacie URI pre aplikácie, toto pole\nj požadované%(user_name)s's account" -msgstr "" +msgstr "Účet používateľa %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "odhlásiť sa" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -382,15 +382,15 @@ msgstr "Vydané pod \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n%(collection_description)s

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -824,7 +816,7 @@ msgstr "

    Pridané

    \n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Pridať výtvory do zbierky" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -918,14 +910,14 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Najskôr sa tu ešte nenachádzajú žiadne výtvory..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(odstrániť)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -983,31 +975,31 @@ msgstr "Označené ako" msgid "Could not read the image file." msgstr "Nebolo možné prečítať obrazový súbor." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Hovsa!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Výskyt chyby" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Nepovolená operácia" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    Pokiaľ si si istý, že adresa je správna, možno sa hľadaná stránka presunula inam, prípadne zmazala." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo index 0711332d0865eb854756088e90f63e3426e07bef..1599b039f01bbcf88dc4a8d2141227fba91442ee 100644 GIT binary patch delta 3637 zcmYM$3y@b;9S86O%S!>#MOXyH6;xCpc6r63$s&j-h%fLJ6NnmVMlvB22>uC1)Bar;Hl4!Eq*rvV1U;;bXLPa2#x=&)55(iCOk@&bjxV$M5{kz5DRb zJ3ariPPKnDcDbwg_qzXs{r|jMYXATDdhb$>RsB1U;~}OR zi7&7hf5-jY!!dliPbs5Isg-vWhHGd#vXomrF_~@ZyN{|m?9^CFcl7~mU^55t1iH1f z)11nM%tYqX7-cCB<61Ux19Shj`t@ho*ZAc{g|05_;{?9J8SLM;lyfpl!_c$JvEDnF;-#L%4?n_#p?fhf&i$jM<_ySxcy9Dx`xen7x|M}gp^%63lV0xsufWN|JXJ?NXV^EMz{j@S6vTzx*p3G-S{2 zr)SG9W(9v^Lbaa>`TI=BKV~}YCQKGz1~LUjG&o;bqKLt>LwNjCros zPdt(&BbX3QV^*+=8F(Y_;C)O4Mp$M-JBC^DEWdK!^~{QwGyVOb-oBL?Xgd>$-F084 zEw7bV6)tt*m}YsvCCp5lj<1egJ4dQ7V*wy&ufWp`KA+vY0Ex&>D*o6z&gV!)2Ud-goY9`d1*v!Y7 z0bXHO{+H6HG?-29Yi4)0G0#uo7w3PDLT+@1qr~4Byn$Kq3ML|J>fTnrzHzkpf5nA+G`!rYl)o?oJR-x=@e6F> zTb#_sG1W)rA|_WBu?K7Pc)5+e_9mi zf6OU7-3DjHH!~eP$-}veJ^50-zLyE{+jO$Z`)p#LiPiBP&RoBM{donwLdp`Z;14M> z-v5@L6`#Rm_jLB-Wy}N?vm0w{()}ce z8+f+*W+wm2TMCud+eO`Zt-cU9U5$q?|(0D_8P+yqCvtunbM|PGBN1 zheP-cX63iC4}Z)gdA&J=d2l3?JZ(&eQ<;^`U_$zJrsI{&bGI-d z-o%7{Gf(C=Udul-&rLkD+Tz(v1Q(rItM>Lm4HCfn%IatqyBUSdMtIHUU5jb?JD_JBfGu!9%#RnF##=QxsF z%7@rNulq9h-0F0!W;%SBiOf#6^8i=#RI|v$AL9b)4xHn5_Q=a|)hg?t7W1=KLQ} zn5*Gv%eMG(9c^FfU@JdmJ5M>kN}B7qR{asKzTIQOzU-)186ZrzV~ znEF9_l~jL~3_bBXLz}O>y5p1H^E!7d8#lFc$8(LlkL@w0rMabTQtQM`>sy*rX&pbQ QbzH~OE%!9IX=L;N0M4zFR{#J2 delta 3744 zcma*pd2o$a7{~D^i>yQ?BqBm0u|%Y9A`zsBC9#EAf;N^a(o8CY3Z`PY2-S`jwKfJV zouFw)RkW63jAcTL8H`cWAzDijozd1*QS|%EduRG@Gm+0Z?|t9rob#OLJ=c+)UfVwR za$gJeU1$7Ub$vN1SzE`LdI0H4e;pl_;7=`1JTdfqCqb)~G zs2mx~c3~hM#t5uN-CtApx!ddkjW8~}z@@d2jblqOD~Ey&!g0{ON5{Luu?p$4i! zeSRB#@iA&b&rxxM*q5f5fX%Qs>iRfzYp>?fP^y-q0<1;tSvjgEwxd>X9QEK&s4aVf zN_i_j)XH2KiLYU2EJ1BqB`WS7)Wr57bFk zP%CIc8kDJMRLa|+Ql5kgn299A@=z0*g4&|x*a$bFGO!Dk*(y}Lqiz}+@H8smeN>A8LlHBK!m6J9ZOy3LP< z_B11IM zW>bIm6%Dd&f8kUNi+8GhF=_=HaRgT35cF^DOk@;prC)|GW9v3%F_?#nHwzPRHRj@lI6D97Ij@EXLq%58WeprdC@eeG(rAg$Uda&9gCso1ZQPrP@WXp1}8 zELU-+qc^TX#aV-aSczKkUQ|X7c|6vU{Og8OTjBqwcTqeEtA+aJgU5P)fqsP-P$z zwb!Gu7k-Lb`7fvdVO{t_!FUYDj-Gx7DwEmBn`T2X0!xs3wB?@9_hLBxBgj$Wwo5ch zx$qE`qG>E&d$kQ!<&~&|;}B{B7tjxHU?|>0y&ca`6Y{2D2y7wP6q8UZ&GuZ+M{U&{ z4AJ|)n1%v;gxa(9sJGxVRDh!xi&s#4_7pXdI7(hCOT{=Gha}S$p%$;w-$3f$Ymf{25jKeS0|Hdec$GS%D9JE3MP2^MW~d&?Qsc4(cgeAu?jWN zMby^)ipuO`RA!%};ssM!s*%RM$iD)nb3rK|h|RDNRn?1853WKL*Jf0}9T<&YqEh-j zD)4pGb9YfGeuPT>Gi--}y`68p6x4H@db^!H-opi@@CVf1`u1@KZh|Z6w?Y-&9*oBW zsMq!y>i&Sf&Wa;ZHIs;%cwf{&!_XHCQE`eSb-5)&P)$u8vWbIA!p6A z9S0$YrIlhn?!<}cLo}`QP4vSV7>9Fk5N<|7*)7APxO+B@sa#ltDjM$r&I+32 z2>NL_1m8#M%6`PH7%|ZKjyQm^^lzfJ(2vm)Fb*?uFfPOusEIesp`NfiGEui}p)sBd z6{x-Q9qgQRq3BCL9F^iIR8e(6)l3gms)u0*d<*sVY`}V0jhfI|)P47`0s62S6@4SD zd;eo;=tdW|$H6!f-$9aM=a6l-h+OAC9Ahw({)ecVIfrHFKh*iwTaJnJ1BN-NPQ}&q z=VAed40qm^nV3NR*;*QPM>tz-n$A8bU@ofa=VBq2qh33&Jm*_478NHR zgD?aAF&mYUAs+KEkbb`UoGCWB>Pmw`@A&CGf@1h--EPvf;^KlyGmEB8eSLC4$)p)Y z)74HW;p3|MsRO*L%0jE7U9R+)\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -742,14 +742,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "Tu bo prikazana vaša vsebina, a trenutno še niste dodali nič." #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Videti je, da tu še ni nobene vsebine ..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Opa!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.mo index 0cca32cf2a946cd89e3877c4d11193e8c856ed2f..64880aedb5fdc5af76057999b9d94212969c54ee 100644 GIT binary patch delta 4299 zcmY+`3rtj39>?)B$g3iihvHi=BDxhHKz-p06hsSx?^k2Q!5LwgVFreQ6;~ar?pn8k zS#hInW2~|4u1?ofr!m!-s-dopu}$sE*wwbXrcu*vYO|YdcI~G7{c*=^*5G{Zx%ZxP z{{R0uXW-OX$6wDl!e3;>|JLyD4*!Sq|HnkN{`c=rsxc#I-o;V)81r%1)5a9zVjO_` zF$<4lGQN!tyn_9(2k+sBScq@+H)gUiVRN60aoiY`X3SoC6k`$XYw7lYjtpaxXb;9d zXyGs%gS=`=keJLeR3J6T943TM;cgs+9jN!aW6#fFCi9!CTqN+|HcrDYaS>)^8dHHa zI2BK!2KWj!@b{R4k5PdoF}sSFf}=45HStvZ8CIeCwV^7t6Gt+?In2dYJcor?Fwh>z zg~VdK$dB2&__0CMUk|#u zu@KMT1pF6n$FYQe3tz`t+{P?<_$5xk6w=bBEWsJL5!>-)R6v<*6m8y#$SRpiR3bH~ z#CHs%{_H=~!40k1QKYZAjLP88s8ZcSmHcn0lK&kwU?OEAc{3ChNC9ezmLdDs)S@a7 zLRGdMHQujK^Bo9tp#jgL2D*w0;0~(9KcG4$kcKu-2C8(!QJIbALnSRi4ZIrFuO`-R zL{+#AwN$&%gAr7}@IdOJO_GNyVHqle?Wl=6@c_Pxsz4rTs`HI~?KV_pPGAAPgU{n5)ZVD1 zp33wzYN896gO{)p@8JTR%*}Fa#o;>t7rF3r<2JJI%%U-N1{-k&?RKoj_fdfi&*dcG zb2tgVK?{eDwNK3~e1`T~T#37IC*DH7@yyzBY*c&^6PVvTLk;)`b{MN+-orwCge90mLld}S{sI$eA4IyFmoWoh#m9IWpT$#rFogL6 zm2ev0UdQM#Gt5OfH$I6l2jDx{4?o5%{3>?; zhnW3Xw`}fbqsA>o9+_|j7fZQ#0oUM1Sc2nc*qhCZDYUnvHs`)r`!K4sCvYA{P)qYI zD&v$QWBOt-4#o;pBAYORdyyp$n`imdKz>w)ZKw|WF%!E{5ucAezZ`3ShMM3m^4(+} zp!y}TBl&hV7Utt@R055t@!C=SIxt=5{|Fa~>=bIC50E2mzD1VLWX`rTFGrFyD^aEI zKvnD%YQQ))QZlCE)0lH(he5e$L(vJ zPkTfOfA!!-BsTL)+=Ew80hO~3BXAS;#}`lu{RRi&o0x|0p*G`f3~Rs?MpuOSF{j3y zi5jRFRk|fO3OAuDwi`9@?_oeb1%E6H+mXyz zU`M(HPw-#^#$z03QyC|r&h0osW=ia2@6@v`;}e z%tawL^7x)*+06#jxjc$0*(bOhf5O$c{5ku#-AUBI{VMF!GX#gw&PHA}vydFjo|xBB zrz@?JU~w!eq3|nQ*Q7BXFQ7928mFV9n%{_6 zgu8Gz>a-*-G3F!|VzKeZ?R9I1g|qcdbxI)fp%&)v0S&WQN=PM(X62viVyUQNB+R&UB4tHo2-8nnl12t4Uz@kYHJK#SAM1vPO6xaG78H#?gfoR)HH3TQ4? zjL@HSpk{5Jt*t>Tz!XX=NX2hdJ&KF3q(sq6OXoTUvTszkT4xIj?yqa`goq_NaQV^1 O1eeF>_jH|K+x%a1@tNuX delta 4004 zcma*odr*|u8OQOnE3ifc5fufczFvp{Tmy(munGo2gBrZxbz?7w1y%e?NUm#$?j{Gmgf@WMlF$7fbOG9EvYs z8g^rUJcABAj|1@n{t-XM0{qn=W9~O5Y`&y1feRB-jLF7o+|8St@d5gdRD0lQsMr=^ zKU|3;@loVa(}Kik_Mif4N9Hm|@g95|hhq=w`D=IYhmHAy#t<%igYh_oP7$W#99)1^ z*p5^1PpAPhm_-BUVj@mK1vV2CumZ>8Jk-PiybpJy-s{3N<~Jv3d<)NG3x0tGxPF*D z&;cYi(}Db&H~FIg&Y>o{hPrXKT2r}YT!21d+o9Q z%c#_Mp|qo747k~8JVbqGF zsPW#5UB8N&rx%q8hjrJmNuZ%UPsC-o7(4I?D$<2x>|@u06X|!MGIIs<@t?R7b4a6V zV<&2*pP?rD8;--Ta4u%jsX!lAQh(+c4YFt16ltU-;}jM=ysYw#p)$H5cse)-H^T+RIE6peTs$8sOVY}DR8js5U>jKlrd z9}l8Z{4-R|oInM77A?Gid|Hi**){G|R6x^F&#gokHepx;JV`^R;0LG&U&I_dflKfc zoP*Q2SdLHOR6K)asIxc?X5tRqid)dZe$h1Ba5i@0Uc7}~-03F&)Pw1D+o?(T*3 zZ}Gf?%FnY0yiSF&JH}aHf0A>sjQ%Rr1P5aN9Q)J%HS)Uo2vhMQ{tIs+zvjkdyJ*w- zYLQekHymp;<3Zj$h?U$ZEwZb27b@~jOu*x@>u;fs(-qW2w^3V{z`hK{aX1i*aX41Q zuCIz2#4%hC@1~)FUqQw&UAO>0#bsDrY_GTt^*uO`iFh4Vq@Tz7|3(Gc{{iX%Q&3y9 z2wAjg!~ytI9D&D>0~a=DXdK}}A8N1n@kaw)K&|j{%)g>OwJs`60gpu89~4O$jJYTzjrSO;Cf1=QY{HQkMit?YF`4bZZ6C`loKL?XOk)L& z?bw08M-|z2zPD_EmX>~AL2-14KBr(aSh%)&o&F}|Rnvy7!CZ!9~={Zlh`?X`x-Txv0!7 zz{N@Uc!RTCOf1!qA8T|@WaqdC|)`4mG zA%?IQvvBot`+vP%ID-B&sAKvQbm4Ivh$k=^doTrmhw)m;r_oDE_0I8)GX_}vWZhRA z@cX^BAzz^3u{v*4ZP3@Kc6JlDqa`URR$kszE5D$maEd#xC@*iof@=37?=n0o*zjm%>Dl+o>G|N zbj`dQRa0bM(X)~7r;dnzSrl@l%xti{!C)Y01!`-XgWkI6mf{p=WZST`NJq(s$+H6A zY48U;b=HPJo!1}z-n2cAi9WyAstg1-ctU25Cm3w@gsjKcdHko3toQhR8+;8`sM)iw z)Kmro4WVeobaz5h^_q2L#G2#v)vpajTFVzl$}%$|z2&*_M6}5p9X0C}XWU|6oj3A+ zLTkO2ClvD3 auHE2est*>vnBejU>a9R?D6(<+#{U8jBqEmp diff --git a/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sq/LC_MESSAGES/mediagoblin.po index 56fd4849..2911f34e 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/mediagoblin/language/sq/)\n" "MIME-Version: 1.0\n" @@ -193,7 +193,7 @@ msgstr "Po përpunoni media të një tjetër përdoruesi. Hapni sytë." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "Shtuat bashkangjitjen %s!" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -308,7 +308,7 @@ msgstr "URI ridrejtimi për zbatimin, kjo fushë\n është e msgid "This field is required for public clients" msgstr "Kjo fushë është e domosdoshme për klientë publikë" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "Klienti {0} u regjistrua!" @@ -340,11 +340,11 @@ msgstr "Logoja e MediaGoblin-it" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "Llogaria e %(user_name)s" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "dilni" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -383,11 +383,11 @@ msgstr "" #: mediagoblin/templates/mediagoblin/root.html:25 msgid "Actions" -msgstr "" +msgstr "Veprime" #: mediagoblin/templates/mediagoblin/root.html:31 msgid "Create new collection" -msgstr "" +msgstr "Krijoni koleksion të ri" #: mediagoblin/templates/mediagoblin/root.html:34 msgid "Change account settings" @@ -656,39 +656,39 @@ msgstr "" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" -msgstr "" +msgstr "Perspektivë" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 msgid "Front" -msgstr "" +msgstr "Ball" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Top" -msgstr "" +msgstr "Krye" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 msgid "Side" -msgstr "" +msgstr "Anë" #: 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 "Shkarkojeni modelin" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 msgid "File Format" -msgstr "" +msgstr "Format Kartele" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 msgid "Object Height" -msgstr "" +msgstr "Lartësi Objekti" #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" @@ -743,14 +743,6 @@ msgstr "Përpunoni" msgid "Delete" msgstr "Fshije" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -821,7 +813,7 @@ msgstr "

    Shtuar më

    \n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Shtoni koleksion media" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -915,14 +907,14 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Nuk duket ende të ketë ndonjë media këtu..." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(hiqe)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -980,31 +972,31 @@ msgstr "Etiketuar me" msgid "Could not read the image file." msgstr "Nuk lexoi dot kartelën e figurës." -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Oooh!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Ndodhi një gabim" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Veprim i palejuar" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    Nëse jeni i sigurt se kjo adresë është e saktë, ndoshta faqja që po kërkoni është lëvizur ose fshirë." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo index 8084b3f4654521d653bacc044ecea85eb895e57c..dd67d3419a60622ddc37bc935fe2b45a0b6ff274 100644 GIT binary patch delta 3632 zcmYM#4NR3)9LMp4fS{--hP);>R7`nCK){Nth$4t)qLMQ&l5AVRg(rSbnv?la|Hm6S0BE(XMt`~Fabh(DEzCWM4#V+@Ap7T7;DWDZk~gK#|tU>)lEeXjFIaU}DbE*hSk=)q*Xj9EBpq%qm(z$E+_HNX|rz<1CG z`%w$?Vs<6Z2gA`1HE|L?iMgozDo~lK#?j1gw$rG>qnLp4{?5Y^ zi-ov`St9W=CZZ2vsVME3f(2NK@1qtpl0s4OMkBjqa!`RdP=T)tA^+5$siQ-CwiCJ6 zbfO~YMWw0_mGZw(DZh&va3Ehe};2Dzb3Clu|ot;DxCB9IoS4s0>%2wyFkK;6c=VPJi;D zB8fz$a5^f2wWx{faSMKk%0MJxDzyoyh-dSq>xxkkSE9yy+tt4pHBk#H6DM4rLblv# z&e2%Ji69$wfUlrd8t{bm*x50P;|f$}_Fz07!^L}B7 zhc#G@-N+lyTPJlL#PQ( zqbEK@%E!2~8eL~YFHA+dARjZGbj`$4Y```w!klQUc3PszKXaIKbg26Kkt`WM@|uRJsFjza2CPF0*R-QD z){T^pNha(8xDYkY^Ee1gQ4v?6GE(ER)^)xiTCITW`v(m6WpP~G_Y@i^=lW4 z=^PgzZ)x)pYN8|Pji=BJf5ai!jeU3x`Izq~SzFVO?6QgE?WG^P`A!|dKqB(4F)66WG7nWFMW}_8;V`U4MZ6tV#LcMd+g;~RqFz`%s7%~MKE`>MZ|(6! zHZ~i}khPd&r~&Sw2KG#`9xq?i!a{H$h9OUuiNFAyh18u{hPrPPj>1Od6=Duz6`n*g z<20FsuYp#hA39Mlj0V&K4!F*@yUur_o{ID6gFmANzJ`J5PT>S&D5`%lYKs=4GUY(s zUxGvQ{Fl*C^;e@J*onIF2x_k`pi=$-71>})J_skFQkaV>vJI$#H=`D|6&1)%RLWaj z{p~oD<1UP1elzqb>(?#~yE$&dLVSnHRMp=_%EW{{V-;l{l08$7mG}v2LF1`V74KBk zUOR9!mZ2hVKwoS|ZCMLCgK1o#p$KlFQgt7-CB|-Ti5F_XVANj5U>Ihiwx|g8VyZx8 zpceHM)S<@v05#zr)D|B{jniW%|60IpI+S9csn(4_sN#u0r7jK?Su!f6d8mO`qV6km z9lwrB{U+2_HQ@^EK;1WCnpGp|s0`*$b6OE>r9&&;ja%?DR0h&BtkljxMO=Wot{N3_ z9R}hqSAQF7qApY>dR<;Y?fG?FgwfNjAG75mn@8u>^0Tiru*+%k_%I`E=Cb9K4EJNZc&z z*X{+3;rL&)VGJ(|4LBDkU@_)l6ISC5&#OVNGyqpfqALK^OLl%gUj zM{le|rML!FG>xcK??)SUq9(YC8hAvmwV(jhb&2SOxv2XWpq_%4Pz!$zC+hicq_KdG z4kT#fPxx$;S&EZ!H`?(c^2nNyxz?}UB3#39FGgbiv(_GOzy^*_VG%m!S+&!J%G7mK z_4__Yfiu5}ppk~TsFl~E25d%E{b^LnZlH=Vn|&I9D^UZj!a=wJ6>&W(BTX)MxX$lJ zUM1!bn(%RD;kISVTkj2BGN83;_+XoNLYyrwH7!16+vd1O2k}X1@rkX6<1V^$zA5ZK D5Sfrk delta 3746 zcma*odu)$a9LMo*@1=&STTAJ*Ei1K@GeRd*Eu+efzO3EQ&ilhtV?_JU=$8P9e)`et<^FbD%C1ffX%2iD@W~#ov0bqqHes1TC#dn z$-8h;GxK63zJ#e*gj%w_sJNe_5<7_GX0`2Df0g`~#uHa?1pQms3;UAxa?D2`UdCDY zC8NY+B-2U8EY#*K!E~&^VmyaRXbc-gn|Lm=dbSERk@61IUo)@f0Q=C6qt?ua+-voy z8ML7cs#G+pIY#Ezw#G$4XQM_Ms|Ug^G9Bp`ig!q5{^T0zE?| z(3Z4S;zZPqnW)W^gR0zQT6due`Cp3sw64sHLjGLUgXv(2cp&gX&rV zs)Q?0GdPGE_ylgipHLMjV45oJeAJBJ=AW+HiJEa0D&Dcivk9_N0v38>>(=y@?v=0mkAJ9F5U*vak?` zv;XWf8dTdJ;R1|^b9eijs2Nn?M6ANG7}C{EWHN4}Uy8l4Yd5nP%tOUnf*vfxJgmW$ z7~Z|%&1Yqp&-iwPMi9m_-5KaXt=&5qfbU}x_>{fzXsxa!P-JgO~%W^OSi%^;GLj^pJ>|6T_Rk3iU zt2m3$A2*`nY{DkE7d7KAP!*|Z^hh7-uM19aU;v)QC?d4J!wO3AJYxH4rtV2!gALM0fL9Caqk4ByEjS=V!prMkCN3OLgsI^{? zqtJ&b*d^T!@FFU3A%S zdr*OX#a4I~_2PJhnn5!*gw98!&c~sijxG_fYYkqV`D0VCt`cJqNpi2A~qiLzQ?T>c-`$&9erzSvR9*R)H#MH7f8a)P26j z{&iI8@1T~d9t$ychfMM?Oj;I7Zs7houIt;bs*$#~_&X}o4O#AESB<^s-$7NT!*KVjmx@#A zzlyW47B$muL=D6wjKwq@jnj}2whOt`ZevGul1I8T`#i5M(H1*}33p2j?^$Ca2%7JBoY#(cD#hNX0DCXE^N=c3l`I}E@dQ8PJ@ zp?C>Z;v1+v^B9$A*cdl~IMe`H7=%ku2`xokw*^D+0P6m)u;Kato`x>Gh&}N!PQqBG z&E%~ZSynrOX&9XAe)R?-kF+^hieKY0%pB)FrZq^F?IxC?cf9-6t3~Y{&jkM1f0j){ zk5LhJ!!?+J2T+;UVLS%09@_PZsEXyH0_{V8JcWvL2Akkb)Qs<=DpKF5)4fg diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po index 840e9e3f..32e7d3d9 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mediagoblin/language/sr/)\n" "MIME-Version: 1.0\n" @@ -306,7 +306,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -741,14 +741,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -913,12 +905,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -978,26 +970,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo index 435c406b2e69cd4214eb19d0024c4061dccd8fd7..e4586d5013705b43f62cee210d8c28ed5cf095b4 100644 GIT binary patch delta 3636 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 ROMFR=>!X1GImhXUe*rvOz~%q| diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po index 939dce36..d288feac 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mediagoblin/language/sv/)\n" "MIME-Version: 1.0\n" @@ -308,7 +308,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -743,14 +743,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -915,12 +907,12 @@ msgid "" 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/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "Det verkar inte finnas någon media här ännu." -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -980,26 +972,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "Ojoj!" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo index 43de15d136786f5fa9b4bc8eb6f240eb45c280b4..5009e3713dee849049073baa884f94d27b985809 100644 GIT binary patch delta 3637 zcmYM#3ryBk7{~DkxewGt1qFmRRJ;HR2*|}0#S0g;6cr^CBDFa$Y2L!ypR}1S(JfN3 z=E|w%wdQ4p&XSgw&2*D;qDktaO)Z;JYD-P~{`$XL4EUV$znpWP=RD_qZ|wGYvdhQ0 z7Us9n_-W!Vn!hIj>iz%I)Y_~I-JdWPA7e5`wJ{rnBe4Un!*JY&L0E@A_zi~Qx7dsq zFclBCHS25U*i9NexDfH2*}J?k2(##)Y3B~;6J{1jzZ3eR2cxhX@~Gt^YqBw@g_I$4 z*a8g3RTzQQsONWj?;pYT%x|Y?_;ce5X5e+q$ME)Mg;<8^xCb@B4b;Fb7=n*c3kzg+ zB`*ZyFbp+uI`+g-sP`73GF62!%x{}%EWsm~iYXo4fuB*)@BwO~ov8c! z&<{_b7IYG0@B((iyBLW<%&O~MQClh6X4_?Nu477G|L$Sc`gb8)~cSQ7ONL zitHhF##kQCz%103%|(s-7HVP3k+s-bRK`D!Apg3tlM5s804Cz!xE$kIek1O{3S7o4 z33wgTFodvFl)0FRY`DR#qm!m%|#770rg&)w?7+|;YFyeT8T4oFX}y~Bl%E~B%o3_ z6cxd8)Wqv?1Ac_cKmuVZwW+9xNAge4%|b<7i5l-c@AVz1i4LGLamMR8WXm0Epi#n& z&K~Lj=b=^_@w|KNaxszqB2;F!V+wwarFaij8%5+(k$#Sv=oogz6Ig`JI1Kx8aX2o- zXr2G#H0E&O3Q~8L-_4Dn9E<5!;%GdNT1a$vP68HSAN&nH7#Z)LnjGv!e_MU88uVv=yG>&X-bL-*Xu|i!$>@jW7=+VMDV~F>nJQGOYtV!HP!pU-fBXk2 zAM<53dd`D^n1yYXr{4_puJAVNsG>I|q`;KXX_E7gYU^kt|sldCkTw)XEp22CPO3*N&nx)`*mk zWe|2NoPZi<5(eX3RK!bA8CmIdjracgzU2P}Zq#z2*2nA;YJxYYFb!Od$+#Z};Wgw_ z+G0}OiTYs>{X*n*E5=Y9kIh(t{Mzt-?$%TyyKK8rUv>=+jVvxqN_PjWL9KWXss;`s zpEY&_bu7O})krgHAuZSj12Wu*JEDp>7WI68)ct&Hk0q!~%tU_8na6+a@h&XH7Gz8t zz(#9;H&Llvg&|mtTG$rU!nPtO%Z_3MHX(Iq_fhY4$#etjfqaD6KwN^aAenLOGK~N( zgph_X48xAt9kqZQ)cuj(`^BhJF&(v_nW%vmV<+5%`fm8bd;J&G7Wq<8%0wvY{U{98 z`S;LJ^(UbsC`1idf!eFLkvg;8sK_p3XY`@;mBJ|0mW@RXT#8y)8IH!8sFWY`Ua!Xy z^v_`;^IL}j?zi1wY@~kzD{wQFsj7d3iYR`dTa+&&NwcL`iHA`O>O+O9c=J(vJso3k z2`cg}*cNx8wyX}FNE%mZD1wKmR6RwdJTTWi-)&F>7GgL~!B|{~+M{&#t`>82bICvA&whC0~a*$&$t2aqB7v*xv5=^iue=MR@9>+et?=d zaH#vf2Q^U=Die8L^HF;~3QKS!?!@068d_=1F!$IU$3*&npfVFX-2Jx8#!~vTumaDZ zBJItnewcw>F$asV3>m`qB9B@NMq_5a`(-yCBj`IPX()mwEXD_@sx2sR7gCGc=$}HJ zg4g+w@ZcuYfL~%SyolrQDOO=ItKh@bE@C%twFRj#|)e)N`jX5U-<(?k4IKJVHGeOq9KK{^Mzk=fW5y zc>4_5R=bD&G3`b7+in(eWNkmL!rQnEXTRhg(_fJ+Tlg6F+inU@qu+w6oszL`rWT{B ze;dX#ztz#m#_On+N3stI*bi0pWvG-bM-9}3t?&tIpl2A2;pATtdr%qa>9r5)ej4&o zVgu3Qy3ddEygK#J{nnFP9m+`i&iBx;4uhhDQjHS3Z+>ZGJ+r=%S^oIKH& IhxT~>1rzm>0RR91 delta 3747 zcma*oc~F&A7{~E*1x39sDT<$5Cv^WzuGBnGAC2`}4gs{Tp++pL5>jIp;j*dEfhBm*e_w zhjp!G;5&xDtNe%Y9~h+Ge}8wI8WT?USL}$+X2y6h0uyl-w!#t&!Ts0}Poe|QV-vi9 zHFzDP@pyA%`Wj=I`!srRpvP0jxN#z`=FVIkK;O~Q4m=Pww<#EaY1kgqkxPvanWI^Y znotokmMOzVcnsU%3Dot~PtIG$+@lf9fyY=MgXzR#D2~BNI2MaA27g8cXvZiD9Dz=Z zK}~EZHo%eC8Iw^1FT|d>8g*YehA_T4OrryyM<3q9Xq?yD4zvZCn<+&;<`7?+!1t(u zs!``}Vj$L{CiDmuw=w(D7TwqmhoO!?gO>JcISr+%02SbE)SeZgYGMa!1y!gUub{T9 z4wdrGoYcxZ7>YA77IRQrwg(mWW7NbBB6BlUZP>dR4EbriGEx z*LYDWT!~u2LDaw}aXnr{Wx&famD>5J6~D@tuG@iHaRn;g*Z$+zP~+S|Wy0ZlqGcM; z(4ISSI!?t>{17$M$(`)S&WF9}m!mRs6{GNPOv7HJQMFNkTIp@nK!0Kvti^E{PG=-$ z;VA0Qd_;q6o4+s{gS*<*{t9XZ#W)o!Z~_K(vnMhQx6#kTKG?0hF)mC&#d{ImScoZj z6jx!39#7tUrVwW{zNw^9AG@&JbabQk?lla+cQFu)u_10nrFa*rW)7n!dInv16M40o zAVyc*IMjp&qpnNCAk0Ba0bZh^r(hlG!p+zV4`V9cz%e+GgTpZ&713-NdKVnHPNryk6mNIO+d@~G;ML9%6%F#&T>GcQ90Jb~1$`2&@) z7A#kB7GXWyfQs`LHo`rq6@P-t$WgzQeaXKrILU#*_ycZoQ28EvfZbG>0-rz*nOm5M zZKLfUnHi{o7GOinM{YN7ViR1CHCTdt%&LC&)>I(7ZfYzVWY;)(jpa zwrVam)APTGh5}fqJDuWhk%MPI8evX=0 z6;8mjsEl_Q#Bs(qU1^L)5AtM~Ww-)M@e+2SGBfZWRQ0D1u~)PPRh(ZS$urfMi*2b; zO{fsVaW87GPh$tXhN_W=Xf>zNB+1^hFl{E?5eIL|TC14h2qV790%(5@6;eb;30JVac;r76za6SF0s0`Gg zQu_;P#epO2t>}tc@k~_F%|lH*A2rZM48)y&_oB9ZzeQs@jan?l$s_HV-p3gFu2KFU z8&qcUkav*Tf@ydTGcbZ^TIo6r#A57%TX7s#At6okG5XcxvBog8N@!%$_zYF;J)gE$ zkc3m|&qP)2KJ1MTa2vXLIrPDA(S>!WfbAL0jq#X*8Mq1$A}?1HpUkfwK96L^GN)*y zbD$cvcSFY8FO+1|N+w}vOhu)58LDR1pi;dVU3dUBz$L7YLCjhcYKpq97Y5;Q)cxb| z$@8C1Ll-Wz45r5{&|eR36t$T_F*CY zO7vpt6uWkgpqu(LS7@mE>yz*97={Tr95wTmsDSUGs=f-9v7b;ym_(lI;cQf#Ol*Wc z)Qa;_8F|BRq5u3QY&e(`+i6r}N6o3%b\n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -742,14 +742,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -914,12 +906,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -979,26 +971,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.mo index 854f7b5151d23ffe735f370ed4a04ed0e386e9f4..7b1c154cbe52adac095f44a17c8283ccab9e787a 100644 GIT binary patch delta 3636 zcmYM#3rv+|9LMno5P>0HAVlE^CsaUzxCF>8IbK0P0~9Ze0THZFGn!~&;z8XMOR(W3 zOPwLIG_g%lvvgroqfK2}E9TNHX|q<-Oj8?n`Tls%7CW5J`#$gcKF{<2KmX@FI}W%V zec#Rbz5k%?hQDk4+xUMxSZDwLUGp<$45!yI4Er%2LxviYh57gdZpM+=hTeD*-S9IU zf@iT0FJmGe8)i(LF-~)fgGd^Jh8weyC$cb&^PUk_hi?AHcyT@oJ0<_jNXi@_OYlXnu<=PDvtwoP=Z>ka#SrWMMba)^i0FS#fm`$jR?+qgVy3j#GHXgwk{0kc}g6a3- zeyqgRj1rAEFbRDLOGW9xRII>ydGY}OfwByvpvYO z<_s!=?@+1gL#6yTRLbw6Ivh-z2;KyvCX#?!qC%v8O(iM=b*RkNqx#!`8gGk}19f;5 z)zNv>1g@b{{1Ek^Ct;{~{86d1p&|?CODT1rI-ZYuuH1G05-P(hQA@QBYw!^2IcFgG zP?1EVQaBwIK?7>w7TkinP#K6OOr&aax^F2e;(AnnZ@Sv|qXs&H%0!RLi^!5Y z%@qz7aACBaI>1*@GYxvu+I9|%;d~`3GwqmwpJECAj;f73@~KEaL=E%_j>T@w!#7`Kh4218m=OBXL80_5mew@&g*dwUP4X8HlCe;v+ybW73~-tVeOg>oWS`) zoQLbM5qpt0o>>@4p<)wyGQRnRgEG8>TDv)f?}4Q_2rJMVt5GRlhN_uHRI0b49XnA2 zTtZL$8z~>-!EAJ&9lbCO_52hZ*#Gl5(2dXIL~O)jJcK#uM&mTh#YxzL4*VQ5(2G5} z9;e}I>_I+eI_b*BT5QFWSdDqHR_z>#CI5_JuF#KcE|aseioq*)}kU_h04e}mrbtgEpg=k87}Ok;ij80-{QakRG2#M#dv&( zSs0aQ{m8tC8mIxiaU1fu*@HuHFZN+4@-c5cZ7t1NWR=Z5)Q??=lh;@p4eiNRhu2Xv zzK^Pb$H=>8;JvDCX-lzcBo_I(Fc~-$3s4c4ql&l&b^lt|^;QhvybYC!OP6rnQXMBY8-T`a+i zSc#D{tw`TM4YUKt;x5d?Zsb{;vAt{tN}w-;DzoR6)XZ^LSgEVOE;8I`HSsOs;< z2*x+JIY`IAB5URas19pTRlgmTvMy8+`m;{%n272q8GSGx74dvjM#@}PxvnopULmFq zP5Aib;r8dMy6*dxx_31u?FidCJig95G2R}ZmY$Hhb#uI3Cke^v2}xbY;`ezB-18q0 C2aS6G delta 3739 zcma*odrZ}39LMo50-_=+njqddi8loFfC37cpduzJinnB@q>^KrH`EQh98yV(@|HPq z7HXkR%}~tS)G@5Ynl!UU&Z(8+T3AzSrmnR2hu_)yH+DF$=lNZ}&+~kr@9%ex?(^BU z-^X*Kt>62`-*x^w^Y0g+-hY30gUq_n{SCu0u$7q`qi_gL!{=}(hTsuwhBfGem$4;Y z!CUwv#^L9!&H9;n>@OObIU?s%*IYQ9l6vBkvUok zYC@&RSaukj<5>*F3#jXFHlFvG-J{Wt1JBSO+tEqDFdT{Fa1@qeJl;kH=*TDv9EE`x zkD6F2HpMjThNDpfFTmco4s~AzhA_UJrqLBIV!0hop=&O#iBJFoz+pe8hiLQxUVL3YoIQ41;UMEX3Ww z32FuHNrN)g1(ouisFcT`0;V9zu!*RN%tdWc2?pa%R0a;CGFyp?SLLCh0WYEg-bDp^ zhMGVK(^iUOQ8x}j70+l?<|ZQ_o5q(?T8Ij~33Xqox4#dS`U=!moxwcx)YH(7ndF1) zS}rPut57RAff~35H{$oG4CJy*rFI@_#c%SZ>-M5nT#1VJh4=Uk)Hn^OO!&AO^;lCH z+Veo1f)lVD529u|{(0xIE5vB}6{yTy$5?!X+1Q6Psy2#IEBysE(4QEAk1+$g&`HBQ z96|lrr!>g6J;eFguDet1t5GZ1ffKM2$6`PaXCjkvH~lr(7kl(HbKyi(yrme4TW}(t z!6FRq)%fPKEttdjR!zenBUtWqj706-di2F@=!ZM78J3|^ydPCFr%@BVgf6^;yjm@Q z(G@olHKD<%>#{Kb^U^Vjt6iHKEPZojv@clgEhoBsR|^Is{VK+TQ(Y#FdsGZ!>E84kh--$P#Ftm zxr(z8o8Tr?ocFLf9zd=57%C%YyjJ%k|GJ=t1B3Bf{Mm=fcY6n*!W1|-&iU1g#Ub=( zB5!HigBs`rHp5!vcB{jdcolEq9pqzQ^>?=BA7s}p#>4B2?Aj#Mub%pY=m#V?fm2a4 ze;HK^ImkQ7W}_a@B2=wxMop*;Tj4R(!pY}gdbD>@6FQC|ScSYwJXS}ekOL1< zDO$wx73gDZiw99Jj&rC9eCIu1?>&DP^>jQ#O~{XeA+WW<4%iPn;z;lDS*WdAjjiNw+DJ&km{k31PR=mqCj?=`HWe;a4w87frOAO52AtCxW)&LSjvwhIgJDr!O#s8l^A zucP+51iNAxsz%PCr!|dBG_+^eu_IcFvw}{jR7Ie+BpS6P{ZRo&p!PBw!*LO6i#DTP zPE)XH<$4Q8%WciYE(|x@oAD%|xZN2o-o6 z>b^2>{}WW|kE6D#8uPFLb>F0+9;Zm=4s}wv7PW%2sDW#7BVI#gVD2y{wTn?Jeg}2k zA=HXbp^ENn@A2EHf$pO+5is1bC2GrqJv64!n2P0i1U1tsY0hI;gwgbmqqgQ2@=mg+ zn2qicPHmK+R{A^o;S-F&XPAKzjK(dt06Aozp^Dt|H;wr;!bUpPz8vAvv3sCpJfsN1qRvNnSBkY4! zI0+k&#ak-NXZ!4JOvGAD!KRtcuU!T?(@3hV+G~yX ze69MtQ|yPzt3h*`bYJ*l3m1Pqde2%gZ(i=KC3y?x&zPN?KWlN`LbW6FIbE65rj5(( zPISe_B@Kv=aVNOlEyiWWWaTc)%jcSy;jb>qO>)J#W8-4@=(>SP17a%+-FtlhZ~UF% F{{oU%y*&T` diff --git a/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW.Big5/LC_MESSAGES/mediagoblin.po index 41d97d9c..5a47ef7c 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: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: Chinese (Taiwan) (Big5) (http://www.transifex.com/projects/p/mediagoblin/language/zh_TW.Big5/)\n" "MIME-Version: 1.0\n" @@ -306,7 +306,7 @@ msgstr "" msgid "This field is required for public clients" msgstr "" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "" @@ -741,14 +741,6 @@ msgstr "" msgid "Delete" msgstr "" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "" - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -913,12 +905,12 @@ msgid "" msgstr "" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" msgstr "" @@ -978,26 +970,26 @@ msgstr "" msgid "Could not read the image file." msgstr "" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" msgstr "" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" msgstr "" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    If you're sure" " the address is correct, maybe the page you're looking for has been moved or" diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo index 846b8f70278a2a407b557f69ca006134ac425419..13346b7ce50ce101b598eaa15b84800c42b0280c 100644 GIT binary patch delta 4332 zcmZA22~btn9mnzWL=c0JH zKj%K~S9`1~kMHBy_6H3=_xS6}-?vd}egAW>voZZ>euM+?0VZOfhmDznbMaB!gFUbc zqp<-!_$GG3x3LA^$7H~K)V-4pcnh# zVB}GghU8=xpc2VMVwm;V5qDruEJ8hB>)yYN-H2~)a1qIkyEqO%!CBa&n=x}R6I1Xs zYJxwZCjJ~_@Bu2Z4n$Y+VlW*bDDt97YpW{ew_jG!1qaddGx0o* z!f$XJ4ki6Ncmh}8R-%l=PjD>8uq++QG#ro1a1)lJ66(f5(cvA9?2^eqEhH1Q@a=u5 zKj+UB(V;y%hKx0DpjPllRH<4}CI2g`4B4%h2J8MU}2EYGv_!sHADAiJw7@%XHg6MOAnM zYO8W^HJ(9@^L3{lIwT`eB}_-HU>hp%UM$8Vs0xf^nJR5EYQ=N;&~s~0E8c{fuh8v3 zfeLgURf(If?;>07GaqpAEH`?4IS2SED$||=o!2f6N73GZs!Rn_zY^E=ddHLMXh)!DR>)ontLQW&y7L_nvD!M3$ZIM#?SCY z2DN1ykS|SBg3GWTnZjqfj&~-Wh26RF6l$VXr~w<@`z5G^j=1eQ*K??GmtEg={WJ1H znXgfadsCh9!%*$97_0YxA{PoYAA8_SI0&=Ri?yi0@1V}Y@30qoIH9b-#Gxi!;JO6$ zd?sokYutVxcA=e%8g~ds6W`q8LO#G2+`>Ec3T94nO8FjYYresOIFb{~n`h>sp4*6V z7)B))G1*ypU+hgg9hKk^n>ikwfg)V0L*x2VG%{iO5Xb^t0--!I&YBGkYd*N-rsc2B;*Yj6VU zb@~_wVie0zMTTQCPDK5;%fcVy+n9hOW;-iiicz!=<6^8rD(N#{xi{L+aUO_4l`*BE=CSZczyLnt_Z?+-d#-_>j zb5uo!%ys%RT?6(1%3>5 zV+9Vz?Wj`M;7YuK!*K)$AOaVno_`i&a2;yJKJ19OuKQ4j`!MnqV(QSu4_O!QUA{8- zkIv7x3vPboA#ZeYqBk*hLeluap2Y7ONhuSO#s)7YzUPVd4iBBW)>eKZP>}qu=+(<- zzOrJ?>a0L>m(dS-Lx*=-4Z(1EMPT2U{(+?nx(B`-GdehL>`y#VR^h?crlWzzl$W|& z^}DUp2ine*SOt~VuG;W{ec{sLnkUA2I)%y`LnRe$d(MSVp9s!-JjWAjAF8*ikMqgY z&Vzy0@%5cr8w$gX`F35Eb-XZGojS@h)IMEeSLNB2jaFl^v6{fqleY>((=UuzEU&bJO0lc`b;)LIQY?Bk`uqRH1uBLB74YnR*3lv!6# z29~7F7;6WLNWHb8$l8@1t~+n6y%pA}LIQq&MQG!MGvSkm!lw=d@1>1u7iDE%Bxs=1 z^!>i{zf?zcG7K!rIA`)=su_ z>d4wUS{HupWO#q+|E0m*)~4oANu5?uP{Bkk{u~X-4}{K^T6w40B0Jx2AI;ZekCxPh z{k#6VKTc7C)6#Pzd|Fs-lfARp_8%j!(9uE?Y`vaKMwY)YboqjH%-`BjU|%@ETr}G% zvx(&9Xr0Wlj~^v$sQRjP_VE9XvCGbpKK(@1dUNVnidA1|=U=CXStyNFd~PtATURcG zE(bVPoDw_l5F^9YXPhOlk3>e8tAfM*?$1FBRER{ delta 4022 zcma*pdr*|u8OQOnpg=^tLj=^Wauanc7x98ozzbSI0VNl$RSB$sB8%*58j`S?8cf<4 zqr4^!j+U4Vwqvc@Y}Dw$)G?-zPHSq@#>U3WM6u3j8WTHdWje9nAMZQUf6D-$bKX7g zbDr~@^S;n~!1d)@uHcms170(HUFK&DKLaAw``_1{7-PoL{Q|#((L;>Mz{!}0t8oRO1YlIzmHY&H} z7>=tj5!WC?O%sx%c^Q>Z8#0$Uf)8OAK8)R{@mKpl4;piq#z-zaz=1fD&UB2&#aN0< zunlwY1}Z=TvncRnjK&;PVg(q13vmJ#qbBy@M0^o--!Y71esh|}IJ|&Oco(y9W2_zM zXGm_Q1Nk=Z@k6n1?P}hHeLG9JEG*qeTNnLzR32A8KV87>_G)I{Hytb_f;s9aLf`k=)Gt53~O&`KQhY zS8);j+c*WYN&7imhZpe*K8YuoWirOIoN2fabvT=FChoca7QKwaaUZGz zM^Kdwq2iqh($It-q5|GQ1$ux=Ada+E;!Mu1FfzqXv3`7EH%hEXPiK9*3v(zxhlnu48_4mc~F#V!3ND9kq8aVK}~y18^@! zVLPhCzd)Ut)2KxMfNs2ryjo2pvn%clR6=u5<5poL`Z1^g&(P3QuoE?KKTg8a_$c<` zVw}yz`S=3Pz#hy;J&UuU0Jq_D_$<2EFPf$q7vUjn#jnweEgtI6c`&yNQ~#j)@qJcL^DyQqqEI-Z?M{WYM63v=*K zxW~oG&#)`e!3k5~vq+BSbIikGS@vlzMOAD)M&UN(cC!PuMLY2>zKMLB-P!h`J%?Jz zH$fUy*G%9wmdKsOIGuh?jy*v;D)ZwQfnBK6e+~!ZRmVFxg8qG{KbRo;JRW(OnpCGh z7d5WP=?B-)P~eToqD>>t!?%&enw!YMH>25by$|M~Dz*%D-xH{b);j$6W?c*^l3 zEXNW|~rF`Q>e0drB;Yw$YWLLdJA5xbO+a8k83>v253f&Gsw zYFsZS;G=WxQa7Mhz7yl|1S-KlVo)o&NMjt{K;DujoFlFQsg54UX*iVYvmJ|2EBZdF zLiJ9+)%m;w73Vl=?>jLDe~Wr*{+!1;Rl2XZpacfx+bc>(4J<+>xYFsbM+FL?#y6w( zdOzxV2sOS7HSzCIrN4lQcp2;QzSFNM2->B3p}>Bw+ff0oq7t}+Kfyj!z!n}2RbU5d z<@-?Mk2-du7W5%%+~=qSzec^nqvqRjVla>Xs2~l!TFbEm_oL3h`~~(OmCdOBo0yE} z9q(ZY{m~2g2Ni2j37&F1gKqlW$hkGQ948do{ne<$9eka}<1~JS%5>l&+eFljnT{KA z0{sp=fIXOo8_0eaSiOuE&z^*?*KypjLhpBXrJFm)L(~JgAay!*JY< z3^1>uO1TeJ+QW_?peDS6N%$4!U~G~7com_}NEvGH8&L6fpyF6KSkKvE8aj=qa4LR+ z$}pmse?YO&u?ba?BToO82%HdwEW7;XJE=Ye%?WMb$a)1Pu# z&9QOT4`&`7vcUILeVwnO%Du@~<*f^4&zj;&F08Hdx(j`cn<@gP_cw3cIK931==Q(A z)!F;gonLmgo5Dt4eIV45+Z=9r632zc%@Forb diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po index 0dd3f1be..4a722732 100644 --- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po @@ -5,12 +5,13 @@ # Translators: # , 2011. # Harry Chen , 2011-2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" -"POT-Creation-Date: 2012-12-07 12:45-0600\n" -"PO-Revision-Date: 2012-12-07 18:41+0000\n" +"POT-Creation-Date: 2012-12-20 09:18-0600\n" +"PO-Revision-Date: 2012-12-20 15:14+0000\n" "Last-Translator: cwebber \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -193,7 +194,7 @@ msgstr "您正在修改別人的媒體，請小心操作。" #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "您加上了附件「%s」！" #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -308,7 +309,7 @@ msgstr "此應用程式的重定向 URI，本欄位在公開類型的 OAuth clie msgid "This field is required for public clients" msgstr "本欄位在公開類型的 OAuth client 為必填" -#: mediagoblin/plugins/oauth/views.py:59 +#: mediagoblin/plugins/oauth/views.py:60 msgid "The client {0} has been registered!" msgstr "OAuth client {0} 註冊完成！" @@ -340,11 +341,11 @@ msgstr "MediaGoblin 標誌" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "%(user_name)s 的帳號" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "登出" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -379,15 +380,15 @@ msgstr "以 AGPL #: mediagoblin/templates/mediagoblin/error.html:24 msgid "Image of goblin stressing out" -msgstr "" +msgstr "滿臉問號的哥布林" #: mediagoblin/templates/mediagoblin/root.html:25 msgid "Actions" -msgstr "" +msgstr "動作" #: mediagoblin/templates/mediagoblin/root.html:31 msgid "Create new collection" -msgstr "" +msgstr "新增新的蒐藏" #: mediagoblin/templates/mediagoblin/root.html:34 msgid "Change account settings" @@ -432,7 +433,7 @@ msgid "" "Create an account at this site\n" " or\n" " Set up MediaGoblin on your own server" -msgstr "在這個網站上建立帳號\n 或是\n 在自己的伺服器上建立 MedaiGoblin" +msgstr "在這個網站上建立帳號\n 或是\n 在自己的伺服器上建立 MediaGoblin" #: mediagoblin/templates/mediagoblin/root.html:67 msgid "Most recent media" @@ -652,43 +653,43 @@ msgstr " %(media_title)s 的照片" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:112 msgid "Toggle Rotate" -msgstr "" +msgstr "切換旋轉" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:113 msgid "Perspective" -msgstr "" +msgstr "視角" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:116 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:117 msgid "Front" -msgstr "" +msgstr "正面" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:120 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:121 msgid "Top" -msgstr "" +msgstr "頂面" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:124 #: mediagoblin/templates/mediagoblin/media_displays/stl.html:125 msgid "Side" -msgstr "" +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" -msgstr "" +msgstr "下載模型" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:146 msgid "File Format" -msgstr "" +msgstr "檔案格式" #: mediagoblin/templates/mediagoblin/media_displays/stl.html:148 msgid "Object Height" -msgstr "" +msgstr "物件高度" #: mediagoblin/templates/mediagoblin/media_displays/video.html:40 msgid "" @@ -743,14 +744,6 @@ msgstr "編輯" msgid "Delete" msgstr "刪除" -#: mediagoblin/templates/mediagoblin/user_pages/collection.html:59 -#, python-format -msgid "" -"

    \n" -" %(collection_description)s\n" -"

    " -msgstr "

    \n %(collection_description)s\n

    " - #: mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html:30 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30 #, python-format @@ -821,7 +814,7 @@ msgstr "

    加入日期

    \n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "將媒體加入蒐藏" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -915,14 +908,14 @@ msgid "" msgstr "此處是您的媒體會出現的地方，但是似乎還沒有加入任何東西。" #: mediagoblin/templates/mediagoblin/user_pages/user.html:157 -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:86 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70 msgid "There doesn't seem to be any media here yet..." msgstr "那裡好像還沒有任何的媒體…" -#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:51 +#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr " (移除)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -980,31 +973,31 @@ msgstr "標籤" msgid "Could not read the image file." msgstr "無法讀取圖片檔案。" -#: mediagoblin/tools/response.py:29 +#: mediagoblin/tools/response.py:30 msgid "Oops!" msgstr "糟糕！" -#: mediagoblin/tools/response.py:30 +#: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "發生錯誤" -#: mediagoblin/tools/response.py:44 +#: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "操作不允許" -#: mediagoblin/tools/response.py:45 +#: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

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

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

    如果您確定這個網址是正確的，您在尋找的頁面可能已經移動或是被刪除了。" #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" From 231a06f2d05f351459c5ae0496bb9c3dab74be91 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 09:27:56 -0600 Subject: [PATCH 135/140] Updating AUTHORS with new contributors. Nice job new contributors! :) --- AUTHORS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AUTHORS b/AUTHORS index 9205fc02..64956ad4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,7 @@ variety of different ways and this software wouldn't exist without them. Thank you! * Aaron Williamson +* Aeva Ntsc * Alejandro Villanueva * Aleksandar Micovic * Alex Camelio @@ -17,12 +18,15 @@ Thank you! * Chris Moylan * Christopher Allan Webber * Daniel Neel +* Duncan Paterson * Deb Nicholson * Elrond of Samba TNG +* Emily O'Leary * Jakob Kramer * Jef van Schendel * Joar Wandborg * Karen Rustad +* Kuno Woudt * Mark Holmquist * Matt Lee * Nathan Yergler From 1f01df1dfc891e900e659db84ef840138b60d160 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 09:48:47 -0600 Subject: [PATCH 136/140] 0.3.2 release notes --- docs/source/siteadmin/relnotes.rst | 59 +++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 3e09078e..ef164cbb 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -25,10 +25,18 @@ carefully, or at least skim over it. This will be the last release that is capable of converting from an earlier MongoDB-based MediaGoblin instance to the newer SQL-based system. +**Do this to upgrade** + +1. Make sure to run ``bin/gmg dbuptdate`` after upgrading. + **New features** -* TO BE FILLED IN BEFORE RELEASE :-) +* **3d model support!** + + You can now upload STL and OBJ files and display them in + MediaGoblin. Requires a recent-ish Blender; for details see: + :ref:`deploying-chapter` * **trim_whitespace** @@ -37,6 +45,55 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. See :ref:`core-plugin-section` for plugin documentation +* **A new API!** + + It isn't well documented yet but we do have an API. There is an + `android application in progress `_ + which makes use of it, and there are some demo applications between + `automgtic `_, an + automatic media uploader for your desktop + and `OMGMG `_, an example of + a web application hooking up to the API. + + This is a plugin, so you have to enable it in your mediagoblin + config file by adding a section under [plugins] like:: + + [plugins] + [[mediagoblin.plugins.api]] + + Note that the API works but is not nailed down... the way it is + called may change in future releases. + +* **OAuth login support** + + For applications that use OAuth to connect to the API. + + This is a plugin, so you have to enable it in your mediagoblin + config file by adding a section under [plugins] like:: + + [plugins] + [[mediagoblin.plugins.oauth]] + +* **Collections** + + We now have user-curated collections support. These are arbitrary + galleries that are customizable by users. You can add media to + these by clicking on the paperclip icon when logged in and looking + at a media entry. + +* **OpenStreetMap licensing display improvements** + + More accurate display of OSM licensing, and less disruptive: you + click to "expand" the display of said licensing. + + Geolocation is also now on by default. + +* **Miscelaneous visual improvements** + + We've made a number of small visual improvements including newer and + nicer looking thumbnails and improved checkbox placement. + + 0.3.1 ===== From 7d7def651063b9c5fadc826feaebfa530d31c99d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 10:11:34 -0600 Subject: [PATCH 137/140] Committing present MediaGoblin translations before pushing extracted messages --- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po index 6484f6c7..2cfe7f61 100644 --- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po +++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: GNU MediaGoblin\n" "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n" "POT-Creation-Date: 2012-12-20 09:18-0600\n" -"PO-Revision-Date: 2012-12-20 15:14+0000\n" -"Last-Translator: cwebber \n" +"PO-Revision-Date: 2012-12-20 16:04+0000\n" +"Last-Translator: velmont \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" @@ -192,7 +192,7 @@ msgstr "Trå varsamt, du endrar nokon andre sine verk." #: mediagoblin/edit/views.py:156 #, python-format msgid "You added the attachment %s!" -msgstr "" +msgstr "La til vedlegg %s." #: mediagoblin/edit/views.py:181 msgid "You are editing a user's profile. Proceed with caution." @@ -339,11 +339,11 @@ msgstr "MediaGoblin" #: mediagoblin/templates/mediagoblin/base.html:54 #, python-format msgid "%(user_name)s's account" -msgstr "" +msgstr "%(user_name)s sin konto" #: mediagoblin/templates/mediagoblin/base.html:60 msgid "log out" -msgstr "" +msgstr "Logg ut" #: mediagoblin/templates/mediagoblin/base.html:62 #: mediagoblin/templates/mediagoblin/root.html:28 @@ -378,15 +378,15 @@ msgstr "Lisensiert med Lagt til\n

    %(date)s

    " #: mediagoblin/templates/mediagoblin/user_pages/media.html:202 msgid "Add media to collection" -msgstr "" +msgstr "Legg til verk til samling" #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:35 #, python-format @@ -913,7 +913,7 @@ msgstr "Ser ikkje ut til at det finst nokon verk her nett no." #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49 msgid "(remove)" -msgstr "" +msgstr "(fjern)" #: mediagoblin/templates/mediagoblin/utils/collections.html:20 #, python-format @@ -977,25 +977,25 @@ msgstr "Oops." #: mediagoblin/tools/response.py:31 msgid "An error occured" -msgstr "" +msgstr "Noko gjekk gale" #: mediagoblin/tools/response.py:46 msgid "Operation not allowed" -msgstr "" +msgstr "Ulovleg operasjon" #: mediagoblin/tools/response.py:47 msgid "" "Sorry Dave, I can't let you do that!

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

    \n

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

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

    \n

    Dersom du er sikker på at adressa finst, so er ho truleg flytta eller sletta." #: mediagoblin/user_pages/forms.py:28 msgid "I am sure I want to delete this" From 6a9f537e6c72ef7b0400a8ac7b2dd3ccddeffea9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 10:11:54 -0600 Subject: [PATCH 138/140] Committing extracted and compiled translations --- .../i18n/en/LC_MESSAGES/mediagoblin.po | 2 +- .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo | Bin 20990 -> 20935 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po index 17f38425..3ac01f5a 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: 2012-12-20 09:18-0600\n" +"POT-Creation-Date: 2012-12-20 10:11-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo index cc6621150adc5fe67670668ca31501c735569c53..206c906c3c92c0646d2a49efe4c04f2824bcd9b2 100644 GIT binary patch delta 2388 zcmX}sZEO@p7{KwlLR%<>@=~DX%_+)T3fDqQDQ%%G6ev)6X+b_{G+SE5^%xs5yh5pk*oQ2pvRHywa2(!13HdG-UcJhw zN(NRjARESl2N|4A{|IixPp}&QMOnCdr6L)n>H|0682Znk1pER@KqijHew38=pw#|V zoP;M3nZ zcHljf1ez%0C~V8nkkf3($=HdqfQfPxacsf?lnu^e3UAs!UFpHQA&FdrDAX5L_CJ& zcnYOLpW-b17Uga{3>?!k@_t5@(vVA1juO#)luVmZ0_jGHxF02uLnsSh0*yu7KedoX1p_tMhdWU+xDbrrMES5Dq68FP<7e86 zhv;{rYqEz5M%EqDfekI3aMqXS*Lq4w-EX5a5D)1Wi z;M*vX7jE#+az1v^UyChx1o^d5-{4*>Zuc+UL6o1iODLcB??Jz4qrcC}jnw~T9&BMi zeqg@9UHAwKaOWof_CJRb*in>9oeIoh5&a>QM21oB%1vB|f1t)WoBafvF`s@4 zuVe8Rf8No+D;XNSJa~XH?B42U@;T0?e;egeg|_);KLzFYpbn)XE-u3TC>ec>JMl}D z&+aLrm5Q~Z+@19p!Wb4}MVy9|#0?xksYC|l@*T+C7=LVTeO*I!ZDlq8iaHF}Te8D3 zlCEWVw$q@~rj@Xho^G-uv1HgzL=3AXnlNHkc(osV=!6|Htz2kQUcqkglUTSHcw9~TFmKoJ{%5)63 z&rW8`TNjLud$DwGUF(Is%vQ%W;=0X9n~OEm;zm-(;_*IHTZWD>K){Z)yo&jj*Vx|L zv5acYk9v(wRjJiQO{vvw{W|3g52Yif9v%#)CneQLf3Q-o;b?1kXdrD$QNntgOlOP< z!xe+tB^A%mhGm($+v$%Rj?_7(leUhrd+zyc!_|3_vzuAPu=c-bW@Nb#QGX(QrSjU`-fv36~l(rata>6c>lSOXH0Nl3g&e0iRc zyVzcwSJq|80_iGQ$FV)r;ds>!JC(b&sUkGF!wAkl!YWZc&kg5hcI?Z~@384*-`l?H EKO1blpa1{> delta 1995 zcmXZce@xVM9LMqZaU2K)m;y&2@&#qd=mZb>jlv}%zoaO@x%>y=0_@-v4zaa3vrSWL zY2Rx7K&P>6(rRwsW|)%x(PH(7bN#T~Xwep}re$l5Rb$xm-S^my$LI6;-uL_YykDQs z_hu#>OB0Usi!tG!9U?ahMOKT*^ahbNIE(91ydpJFh-nx^Hy*-ecnY~)-o-dPhd0nd zK612Jgh$CV-j8?iEH}6}iumY%QX)zJKTt|VVi`y`kHl7mb&4~Lq~k?Q#4j-w=g@@< z$f{)#tMGv`k#*RIC3pgt;|wO?cc?S`g!ka>NdF(qrSB-WOIuqmVJTpsngN}#FLGfF zv*^EujrbuJ;S%bD3oC?TM9NU_t4GafC+dRzn2b+iG(L^-cmOr~V|Xu4R)j@X(zwh( z9$rU%&;sfNcTpdhRB2a|f|>MlFby}Mf$gZ3ji7%2b>t(b_?LkNPHYU* z(8#vo3fzJEfB@=N3}H1MK%HP3_uw4PVH+3w(YuLl!Et26<#RM}33ZFIH;aU@19d@P zU>1hwX=KuHa`x10)P+=`E}%6szBA%}jA8s0)M(#AP3$!4890ac;m4>6eT}Q|7HXl( zYHd@H`@>?;&_j}k>F7nRv>A0FgQzQh7IlH+s0*7y-J;J>--mBdlluWz<2>rwi01I? z^$gVe)}n5K7ZaFYDrw{}P>;K@54D1?BICcIzF5f*+6(fbR@#oo(T_Uu0_ve!L|s7A z7JJ--T1YYKcs*(oeq7G{vX_QNc@Q#onkMpR7{DFE_Vw>$Bs9ZGYH=`C9Ko_1wO<pT3I&HMjqXwZu3i2iqdL;4 z?HL&kJ=Gluj`XY#4)t0e6y0&84EYCw`~3NY=H=8G%RtxKgz4s&j0s`Y)@ZihLRnr3!ZOeEF?M+XDJt{!6` z*yFciE9)Fizfo_sRK4spJ(=0o-?>T!CP(5j6L-ZT}BR CdMh9R From f822ab0de96eb4527f2244a745d38e29c1c9e532 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 11:16:29 -0600 Subject: [PATCH 139/140] NOW RELEASING: MediaGoblin 0.3.2! :D --- mediagoblin/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py index 94ab9f1a..9b7ea279 100644 --- a/mediagoblin/_version.py +++ b/mediagoblin/_version.py @@ -23,4 +23,4 @@ # see http://www.python.org/dev/peps/pep-0386/ -__version__ = "0.3.2.dev" +__version__ = "0.3.2" From 5c99cd01a70f2d597ac7669e8d944ddf79b05281 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 20 Dec 2012 13:54:03 -0600 Subject: [PATCH 140/140] Fixing tyop'ed "dbupdate" --- docs/source/siteadmin/relnotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index ef164cbb..25d4d83f 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -27,7 +27,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. **Do this to upgrade** -1. Make sure to run ``bin/gmg dbuptdate`` after upgrading. +1. Make sure to run ``bin/gmg dbupdate`` after upgrading. **New features**