From 9d8e6519628aed45ef474977dcf60b07cae4ce6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Thu, 2 Aug 2012 10:13:13 +0200 Subject: [PATCH 01/19] Now you can restart the server from the browser, this is neccesary for the translation became effectives --- rosetta/templates/rosetta/base.html | 13 +++++ .../templates/rosetta/confirm_restart.html | 17 +++++++ rosetta/urls.py | 1 + rosetta/views.py | 48 ++++++++++++++++++- 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 rosetta/templates/rosetta/confirm_restart.html diff --git a/rosetta/templates/rosetta/base.html b/rosetta/templates/rosetta/base.html index 19fe7a08..56111dce 100644 --- a/rosetta/templates/rosetta/base.html +++ b/rosetta/templates/rosetta/base.html @@ -1,3 +1,4 @@ +{% load i18n %} @@ -26,9 +27,21 @@

Rosetta

+ {% block header-tools %} +
+

+ {% trans "Restart web server" %} / +

+
+ {% endblock %} {% endblock %}
{% block breadcumbs %}{% endblock %}
+ {% if messages %} + + {% endif %}
{% block main %}{% endblock %}
diff --git a/rosetta/templates/rosetta/confirm_restart.html b/rosetta/templates/rosetta/confirm_restart.html new file mode 100644 index 00000000..0d05b08e --- /dev/null +++ b/rosetta/templates/rosetta/confirm_restart.html @@ -0,0 +1,17 @@ +{% extends "rosetta/base.html" %} +{% load i18n %} + +{% block breadcumbs %} +
{% trans "Home" %} › {% trans "Restart server" %}
+{% endblock %} + +{% block main %} +
+

{% trans "Are you sure you want to restart web server?" %}

+
+
+ +
+
+
+{% endblock %} diff --git a/rosetta/urls.py b/rosetta/urls.py index b701b694..587d85b4 100644 --- a/rosetta/urls.py +++ b/rosetta/urls.py @@ -4,5 +4,6 @@ url(r'^$', 'home', name='rosetta-home'), url(r'^pick/$', 'list_languages', name='rosetta-pick-file'), url(r'^download/$', 'download_file', name='rosetta-download-file'), + url(r'^restart/$', 'restart_server', name='rosetta-restart-server'), url(r'^select/(?P[\w\-]+)/(?P\d+)/$', 'lang_sel', name='rosetta-language-selection'), ) diff --git a/rosetta/views.py b/rosetta/views.py index b23238ec..070165ff 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -6,6 +6,7 @@ from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.encoding import smart_unicode, iri_to_uri +from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from django.views.decorators.cache import never_cache from rosetta.conf import settings as rosetta_settings @@ -335,6 +336,52 @@ def get_app_name(path): return app +def restart_server(request): + """ + Restart web server + """ + if request.method == 'POST': + ## No RedHAT or similars + # os.system('sleep 5 && sudo apache2ctl restart &') + ## For RedHAT CentOS ..., see install for set the correct sudoers + # os.system('sleep 5 && sudo /usr/sbin/apachectl restart &') + ## For FastCGI with supervisord control + #os.system('sleep 5 && bin/restart_django.sh & ') + do_restart(request, noresponse=True) + return HttpResponseRedirect(reverse('rosetta-home')) + ADMIN_MEDIA_PREFIX = settings.ADMIN_MEDIA_PREFIX + return render_to_response('rosetta/confirm_restart.html', locals(), context_instance=RequestContext(request)) + +restart_server = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(restart_server) +restart_server = never_cache(restart_server) + + +def do_restart(request, noresponse=False): + """ + * "test" for a django instance (this do a touch over settings.py for reload) + * "apache" + * "httpd" + * "wsgi" + * "restart_script " + """ + reload_method = getattr(settings, 'AUTO_RELOAD_METHOD', getattr(rosetta_settings, 'AUTO_RELOAD_METHOD', 'test')) + if reload_method == 'test': + os.system('sleep 2 && touch settings.py &') + ## No RedHAT or similars + elif reload_method == 'apache2': + os.system('sleep 2 && sudo apache2ctl restart &') + ## RedHAT, CentOS + elif reload_method == 'httpd': + os.system('sleep 2 && sudo service httpd restart &') + elif reload_method.startswith('restart_script'): + script = reload_method.split(" ", 1)[1] + os.system("sleep 2 && %s &" % script) + request.user.message_set.create(message=ugettext("Server restarted. Wait 10 seconds before checking translation")) + if noresponse: + return + return HttpResponseRedirect(request.environ['HTTP_REFERER']) + + def lang_sel(request, langid, idx): """ Selects a file to be translated @@ -388,4 +435,3 @@ def can_translate(user): return translators in user.groups.all() except Group.DoesNotExist: return False - From b2ae6eda105481933cf8d03270c778ef9732f17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Thu, 2 Aug 2012 10:26:54 +0200 Subject: [PATCH 02/19] Clean the code --- rosetta/templates/rosetta/base.html | 13 ++++++------- rosetta/templates/rosetta/css/rosetta.css | 5 ++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/rosetta/templates/rosetta/base.html b/rosetta/templates/rosetta/base.html index 56111dce..f621c931 100644 --- a/rosetta/templates/rosetta/base.html +++ b/rosetta/templates/rosetta/base.html @@ -27,13 +27,12 @@ - {% block header-tools %} - - {% endblock %} + {% endblock %}
{% block breadcumbs %}{% endblock %}
diff --git a/rosetta/templates/rosetta/css/rosetta.css b/rosetta/templates/rosetta/css/rosetta.css index 763ac450..19f83311 100644 --- a/rosetta/templates/rosetta/css/rosetta.css +++ b/rosetta/templates/rosetta/css/rosetta.css @@ -1,4 +1,6 @@ +#user-tools { padding-bottom: 0px;} #user-tools p span { margin-left:2em; } +#rosetta-tools { float: right; font-size: 11px; padding-right: 10px;} table{width:100%;} td.translation label {font-size: 95%;} td.translation textarea, td.original { font-size:110%;} @@ -33,4 +35,5 @@ div.module {margin-bottom: 20px;} #toolbar { height:20px} #toolbar #translate-all { float:right} #toolbar form { float:left; } -#changelist table thead th { padding: 2px 5px; } \ No newline at end of file +#changelist table thead th { padding: 2px 5px; } + From 560d357d1e40b1d91c07d9ec73a752926402565c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Thu, 2 Aug 2012 13:59:30 +0200 Subject: [PATCH 03/19] Now you can update a catalogs from the browser. You have a form, you will have to indicate the catalog (in your server), the catalog to update the first, and the priority --- rosetta/forms.py | 77 +++++++++++++++++++ rosetta/poutil.py | 55 +++++++++++++ rosetta/templates/rosetta/base.html | 1 + rosetta/templates/rosetta/pofile.html | 3 +- .../rosetta/update_confirmation.html | 54 +++++++++++++ rosetta/templates/rosetta/update_file.html | 23 ++++++ rosetta/urls.py | 3 + rosetta/views.py | 74 ++++++++++++++++-- 8 files changed, 283 insertions(+), 7 deletions(-) create mode 100644 rosetta/forms.py create mode 100644 rosetta/templates/rosetta/update_confirmation.html create mode 100644 rosetta/templates/rosetta/update_file.html diff --git a/rosetta/forms.py b/rosetta/forms.py new file mode 100644 index 00000000..82e0ec1e --- /dev/null +++ b/rosetta/forms.py @@ -0,0 +1,77 @@ +import tempfile +from os import path + +from django import forms +from django.conf import settings +from django.forms.util import ErrorList +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ + +from rosetta import polib, poutil + + +PO_PROJECT_BASE = 'po_project_base' + + +class UpdatePoForm(forms.Form): + file = forms.FileField(label=_('File .po')) + priority = forms.BooleanField(label=_('Priority'), + required=False, + help_text=_('If you check it, your file overwrite the translations, in te other case only will create new entries')) + + def __init__(self, pofile=None, pofilepath=None, *args, **kwargs): + super(UpdatePoForm, self).__init__(*args, **kwargs) + self.fields['priority'].is_checkbox = True + self.data_file = None + self.pofile = pofile + self.pofilepath = pofilepath + if not pofile: + pofiles_choices = [('', '-----')] + for language in settings.LANGUAGES: + pos = poutil.find_pos(language[0], project_apps=True, django_apps=True, third_party_apps=True) + for po in pos: + pofiles_choices.append(tuple((path.realpath(po), + "%s %s" % (poutil.get_app_name(po), ugettext(language[1]))))) + + self.fields['pofile'] = forms.ChoiceField(choices=pofiles_choices, required=False) + self.fields.keyOrder = ['pofile', 'file', 'priority'] + + def clean(self): + cleaned_data = super(UpdatePoForm, self).clean() + if not self.pofilepath: + self.pofilepath = cleaned_data['pofile'] + if not self.pofile: + self.pofile = polib.pofile(self.pofilepath) + if not self.errors and not self.pofile: + try: + tmp_file, po_tmp, po_dest_file = self._get_files_to_merge() + tmp_file.close() + except IOError: + file_error = self._errors.get('file', ErrorList([])) + file_error_new = ErrorList([u'Information incompatible for find the destination file']) + file_error.extend(file_error_new) + self._errors['file'] = ErrorList(file_error) + return cleaned_data + + def save_temporal_file(self): + tmp_file, po_tmp, po_dest_file = self._get_files_to_merge() + return po_tmp, po_dest_file, self.cleaned_data['priority'] + + def _get_files_to_merge(self): + # Write the user file in a temporal file + temporal_filepath = tempfile.NamedTemporaryFile().name + tmp_file = open(temporal_filepath, "w") + + if self.data_file is None: + self.data_file = self.cleaned_data['file'].read() + tmp_file.write(self.data_file) + tmp_file.flush() + po_tmp = polib.pofile(temporal_filepath) + return (tmp_file, po_tmp, self.pofile) + + def __unicode__(self): + try: + from formadmin.forms import as_django_admin + return as_django_admin(self) + except ImportError: + return super(UpdatePoForm, self).__unicode__() diff --git a/rosetta/poutil.py b/rosetta/poutil.py index dc1483b7..89f32dbd 100644 --- a/rosetta/poutil.py +++ b/rosetta/poutil.py @@ -4,11 +4,15 @@ from rosetta.conf import settings as rosetta_settings from django.core.cache import cache +from rosetta import polib + try: set except NameError: from sets import Set as set # Python 2.3 fallback +FUZZY = 'fuzzy' + def find_pos(lang, project_apps=True, django_apps=False, third_party_apps=False): """ @@ -119,3 +123,54 @@ def pagination_range(first,last,current): pass prev = e return r + + +def priority_merge(po_destination, po_source, priority=False): + for entry in po_source: + e = po_destination.find(entry.msgid) + if e: + if (not e.translated() or priority) and entry.translated(): + # entry found, we update if it isn't translated + e.occurrences = entry.occurrences + e.comment = entry.comment + e.msgstr = entry.msgstr + e.msgstr_plural = entry.msgstr_plural + if FUZZY in e.flags: + e.flags.remove(FUZZY) + else: + # entry is not in the po file, we must add it + # entry is created with msgid, occurrences and comment + new_entry = polib.POEntry(msgid=entry.msgid, + occurrences=entry.occurrences, + comment=entry.comment, + msgstr=entry.msgstr, + msgstr_plural=entry.msgstr_plural) + po_destination.append(new_entry) + po_destination.save() + + +def get_differences(po_destination, po_source, priority=False): + l_changes = [] + l_news = [] + for entry_source in po_source: + entry_destination = po_destination.find(entry_source.msgid) + item = {} + if entry_destination: + if entry_source.translated() and not entry_destination.translated(): + item['entry_source'] = entry_source + item['entry_destination'] = "" + elif priority: + if entry_destination.msgstr != entry_source.msgstr or \ + entry_destination.msgstr_plural != entry_source.msgstr_plural: + item['entry_source'] = entry_source + item['entry_destination'] = entry_destination + l_changes.append(item) + else: + item['entry_source'] = entry_source + l_news.append(item) + return l_news, l_changes + + +def get_app_name(path): + app = path.split("/locale")[0].split("/")[-1] + return app diff --git a/rosetta/templates/rosetta/base.html b/rosetta/templates/rosetta/base.html index f621c931..7750141f 100644 --- a/rosetta/templates/rosetta/base.html +++ b/rosetta/templates/rosetta/base.html @@ -30,6 +30,7 @@

Rosetta

diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html index dde5eeff..308ef6c0 100644 --- a/rosetta/templates/rosetta/pofile.html +++ b/rosetta/templates/rosetta/pofile.html @@ -6,7 +6,8 @@ + {% block extrahead %}{% endblock %}
diff --git a/rosetta/templates/rosetta/css/rosetta.css b/rosetta/templates/rosetta/css/rosetta.css index 19f83311..4c0b69a5 100644 --- a/rosetta/templates/rosetta/css/rosetta.css +++ b/rosetta/templates/rosetta/css/rosetta.css @@ -36,4 +36,9 @@ div.module {margin-bottom: 20px;} #toolbar #translate-all { float:right} #toolbar form { float:left; } #changelist table thead th { padding: 2px 5px; } - +.fuzzy { background:#FFFFB0 none repeat scroll 0 0;} +.novalid { background:#FFB0B0 none repeat scroll 0 0;} +.hide { display: none; } +.ajax-notify { color: green; margin-left: 10px; } +.ajax-error { color: red; } +pre { display: inline; } diff --git a/rosetta/templates/rosetta/inc.invalid_message.html b/rosetta/templates/rosetta/inc.invalid_message.html new file mode 100644 index 00000000..00846dad --- /dev/null +++ b/rosetta/templates/rosetta/inc.invalid_message.html @@ -0,0 +1,39 @@ +{% load i18n %} + +{% if not message.is_valid %} +

+ {% trans + {% trans "There is a more prioritary catalog" %} +

+

+ + {% if translation_plural %} +

    + {% for k, msgstr in message.valid_entry.msgstr_plural.items|dictsort:"0" %} +
  • + + {{ message.valid_entry.msgstr }} +
    • + {% endfor %} +
+ {% else %} + {{ message.valid_entry.msgstr }} + {% endif %} + + {% trans {% trans "Updated!" %} + + + {% trans {% trans "Error updating" %} + +

+

+ {% if translation_plural %} + {% trans "Update prioritary catalog with the text from the input boxes?" %} + {% else %} + {% trans "Update prioritary catalog with the text from the input box?" %} + {% endif %} + + + +

+{% endif %} \ No newline at end of file diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html index 308ef6c0..65e6b6a8 100644 --- a/rosetta/templates/rosetta/pofile.html +++ b/rosetta/templates/rosetta/pofile.html @@ -1,6 +1,98 @@ {% extends "rosetta/base.html" %} {% load rosetta i18n %} +{% block extrahead %} + {{ block.super }} + +{% endblock %} + + {% block header %} {{block.super}}
@@ -73,7 +165,7 @@

{% blocktrans %}Translate into {{rosetta_i18n_lang_name}}{% endblocktrans % {% for message in rosetta_messages %} - + {% if message.msgid_plural %}
@@ -95,6 +187,9 @@

{% blocktrans %}Translate into {{rosetta_i18n_lang_name}}{% endblocktrans % {% endfor %} + {% with 1 as translation_plural %} + {% include "rosetta/inc.invalid_message.html" %} + {% endwith %} {% else %} @@ -111,6 +206,7 @@

{% blocktrans %}Translate into {{rosetta_i18n_lang_name}}{% endblocktrans % {% if ENABLE_TRANSLATION_SUGGESTIONS %}{% trans "suggest" %}{% endif %} + {% include "rosetta/inc.invalid_message.html" %} {% endif %} diff --git a/rosetta/urls.py b/rosetta/urls.py index 966996a6..e8b6b452 100644 --- a/rosetta/urls.py +++ b/rosetta/urls.py @@ -8,5 +8,7 @@ url(r'^update/catalogue/$', 'update_catalogue', name='rosetta-update-catalogue'), url(r'^update/current/catalogue/$', 'update_current_catalogue', name='rosetta-current-update-catalogue'), url(r'^update/confirmation/$', 'update_confirmation', name='rosetta-confirmation-file'), + url(r'^change/catalogue/$', 'change_catalogue', name='rosetta-change-catalogue'), url(r'^select/(?P[\w\-]+)/(?P\d+)/$', 'lang_sel', name='rosetta-language-selection'), + url(r'^ajax/update/translation/$', 'ajax_update_translation', name='rosetta-ajax-update-translation'), ) diff --git a/rosetta/views.py b/rosetta/views.py index 98c71d48..b3b62742 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -2,9 +2,11 @@ from django.contrib.auth.decorators import user_passes_test from django.core.paginator import Paginator from django.core.urlresolvers import reverse +from django.contrib.admin.util import unquote from django.http import Http404, HttpResponseRedirect, HttpResponse from django.shortcuts import render_to_response from django.template import RequestContext +from django.utils import simplejson from django.utils.encoding import smart_unicode, iri_to_uri from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ @@ -12,7 +14,8 @@ from rosetta.conf import settings as rosetta_settings from rosetta.forms import UpdatePoForm from rosetta.polib import pofile -from rosetta.poutil import find_pos, pagination_range, get_app_name, get_differences, priority_merge +from rosetta.poutil import (find_pos, pagination_range, get_app_name, + get_differences, priority_merge, validate_format) from rosetta.signals import entry_changed, post_save from rosetta.storage import get_storage import re @@ -210,6 +213,7 @@ def fix_nls(in_, out_): return HttpResponseRedirect(reverse('rosetta-home') + iri_to_uri(query_arg)) rosetta_messages = paginator.page(page).object_list + rosetta_messages = search_msg_id_in_other_pos(rosetta_messages, rosetta_i18n_lang_code, rosetta_i18n_pofile) if rosetta_settings.MAIN_LANGUAGE and rosetta_settings.MAIN_LANGUAGE != rosetta_i18n_lang_code: main_language = None @@ -489,6 +493,104 @@ def lang_sel(request, langid, idx): lang_sel = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(lang_sel) +def change_catalogue(request): + new_catalog = request.GET.get('catalog', None) + if not new_catalog: + return HttpResponseRedirect(reverse('rosetta-home')) + reload_catalog_in_storage(request, file_path=unquote(new_catalog)) + entry_id = request.GET.get('entry_id', None) + if entry_id: + query_arg = '?query=%s' % entry_id + else: + query_arg = '' + return HttpResponseRedirect(reverse('rosetta-home') + query_arg) +change_catalogue = never_cache(change_catalogue) +change_catalogue = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(change_catalogue) + + +def ajax_update_translation(request): + + def fix_nls(in_, out_): + """Fixes submitted translations by filtering carriage returns and pairing + newlines at the begging and end of the translated string with the original + """ + if 0 == len(in_) or 0 == len(out_): + return out_ + + if "\r" in out_ and "\r" not in in_: + out_ = out_.replace("\r", '') + + if "\n" == in_[0] and "\n" != out_[0]: + out_ = "\n" + out_ + elif "\n" != in_[0] and "\n" == out_[0]: + out_ = out_.lstrip() + if "\n" == in_[-1] and "\n" != out_[-1]: + out_ = out_ + "\n" + elif "\n" != in_[-1] and "\n" == out_[-1]: + out_ = out_.rstrip() + return out_ + catalog = request.GET.get('catalog', None) + translation = request.GET.get('translation', None) + if not translation: + translation = {} + for key, value in request.GET.items(): + if key.startswith('translation_'): + translation[key.replace('translation_', '')] = value + msgid = request.GET.get('msgid', None) + try: + po_file = pofile(catalog) + entry = po_file.find(msgid) + except: + po_file = None + entry = None + if not catalog or not translation or not msgid\ + or not po_file or not entry: + raise Http404 + + saved = False + if isinstance(translation, dict): + for key, item in translation.items(): + entry.msgstr_plural[key] = fix_nls(entry.msgid_plural, item) + else: + entry.msgstr = fix_nls(entry.msgid, translation) + if 'fuzzy' in entry.flags: + entry.flags.remove('fuzzy') + transhette_i18n_write = request.session.get('transhette_i18n_write', True) + format_errors = validate_format(po_file) + if transhette_i18n_write and not format_errors: + try: + po_file.metadata['Last-Translator'] = unicodedata.normalize('NFKD', u"%s %s <%s>" % (request.user.first_name, + request.user.last_name, + request.user.email)).encode('ascii', 'ignore') + po_file.metadata['X-Translated-Using'] = str("django-rosetta %s" % rosetta.get_version(False)) + po_file.metadata['PO-Revision-Date'] = datetime.datetime.now().strftime('%Y-%m-%d %H:%M%z') + except UnicodeDecodeError: + pass + try: + po_file.save() + po_file.save_as_mofile(po_file.fpath.replace('.po', '.mo')) + saved = True + except: + pass + + json_dict = simplejson.dumps({'saved': saved, + 'translation': translation}) + return HttpResponse(json_dict, mimetype='text/javascript') + + +def reload_catalog_in_storage(request, file_path=None): + """ Reload rosetta catalog in storage """ + storage = get_storage(request) + if file_path is None: + file_path = storage.get("rosetta_i18n_fn") + po = pofile(file_path) + for i in range(len(po)): + po[i].id = i + storage.set('rosetta_i18n_fn', file_path) + storage.set('rosetta_i18n_pofile', po) + storage.set('rosetta_i18n_mtime', os.stat(file_path)[-2]) + + def can_translate(user): if not getattr(settings, 'ROSETTA_REQUIRES_AUTH', True): return True @@ -503,3 +605,26 @@ def can_translate(user): return translators in user.groups.all() except Group.DoesNotExist: return False + + +def search_msg_id_in_other_pos(msg_list, lang, pofile_path): + pofile_paths = find_pos(lang, project_apps=True, django_apps=True, third_party_apps=True) + pofiles = [] + for path in pofile_paths: + pofiles.append(pofile(path)) + for msg in msg_list: + for p in pofiles: + valid_entry = None + valid_catalog = p + if p.fpath == pofile_path.fpath: + is_valid = True + break + entry = p.find(msg.msgid) + if entry: + is_valid = False + valid_entry = entry + break + msg.is_valid = is_valid + msg.valid_catalog = valid_catalog + msg.valid_entry = valid_entry + return msg_list From 4c4dd27356507072509cc3a1ebf1665c1f2c3863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Fri, 3 Aug 2012 12:34:44 +0200 Subject: [PATCH 06/19] A little changes, before we use a old code without storage in some places of the code --- rosetta/forms.py | 20 ++++++++++---------- rosetta/views.py | 28 +++++++++++++++------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/rosetta/forms.py b/rosetta/forms.py index 82e0ec1e..8d9cd1b6 100644 --- a/rosetta/forms.py +++ b/rosetta/forms.py @@ -19,13 +19,13 @@ class UpdatePoForm(forms.Form): required=False, help_text=_('If you check it, your file overwrite the translations, in te other case only will create new entries')) - def __init__(self, pofile=None, pofilepath=None, *args, **kwargs): + def __init__(self, po_file=None, po_file_path=None, *args, **kwargs): super(UpdatePoForm, self).__init__(*args, **kwargs) self.fields['priority'].is_checkbox = True self.data_file = None - self.pofile = pofile - self.pofilepath = pofilepath - if not pofile: + self.po_file = po_file + self.po_file_path = po_file_path + if not po_file: pofiles_choices = [('', '-----')] for language in settings.LANGUAGES: pos = poutil.find_pos(language[0], project_apps=True, django_apps=True, third_party_apps=True) @@ -38,11 +38,11 @@ def __init__(self, pofile=None, pofilepath=None, *args, **kwargs): def clean(self): cleaned_data = super(UpdatePoForm, self).clean() - if not self.pofilepath: - self.pofilepath = cleaned_data['pofile'] - if not self.pofile: - self.pofile = polib.pofile(self.pofilepath) - if not self.errors and not self.pofile: + if not self.po_file_path: + self.po_file_path = cleaned_data['pofile'] + if not self.po_file: + self.po_file = polib.pofile(self.po_file_path) + if not self.errors and not self.po_file: try: tmp_file, po_tmp, po_dest_file = self._get_files_to_merge() tmp_file.close() @@ -67,7 +67,7 @@ def _get_files_to_merge(self): tmp_file.write(self.data_file) tmp_file.flush() po_tmp = polib.pofile(temporal_filepath) - return (tmp_file, po_tmp, self.pofile) + return (tmp_file, po_tmp, self.po_file) def __unicode__(self): try: diff --git a/rosetta/views.py b/rosetta/views.py index b3b62742..f40e0769 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -383,12 +383,13 @@ def do_restart(request, noresponse=False): def update_current_catalogue(request): - pofile = request.session.get('rosetta_i18n_pofile', None) - pofilepath = request.session.get('rosetta_i18n_fn', None) - if not pofile or pofilepath: + storage = get_storage(request) + po_file_path = storage.get('rosetta_i18n_fn', None) + po_file = storage.get('rosetta_i18n_pofile', None) or pofile(po_file_path) + if not po_file or not po_file_path: request.user.message_set.create(message=ugettext("There is not a current catalogue")) return HttpResponseRedirect(reverse('rosetta-pick-file')) - return _update_catalogue(request, pofile, pofilepath) + return _update_catalogue(request, po_file, po_file_path) update_current_catalogue = never_cache(update_current_catalogue) update_current_catalogue = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(update_current_catalogue) @@ -399,23 +400,23 @@ def update_catalogue(request): update_catalogue = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(update_catalogue) -def _update_catalogue(request, pofile=None, pofilepath=None): +def _update_catalogue(request, po_file=None, po_file_path=None): + storage = get_storage(request) data = None files = None if request.method == 'POST': data = request.POST files = request.FILES - form = UpdatePoForm(pofile=pofile, pofilepath=pofilepath, data=data, files=files) + form = UpdatePoForm(po_file=po_file, po_file_path=po_file_path, data=data, files=files) if form.is_valid(): po_tmp, po_destination, priority = form.save_temporal_file() - request.session['rosetta_update_confirmation'] = { + storage.set('rosetta_update_confirmation', { 'path_source': po_tmp.fpath, 'path_destination': po_destination.fpath, 'priority': priority, - } + }) return HttpResponseRedirect(reverse('rosetta.views.update_confirmation')) if pofile: - storage = get_storage(request) rosetta_i18n_lang_name = _(storage.get('rosetta_i18n_lang_name')) rosetta_i18n_lang_code = storage.get('rosetta_i18n_lang_code') rosetta_i18n_fn = storage.get('rosetta_i18n_fn') @@ -427,7 +428,8 @@ def _update_catalogue(request, pofile=None, pofilepath=None): def update_confirmation(request): - up_conf = request.session.get('rosetta_update_confirmation') + storage = get_storage(request) + up_conf = storage.get('rosetta_update_confirmation') priority = up_conf['priority'] path_source = up_conf['path_source'] po_source = pofile(path_source) @@ -480,7 +482,6 @@ def lang_sel(request, langid, idx): entry.msgstr.encode("utf8") + (entry.msgctxt and entry.msgctxt.encode("utf8") or "") ).hexdigest() - storage.set('rosetta_i18n_pofile', po) try: os.utime(file_, None) @@ -510,6 +511,7 @@ def change_catalogue(request): def ajax_update_translation(request): + storage = get_storage(request) def fix_nls(in_, out_): """Fixes submitted translations by filtering carriage returns and pairing newlines at the begging and end of the translated string with the original @@ -555,9 +557,9 @@ def fix_nls(in_, out_): entry.msgstr = fix_nls(entry.msgid, translation) if 'fuzzy' in entry.flags: entry.flags.remove('fuzzy') - transhette_i18n_write = request.session.get('transhette_i18n_write', True) + rosetta_i18n_write = storage.get('rosetta_i18n_write', True) format_errors = validate_format(po_file) - if transhette_i18n_write and not format_errors: + if rosetta_i18n_write and not format_errors: try: po_file.metadata['Last-Translator'] = unicodedata.normalize('NFKD', u"%s %s <%s>" % (request.user.first_name, request.user.last_name, From 51d96e5e3c1a910ecbe3cbd843fc7691e25e4d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Fri, 3 Aug 2012 13:43:53 +0200 Subject: [PATCH 07/19] Links in the pofile view, to change to easy way to the other languages --- rosetta/templates/rosetta/pofile.html | 5 +++-- rosetta/views.py | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html index 65e6b6a8..966fb5ff 100644 --- a/rosetta/templates/rosetta/pofile.html +++ b/rosetta/templates/rosetta/pofile.html @@ -230,8 +230,9 @@

{% blocktrans %}Translate into {{rosetta_i18n_lang_name}}{% endblocktrans % {% endif %} - - + {% for lid, language, position in languages_to_catalogue %} + {% trans "Continue in" %} {{ language }} + {% endfor %} {% if needs_pagination %} {% trans "Skip to page:" %} {% for i in page_range %} diff --git a/rosetta/views.py b/rosetta/views.py index f40e0769..5ce61169 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -248,7 +248,26 @@ def fix_nls(in_, out_): if storage.has('rosetta_last_save_error'): storage.delete('rosetta_last_save_error') rosetta_last_save_error = True - + rosetta_i18n_catalog_filter = storage.get('rosetta_i18n_catalog_filter', 'project') + third_party_apps = rosetta_i18n_catalog_filter in ('all', 'third-party') + django_apps = rosetta_i18n_catalog_filter in ('all', 'django') + project_apps = rosetta_i18n_catalog_filter in ('all', 'project') + languages_to_catalogue = [] + for language in settings.LANGUAGES: + if rosetta_i18n_lang_code == language[0]: + continue + pos = find_pos(language[0], project_apps=project_apps, django_apps=django_apps, third_party_apps=third_party_apps) + position = None + for i in xrange(len(pos)): + pos_split = pos[i].split(os.path.sep) + try: + if pos_split[-5] == rosetta_i18n_app and rosetta_i18n_fn.split(os.path.sep)[-1] == pos_split[-1]: + position = i + break + except IndexError: + pass + if position is not None: + languages_to_catalogue.append((language[0], _(language[1]), position)) return render_to_response('rosetta/pofile.html', locals(), context_instance=RequestContext(request)) else: return list_languages(request, do_session_warn=True) From 56a86e30073e328062ba087157fdf42c5d7e5a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Fri, 3 Aug 2012 13:54:40 +0200 Subject: [PATCH 08/19] Update a translation in Spanish "Vellosos solo" O_o I'm sorry, if this is a word in latin America --- rosetta/locale/es/LC_MESSAGES/django.mo | Bin 2683 -> 2686 bytes rosetta/locale/es/LC_MESSAGES/django.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rosetta/locale/es/LC_MESSAGES/django.mo b/rosetta/locale/es/LC_MESSAGES/django.mo index 28b4091dff54326f645ac2a74bc2f0997f76ac1d..58c66bada84eda3653091ed87fff3d70b389ba78 100644 GIT binary patch delta 196 zcmew@@=s(#2xGk<0|Ns;2Ll5WkX8iJY(QECNQ(ezZ6FOq3=UAfCzKxtq zNS6ZXQkg`(85%;LnN&Egy>OaLPe7g_)S delta 193 zcmew-@>^s>2xC1T0|Ns;2Ll5Wkd_0|Y(QEONQ(ez4Im9f47O0d8}VVDNF#x$rdaC diff --git a/rosetta/locale/es/LC_MESSAGES/django.po b/rosetta/locale/es/LC_MESSAGES/django.po index bd1fdeb7..643804a8 100644 --- a/rosetta/locale/es/LC_MESSAGES/django.po +++ b/rosetta/locale/es/LC_MESSAGES/django.po @@ -117,7 +117,7 @@ msgstr "Traducidos sólo" #: templates/rosetta/pofile.html:34 msgid "Fuzzy only" -msgstr "Vellosos sólo" +msgstr "Sin revisar sólo" #: templates/rosetta/pofile.html:35 msgid "All" From 9895b29597ea993ccd14f2e00f14edd3c06a5eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Fri, 3 Aug 2012 14:23:38 +0200 Subject: [PATCH 09/19] New translations --- rosetta/forms.py | 2 +- rosetta/locale/cs/LC_MESSAGES/django.po | 259 +++++++++++++++---- rosetta/locale/de/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/es/LC_MESSAGES/django.mo | Bin 2686 -> 4610 bytes rosetta/locale/es/LC_MESSAGES/django.po | 252 ++++++++++++++++--- rosetta/locale/fr/LC_MESSAGES/django.po | 252 +++++++++++++++---- rosetta/locale/hu/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/it/LC_MESSAGES/django.po | 255 +++++++++++++++---- rosetta/locale/nl/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/pl/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/ru/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/tr/LC_MESSAGES/django.po | 260 ++++++++++++++++---- rosetta/locale/uk/LC_MESSAGES/django.po | 250 ++++++++++++++++--- rosetta/locale/xx/LC_MESSAGES/django.po | 314 +++++++++++++++++++++++- rosetta/templates/rosetta/base.html | 2 +- rosetta/templates/rosetta/pofile.html | 2 +- 16 files changed, 2636 insertions(+), 462 deletions(-) diff --git a/rosetta/forms.py b/rosetta/forms.py index 8d9cd1b6..034b1040 100644 --- a/rosetta/forms.py +++ b/rosetta/forms.py @@ -17,7 +17,7 @@ class UpdatePoForm(forms.Form): file = forms.FileField(label=_('File .po')) priority = forms.BooleanField(label=_('Priority'), required=False, - help_text=_('If you check it, your file overwrite the translations, in te other case only will create new entries')) + help_text=_('If you check it, your file overwrite the translations, in the other case only will create new entries')) def __init__(self, po_file=None, po_file_path=None, *args, **kwargs): super(UpdatePoForm, self).__init__(*args, **kwargs) diff --git a/rosetta/locale/cs/LC_MESSAGES/django.po b/rosetta/locale/cs/LC_MESSAGES/django.po index f4686c55..40454398 100644 --- a/rosetta/locale/cs/LC_MESSAGES/django.po +++ b/rosetta/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -16,47 +16,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.4.RC2\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Výběr jazyka" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Soubor" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Domů" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Výběr jazyka" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Soubor" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "Vše" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "Aplikace" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Hotovo" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Textů" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Přeloženo" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Zastaralé" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Soubor" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Nic k překladu!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -65,109 +173,174 @@ msgstr "" "spuštěn proces překladu katalogů." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." msgstr "" -"Podívejte se prosím do Django dokumentace " -"I18N , kde naleznete podklady pro nastavení Vašeho vícejazyčného projektu." +"Podívejte se prosím do Django dokumentace I18N " +", kde naleznete podklady pro nastavení Vašeho vícejazyčného projektu." + +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Vybrat jiný soubor" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Stáhnout tento katalog" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Hotovo: %(percent_translated)s %" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "Soubor je pouze pro čtení: pro dokončení úprav si soubor stáhněte!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." -msgstr "Některé z Vámi přeložených textových položek nebyly uloženy: důvodem je" -", že Váš kolega Vám provedl pod rukami nějaké úpravy :-)." +msgstr "" +"Některé z Vámi přeložených textových položek nebyly uloženy: důvodem je, že " +"Váš kolega Vám provedl pod rukami nějaké úpravy :-)." -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Překlad do %(rosetta_i18n_lang_name)s " -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Zobrazit:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Pouze nepřeložené" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Pouze přeložené" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "Pouze Fuzzy" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "Vše" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Hledat" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Hledat" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Výskyt(y)" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "navrhnout" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "%(more_count)s více" msgstr[1] "%(more_count)s více" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Uložit a přeložit další část" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Přejít na stránku:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Zobrazeno:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s text" msgstr[1] "%(hits)s/%(message_number)s textů" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Anglicky" diff --git a/rosetta/locale/de/LC_MESSAGES/django.po b/rosetta/locale/de/LC_MESSAGES/django.po index 32a7a1a1..1ebcf81a 100644 --- a/rosetta/locale/de/LC_MESSAGES/django.po +++ b/rosetta/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: Martin Mahner \n" "Language-Team: patrick lauber \n" @@ -18,47 +18,155 @@ msgstr "" "X-Poedit-Language: German\n" "X-Poedit-Country: SWITZERLAND\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Sprachwahl" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Datei" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Home" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Sprachwahl" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Datei" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "Alle" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Fortschritt" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Texte" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Übersetzt" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "Unscharf" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Veraltet" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Datei" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Nichts zu übersetzen!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -67,7 +175,7 @@ msgstr "" "noch keine Übersetzungskataloge generiert." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation7)j9l&2{3&ngCO8NeJ37EvxyIDIa4VyHrn>dLTCo!>8Xb+g@ndkLOX6J3+ zo3Xpi1*srWE|rjaK>}eRfso1p~H4H`}lwV_mB77@topwKi9{&etDZxXJB?aKYYG%hf-(ZGw=ZXEu4j~!FRv|cPe!k zJPhUeID9`m3*QaD44JC>Q04{r0K5j@3a>-H>P3F0;LqV(;LA|f{Tf>MJ9rQLJd0$X zWhm!dZl13~Ij?~4g-^q0;dAglIQ=%IJ_x@6WxZ<{;69$OL0SJDDCay6KMr4lY@z-D zAB3;McftK^vLAM!hO2M}7Etu~F1#E52#P#Eg<_wVq3r*A_#yb$X8iWID|L+LyP=$O z4)RJp1LeGLL0SJjSit8YqNsfw_BcM9foFOC8j}vdSKv|jFZfQ_=7%Nf7!>&yq1a;u ziac9T_PYkt2B$fq#c$pDA9-{COzzj`JgSI1fd?uRz&9z>mUjHse2lV&@m&61K4LpuUB%4%px978QY*wy9WKd3 z@sZd;Y;}-pj;qBbpU>8)>?*bq``_P;2_(eC%ag^$!xu|Wpjpet8MCJlYO$TutA+JpL%Lo|7uyS&Ukg!_pMsmtn^B@ zY;sk*Vpg6)y_-jwo!|A3PfA&s&`zL=>!>Bl-nI`^CCDK z)w0QZC0@crnN4I5b-wmnR2SF;QN@^}GweQfaU=T77FJzMk}?FFCpI38Git>lr^)Ms zMQOE?Svf!0O+;an<3?}s@ZkRGgKq9>bg3w$xBQOm7;S-D&>2hS)nt>or>dK3MP;%<@K;c+J(8!koEhtc z&LgW8_Q^sUtfW?g^H|t~;mz~9qwyg(zDJ0~@l97x9~{__Aolv$TuA4B9M<7$(`H1{%<3x1F4y;*US}ewHbZX|r+HCDUUUCO zt;mC7tIis+?`H7*>dEDU5_9_}9~vF-KdiNJv^w3V9mflb_|LwA!8wb)FOF-kmEu`33}ld;PCSxpj*Rt^dMp3QB*Sgh6?rbxE5-yDaK zgmq)K*jBOZv2P*KD#_4VN?VWG5Si4~D+?#jEu2}@k1k$XUAlN->XIG!P_)j+o=aPg zl)czm^Ibi)a&fJ7QYr|GTBkU+tLHm&^R3R&R_CyuJJRhua9?M>(_v!klHGQ)`FI|a z=H^<5J9=)uJ2yYIY+}(G1&|M2Y6CHpJKye8haOI=YS6av1T$-!wAQTYclGkZg)^5$ z*yGE~4`;6JL+`}Y`K9xV6Lsd=ohd2wBw}lAI6zEE>q8WKmmecJOu(uSUS2!hIy#vr zK}eZuE#`?&v3OS>-EhU!m&QWcv~@XFFKXdhO| z8(ZJr?wgO@cxjOq7fJtK8N8-4K0#}HqIBf8^dpzM#F?ON#+0z_Qo@I#Gj4@Un6Bje8Xf-Sw z?Co+6btd&%dQ2HiSKrv395I=klyW@&3VoNO11d?sG$HeK!wjDCNobj%R>_f2-|M({ zJ@aZQs3lR^^G+9~)Ikh_ff^#D#G) z^)%DEmpUW8wAsn$rar%sSgqi}O|#9fq*q}O`PN-^)JMls)qNISP`&E4Rd*ejz)2gV z3=O8_)LyywW7Et^_OAE6HhVuYsSBfCD;BCkpx&8oTGB-P5dV5Q?O4v*yr$Z8WLq&1 zmL)9rcBv;~EXhzW&7m^BOc>W+M`W&4?I|_ssN4GS&8^yQod6P1qxdI!CWANSg*sE3 zkdhEpyGIB#jgG$?IM+%WCXm!4doM0*&S>jJsyTM78gj2>i1y0zDvT4~ z$2=RH@cJktY$@M3aG@<=jk6r#=0!YJeQINe7h5-<~4)p(}-`)taFZe$z38>OJS@zP`rcT84H z+)wt=$#_}Chy)9^O3aliZkpVC=>OWNt}}HOv(xTaq?D?&>Sl3l;fGC`tp;j+_@`NW zLMlw%$P+`b<+O>t7x`0JRR9U~n~DzdkDEGE#gVaTP Lrn<4);DY)$YXdKJ delta 836 zcmX}q&ubGw6u|Kpn`E1~Y0_A&T9vJ)4Q+`;8>vJT>!G$6PfEpu7$l^jX%hMi5|9)T zt4J$2c-CGNOF`QH0Ukv3RPhg}2agr>8)&t*^=8bD^D} zAEUbgkpcXT+FtGx8OJqD;~utSvQ1<^_TWKGV-PRm2wuSuHZh7z$Y13N>hD%DDbfP!j_Vl4PZ-0`sEO>N2H+4)9FwT)oy2+e zmmCic6L0VqS#P3d>@ukt-@pjoLtSVYyYU%v$vU^|xMjx<+2{sw)Qo#k1505S4k4FZ z)-n6bgq^sJ8hHtIg9UtzEB5_4qR@;l;VHa>8rTDF30%cAzOeHj?fe&{)bb6N@D~!R zERs!2KQk2)m#*d3g)|7w^ax!`c9^bB&xe+pc>GK#l)sRk18usAHqBOB4_zyvjXnQ2 zJ!?n*jr#l&9k8$Xw0`Dx=%0r}49rF_MZac-Lqox_a;0dRp?vp3v)Pa_y?eE4r6E^q zGG3c0n)BfwX3iNj@0@;jx?K0>YhJxjD(1~x`%SYE*@vI z!Oet6XYWpx7tM-0X}-IC+Ye*WfZ6L9G^6p;iHTXS;8hA<{ry_0TrK2HBr$0kosa(l DE^}bY diff --git a/rosetta/locale/es/LC_MESSAGES/django.po b/rosetta/locale/es/LC_MESSAGES/django.po index 643804a8..7fd5f873 100644 --- a/rosetta/locale/es/LC_MESSAGES/django.po +++ b/rosetta/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-11-30 12:12\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -16,47 +16,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.4.RC2\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Selección de idioma" +#: forms.py:17 +msgid "File .po" +msgstr "Archivo .po" + +#: forms.py:18 +msgid "Priority" +msgstr "Prioridad" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" +"Si tu chequeas este campo, tu archivo sobreescribirá las traducciones, en " +"otro caso solo se crearán nuevas entradas" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" +"Servidor reiniciando. Espera 10 segundos antes de comprobar las traducciones" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "No hay un catálogo actual" + +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "Reiniciando el servidor" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "Actualizar un catálogo" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Inicio" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "Reiniciando servidor" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "¿Estas seguro de que quieres reiniciar el servidor web?" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "Si, Estoy seguro" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "Hay un catálogo más prioritario" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "Traducción prioritaria:" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "¡Actualizado!" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "Error actualizando" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" +"¿Actualiza el catálogo prioritario con el texto de la cajas de entrada?" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "¿Actualiza el catálogo prioritario con el texto de la caja de entrada?" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "Si, actualiza" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Selección de idioma" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +msgid "Filter" +msgstr "Filtro" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Progreso" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Mensajes" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Traducido" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "Revisar" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Obsoleto" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Archivo" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "¡Nada que traducir!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -64,7 +174,7 @@ msgstr "" "No has especificado ningún idioma en tu archivo de settings o no has " "generado todavía un batch para traducción de catálogos." -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation para obtener una guía sobre cómo añadir internacionalización " "a tu proyecto." -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "Por favor escriba una traducción en el área de texto" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Selecciona otro archivo" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Descarga este catálogo" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "Actualizar catálogo actual" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Progreso: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "" "El archivo está en modo lectura: ¡Descarga el archivo cuando termines de " "editarlo!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Traducir al %(rosetta_i18n_lang_name)s " -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Pantalla:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Sin traducir sólo" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Traducidos sólo" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "Sin revisar sólo" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Búsqueda" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Ir" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Ocurrencia(s)" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "sugerir" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "%(more_count)s más" msgstr[1] "%(more_count)s más" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Guardar y traducir siguiente bloque" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "Continuar en" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Ir a la página:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Mostrando:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s mensaje" msgstr[1] "%(hits)s/%(message_number)s mensajes" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "Actualiza archivo" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "Actualiza Archivo" + #~ msgid "English" #~ msgstr "Inglés" diff --git a/rosetta/locale/fr/LC_MESSAGES/django.po b/rosetta/locale/fr/LC_MESSAGES/django.po index ac70f70c..58d310a0 100644 --- a/rosetta/locale/fr/LC_MESSAGES/django.po +++ b/rosetta/locale/fr/LC_MESSAGES/django.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-05 15:09+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -16,63 +16,154 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.6.7\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Sélection de la langue" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Fichier" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" + +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:21 +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Accueil" -#: templates/rosetta/languages.html:11 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Sélection de la langue" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 msgid "Filter" msgstr "Filtrer" -#: templates/rosetta/languages.html:12 +#: templates/rosetta/languages.html:15 msgid "Project" msgstr "Projet" -#: templates/rosetta/languages.html:13 +#: templates/rosetta/languages.html:16 msgid "Third party" msgstr "Tiers" -#: templates/rosetta/languages.html:15 templates/rosetta/pofile.html:38 +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 msgid "All" msgstr "Tous" -#: templates/rosetta/languages.html:28 +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "Application" -#: templates/rosetta/languages.html:29 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Progression" -#: templates/rosetta/languages.html:30 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Messages" -#: templates/rosetta/languages.html:31 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Traduits" -#: templates/rosetta/languages.html:32 templates/rosetta/pofile.html:70 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "Flous" -#: templates/rosetta/languages.html:33 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Obsolètes" -#: templates/rosetta/languages.html:34 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Fichier" -#: templates/rosetta/languages.html:57 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Rien à Traduire!" -#: templates/rosetta/languages.html:58 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -82,116 +173,179 @@ msgstr "" "projet." # python-format -#: templates/rosetta/languages.html:59 +#: templates/rosetta/languages.html:62 #, python-format msgid "" -"Please refer to Django's I18N " -"documentation for a guide on how to set up internationalization for your" -" project." +"Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." msgstr "" "Veuillez vous référer à la documentation sur " "l'internationalisation de Django pour un guide sur comment activer et " "configurer la traduction de votre projet." -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Choisir un autre fichier" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Télécharger ce catalogue" -#: templates/rosetta/pofile.html:24 -#, python-format -msgid "Progress: %(percent_translated)s%%" +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 +#, fuzzy +msgid "Progress: %(percent_translated)s%" msgstr "Progression: %(percent_translated)s%%" -#: templates/rosetta/pofile.html:26 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "" "Fichier en seule lecture: télécharger le fichier à la fin de l'édition!" -#: templates/rosetta/pofile.html:27 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" "Certains parmi vos derniers éléments n'ont pas pu être sauvés: ceci arrive " -"généralement quand le catalogue de traductions à été modifié après qu'il ait" -" été chargé." +"généralement quand le catalogue de traductions à été modifié après qu'il ait " +"été chargé." -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Traduire en %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Afficher:" -#: templates/rosetta/pofile.html:35 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Non-traduits uniquement" -#: templates/rosetta/pofile.html:36 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Traduits uniquement" -#: templates/rosetta/pofile.html:37 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "Flous uniquement" -#: templates/rosetta/pofile.html:45 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Recherche" -#: templates/rosetta/pofile.html:47 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Go" -#: templates/rosetta/pofile.html:67 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "Original" -#: templates/rosetta/pofile.html:71 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Occurrences(s)" -#: templates/rosetta/pofile.html:85 templates/rosetta/pofile.html.py:88 -#: templates/rosetta/pofile.html:103 templates/rosetta/pofile.html.py:106 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 msgid "Context hint" msgstr "Indice contextuel" -#: templates/rosetta/pofile.html:113 +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "suggérer" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "%(more_count)s de plus" msgstr[1] "%(more_count)s de plus" -#: templates/rosetta/pofile.html:136 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Sauver et traduire le prochain bloc" -#: templates/rosetta/pofile.html:140 +#: templates/rosetta/pofile.html:234 +#, fuzzy +msgid "Continue in" +msgstr "Indice contextuel" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Passer à la page:" -#: templates/rosetta/pofile.html:153 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Affichés:" -#: templates/rosetta/pofile.html:157 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s message" msgstr[1] " %(hits)s/%(message_number)s messages" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Anglais" diff --git a/rosetta/locale/hu/LC_MESSAGES/django.po b/rosetta/locale/hu/LC_MESSAGES/django.po index ddc1964a..320a4be4 100644 --- a/rosetta/locale/hu/LC_MESSAGES/django.po +++ b/rosetta/locale/hu/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-10-09 19:08+0100\n" "Last-Translator: Gergely Kontra \n" "Language-Team: nomail \n" @@ -15,47 +15,155 @@ msgstr "" "X-Translated-Using: django-rosetta 0.4.RC2\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Nyelvválasztás" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Fájl" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Főoldal" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Nyelvválasztás" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Fájl" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Állapot" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Üzenet" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Lefordítva" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Elavult" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Fájl" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Nincs mit fordítani!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -63,7 +171,7 @@ msgstr "" "Nincs beállítva egyetlen nyelv sem van nem hozott létre egy fordítási " "katalóguskoteget." -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentationDjango I18N dokumentációt!" -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Másik fájl választása" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Katalógus letöltése" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "%(percent_translated)s% kész" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "A fájl írásvédett: töltse le a katalógust, ha végzett!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Fordítsa %(rosetta_i18n_lang_name)s nyelvre" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Szűrés:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Fordításra vár" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Lefordított" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Keresés" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Keress" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Előfordulások" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "ajánl" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, fuzzy, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "még %(more_count)s" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Mentés" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Ugorj erre az oldalra:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Szűrés:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, fuzzy, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s üzenet" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Angol" diff --git a/rosetta/locale/it/LC_MESSAGES/django.po b/rosetta/locale/it/LC_MESSAGES/django.po index 61dc9087..8c2e0dd7 100644 --- a/rosetta/locale/it/LC_MESSAGES/django.po +++ b/rosetta/locale/it/LC_MESSAGES/django.po @@ -7,54 +7,162 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "Last-Translator: Marco Bonetti \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Selezione della lingua" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "File" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Inizio" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Selezione della lingua" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "File" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "Tutti" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "Applicazione" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Progressione" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Messaggio" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Tradotto" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Obsoleto" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "File" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Nulla da tradurre!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -63,7 +171,7 @@ msgstr "" "ancore generato un catalogo iniziale da tradurre." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation per una giuda su come impostare le " "traduzioni per il vostro progetto." -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Scegliere un altro file" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Scaricare il catalogo" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Progressione: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "file in solo lettura: scaricare il file alla fine dell'edizione!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." -msgstr "Alcuni elementi non sono stati salvati: questo capita solitamente quando " -"il catalogo delle traduzioni è stato modificato dopo che voi l'abbiate caricato." +msgstr "" +"Alcuni elementi non sono stati salvati: questo capita solitamente quando il " +"catalogo delle traduzioni è stato modificato dopo che voi l'abbiate caricato." -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Tradurre verso il %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Mostra:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Solo non tradotti" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Solo tradotti" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "Solo fuzzy" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "Tutti" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Cercare" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Via" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "Originale" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Occorrenze" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "suggerire" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "un altro" msgstr[1] "ancora %(more_count)s" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Salvare e tradurre il prossimo blocco" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Passare alla pagina:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Mostrato:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s messaggio" msgstr[1] "%(hits)s/%(message_number)s messaggi" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Inglese" diff --git a/rosetta/locale/nl/LC_MESSAGES/django.po b/rosetta/locale/nl/LC_MESSAGES/django.po index 110aff31..70503153 100644 --- a/rosetta/locale/nl/LC_MESSAGES/django.po +++ b/rosetta/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-06-05 17:06+0200\n" "Last-Translator: Joost Cassee \n" "Language-Team: Joost Cassee \n" @@ -16,47 +16,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Taalselectie" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Bestand" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Voorpagina" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Taalselectie" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Bestand" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Voortgang" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Berichten" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Vertaald" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Niet meer gebruikt" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Bestand" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Niets te vertalen!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -65,7 +173,7 @@ msgstr "" "catalogus gegenereerd." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentationDjango's I18N documentatie (Engels) " "voor meer informatie over internationalisatie." -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Selecteer een ander bestand" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Download deze catalogus" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Voortgang: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "" "Dit is bestand is alleen-lezen; download dit bestand wanneer u klaar bent " "met bewerken!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Vertalen in het %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Beeld:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Alleen onvertaald" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Alleen vertaald" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Zoeken" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Ga" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Gevonden in" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "" msgstr[1] "" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Opslaan en volgende blok vertalen" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Snel naar pagina:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Tonen:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s bericht" msgstr[1] "%(hits)s/%(message_number)s berichten" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Engels" diff --git a/rosetta/locale/pl/LC_MESSAGES/django.po b/rosetta/locale/pl/LC_MESSAGES/django.po index 1a7c4d2f..b2a4a3bd 100644 --- a/rosetta/locale/pl/LC_MESSAGES/django.po +++ b/rosetta/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -16,47 +16,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.4.RC2\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Wybór języka" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Plik" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Początek" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Wybór języka" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Plik" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Postęp" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Komunikaty" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Przetłumaczone" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Przestarzałe" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Plik" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Nie ma nic do przetłumaczenia!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -65,7 +173,7 @@ msgstr "" "jeszcze katalogów do tłumaczeń." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation, aby znaleźć dokumentację na temat internacjonalizacji " "twojego projektu." -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Wybierz inny plik" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Pobierz ten katalog" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Postęp: %(percent_translated)s %" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "Plik jest tylko do odczytu: pobierz go kiedy skończysz edytować" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Przetłumacz na %(rosetta_i18n_lang_name)s " -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Wyświetl:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Tylko nieprzetłumaczone" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Tylko przetłumaczone" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Szukaj" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Idź" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Wystąpienie(a)" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "sugeruj" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "%(more_count)s więcej" msgstr[1] "%(more_count)s więcej" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Zapisz i tłumacz następny blok" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Przejdź do strony:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Wyświetlanie:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s komunikat" msgstr[1] "%(hits)s/%(message_number)s komunikatów" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Angielski" diff --git a/rosetta/locale/ru/LC_MESSAGES/django.po b/rosetta/locale/ru/LC_MESSAGES/django.po index 53c3311c..1b6b5b57 100644 --- a/rosetta/locale/ru/LC_MESSAGES/django.po +++ b/rosetta/locale/ru/LC_MESSAGES/django.po @@ -7,160 +7,332 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Выбор языка" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Файл" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Начало" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Выбор языка" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Файл" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Обработано" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Сообщений" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "С переводом" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Устаревших" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Файл" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." msgstr "" -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." msgstr "" -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Выбрать другой файл" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Скачать этот каталог" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Обработано: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "" "Файл только для чтения: загрузите файл после завершения редактирования!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Перевод на %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Отображать:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Только без перевода" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Только с переводом" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Поиск" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Вперёд" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Встречается в" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "" msgstr[1] "" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Сохранить и перевести следующий блок" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Перейти к странице:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Отображение:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s сообщение" msgstr[1] "%(hits)s/%(message_number)s сообщений" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Английский" diff --git a/rosetta/locale/tr/LC_MESSAGES/django.po b/rosetta/locale/tr/LC_MESSAGES/django.po index 8204401e..3653dea3 100644 --- a/rosetta/locale/tr/LC_MESSAGES/django.po +++ b/rosetta/locale/tr/LC_MESSAGES/django.po @@ -7,59 +7,167 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-11 15:45+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: RECEP KIRMIZI \n" "Language-Team: \n" -"Language: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Turkish \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: \n" "X-Poedit-Country: \n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Dil seçimi" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Dosya" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" + +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Ana Sayfa" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Dil seçimi" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Dosya" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "Hepsi" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "Uygulama" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "İlerleme" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Mesaj" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Çevrildi" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "Belirsiz" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Kullanımda olmayan" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Dosya" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "Çevrilecek birşey yok!" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." @@ -68,34 +176,48 @@ msgstr "" "kataloglarını oluşturmadınız." # python-format -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." msgstr "" -"Projenizdeki çoklu dilde geliştirebilmek için lütfen Django'nun Django'nun I18N dökümantasyonuna başvurun." +"Projenizdeki çoklu dilde geliştirebilmek için lütfen Django'nun Django'nun I18N dökümantasyonuna başvurun." + +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Başka bir dosya alın" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Bu kataloğu bilgisayarınıza indirin" -#: templates/rosetta/pofile.html:21 -#, fuzzy, python-format -msgid "Progress: %(percent_translated)s%%" +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 +#, fuzzy +msgid "Progress: %(percent_translated)s%" msgstr "İlerleme: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "" "Dosya salt-okunur: İşlemleriniz bittikten sonra bilgisayarınıza indirin" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." @@ -103,77 +225,127 @@ msgstr "" "Çeviri bloğunuzdaki bazı öğeler kayıt edilemedi: bu genellikle üzerinde " "çalıştığınız dosyanın sunucu tarafında değişmesi sonucundaortaya çıkar." -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Şuna çevir %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Göster:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Sadece çevirilmemiş" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Sadece çevirilmiş" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "Sadece belirsiz" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "Hepsi" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Arama" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Git" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "Orijinal" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "öneri" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "%(more_count)s daha" msgstr[1] "%(more_count)s daha" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Kaydet ve sonraki bloğu çevir" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Sayfaya geç:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Gösteriliyor:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s mesaj" msgstr[1] "%(hits)s/%(message_number)s mesajlar" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "Oluşum(lar)" #~ msgstr "Gefunden in" diff --git a/rosetta/locale/uk/LC_MESSAGES/django.po b/rosetta/locale/uk/LC_MESSAGES/django.po index f3864d40..8a8cc41d 100644 --- a/rosetta/locale/uk/LC_MESSAGES/django.po +++ b/rosetta/locale/uk/LC_MESSAGES/django.po @@ -7,159 +7,331 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 13:42+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:6 -msgid "Language selection" -msgstr "Вибір мови" +#: forms.py:17 +#, fuzzy +msgid "File .po" +msgstr "Файл" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" -#: templates/rosetta/languages.html:6 templates/rosetta/pofile.html:18 +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Домівка" -#: templates/rosetta/languages.html:17 +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" +msgstr "" + +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" +msgstr "Вибір мови" + +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +#, fuzzy +msgid "Filter" +msgstr "Файл" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 msgid "Application" msgstr "" -#: templates/rosetta/languages.html:18 +#: templates/rosetta/languages.html:32 msgid "Progress" msgstr "Завершено" -#: templates/rosetta/languages.html:19 +#: templates/rosetta/languages.html:33 msgid "Messages" msgstr "Повідомлень" -#: templates/rosetta/languages.html:20 +#: templates/rosetta/languages.html:34 msgid "Translated" msgstr "Перекладено" -#: templates/rosetta/languages.html:21 templates/rosetta/pofile.html:57 +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 msgid "Fuzzy" msgstr "" -#: templates/rosetta/languages.html:22 +#: templates/rosetta/languages.html:36 msgid "Obsolete" msgstr "Застарілих" -#: templates/rosetta/languages.html:23 +#: templates/rosetta/languages.html:37 msgid "File" msgstr "Файл" -#: templates/rosetta/languages.html:44 +#: templates/rosetta/languages.html:60 msgid "Nothing to translate!" msgstr "" -#: templates/rosetta/languages.html:45 +#: templates/rosetta/languages.html:61 msgid "" "You haven't specified any languages in your settings file, or haven't yet " "generated a batch of translation catalogs." msgstr "" -#: templates/rosetta/languages.html:46 +#: templates/rosetta/languages.html:62 #, python-format msgid "" "Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." msgstr "" -#: templates/rosetta/pofile.html:8 +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 msgid "Pick another file" msgstr "Вибрати інший файл" -#: templates/rosetta/pofile.html:9 +#: templates/rosetta/pofile.html:101 msgid "Download this catalog" msgstr "Завантажити цей каталог" -#: templates/rosetta/pofile.html:21 +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 msgid "Progress: %(percent_translated)s%" msgstr "Завершено: %(percent_translated)s%" -#: templates/rosetta/pofile.html:23 +#: templates/rosetta/pofile.html:119 msgid "File is read-only: download the file when done editing!" msgstr "Файл тільки для читання: завантажте файл після завершення редагування!" -#: templates/rosetta/pofile.html:24 +#: templates/rosetta/pofile.html:120 msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" -#: templates/rosetta/pofile.html:28 +#: templates/rosetta/pofile.html:124 #, python-format msgid "Translate into %(rosetta_i18n_lang_name)s" msgstr "Переклад на %(rosetta_i18n_lang_name)s" -#: templates/rosetta/pofile.html:31 +#: templates/rosetta/pofile.html:127 msgid "Display:" msgstr "Відображати:" -#: templates/rosetta/pofile.html:32 +#: templates/rosetta/pofile.html:128 msgid "Untranslated only" msgstr "Тільки неперекладені" -#: templates/rosetta/pofile.html:33 +#: templates/rosetta/pofile.html:129 msgid "Translated only" msgstr "Тільки перекладені" -#: templates/rosetta/pofile.html:34 +#: templates/rosetta/pofile.html:130 msgid "Fuzzy only" msgstr "" -#: templates/rosetta/pofile.html:35 -msgid "All" -msgstr "" - -#: templates/rosetta/pofile.html:42 +#: templates/rosetta/pofile.html:138 msgid "Search" msgstr "Пошук" -#: templates/rosetta/pofile.html:44 +#: templates/rosetta/pofile.html:140 msgid "Go" msgstr "Вперед" -#: templates/rosetta/pofile.html:54 +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 msgid "Original" msgstr "" -#: templates/rosetta/pofile.html:58 +#: templates/rosetta/pofile.html:163 msgid "Occurrences(s)" msgstr "Зустрічається в" -#: templates/rosetta/pofile.html:82 +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 msgid "suggest" msgstr "" -#: templates/rosetta/pofile.html:93 +#: templates/rosetta/pofile.html:220 #, python-format msgid "%(more_count)s more" msgid_plural "%(more_count)s more" msgstr[0] "" msgstr[1] "" -#: templates/rosetta/pofile.html:105 +#: templates/rosetta/pofile.html:232 msgid "Save and translate next block" msgstr "Записати і перекласти наступний блок" -#: templates/rosetta/pofile.html:109 +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 msgid "Skip to page:" msgstr "Перейти до сторінки:" -#: templates/rosetta/pofile.html:122 +#: templates/rosetta/pofile.html:250 msgid "Displaying:" msgstr "Відображення:" -#: templates/rosetta/pofile.html:124 +#: templates/rosetta/pofile.html:254 #, python-format msgid "%(hits)s/%(message_number)s message" msgid_plural "%(hits)s/%(message_number)s messages" msgstr[0] "%(hits)s/%(message_number)s повідомлення" msgstr[1] "%(hits)s/%(message_number)s повідомлень" +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" + #~ msgid "English" #~ msgstr "Англійська" diff --git a/rosetta/locale/xx/LC_MESSAGES/django.po b/rosetta/locale/xx/LC_MESSAGES/django.po index 3ae3af87..0da1fb07 100644 --- a/rosetta/locale/xx/LC_MESSAGES/django.po +++ b/rosetta/locale/xx/LC_MESSAGES/django.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-21 12:21+0200\n" +"POT-Creation-Date: 2012-08-03 14:07+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -16,22 +16,318 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.4.RC2\n" +#: forms.py:17 +msgid "File .po" +msgstr "" + +#: forms.py:18 +msgid "Priority" +msgstr "" + +#: forms.py:20 +msgid "" +"If you check it, your file overwrite the translations, in the other case " +"only will create new entries" +msgstr "" + +#: views.py:398 +msgid "Server restarted. Wait 10 seconds before checking translation" +msgstr "" + +#: views.py:409 +msgid "There is not a current catalogue" +msgstr "" + +#: templates/rosetta/base.html:33 +msgid "Restart web server" +msgstr "" + +#: templates/rosetta/base.html:34 +msgid "Update a catalogue" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 +#: templates/rosetta/pofile.html:114 +#: templates/rosetta/update_confirmation.html:7 +#: templates/rosetta/update_file.html:6 +msgid "Home" +msgstr "" + +#: templates/rosetta/confirm_restart.html:5 +msgid "Restart server" +msgstr "" + +#: templates/rosetta/confirm_restart.html:10 +msgid "Are you sure you want to restart web server?" +msgstr "" + +#: templates/rosetta/confirm_restart.html:13 +msgid "Yes, I'm sure" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:5 +#: templates/rosetta/inc.invalid_message.html:26 +msgid "No" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:6 +msgid "There is a more prioritary catalog" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:9 +msgid "Prioritary translation:" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Yes" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:23 +msgid "Updated!" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:26 +msgid "Error updating" +msgstr "" -msgid "String 1" +#: templates/rosetta/inc.invalid_message.html:31 +msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -msgid "String 2" +#: templates/rosetta/inc.invalid_message.html:33 +msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#. Translators: This is a text of the base template -#: templates/base.html:43 -msgid "String 3 with comment" +#: templates/rosetta/inc.invalid_message.html:37 +msgid "Yes, update" msgstr "" -msgctxt "Context hint" -msgid "String 4" +#: templates/rosetta/languages.html:4 templates/rosetta/languages.html.py:7 +msgid "Language selection" msgstr "" +#: templates/rosetta/languages.html:8 +msgid "" +"Couldn't load the specified language file. This usually happens when using " +"the Encrypted Cookies Session Storage backend on Django 1.4 or higher.
Setting ROSETTA_STORAGE_CLASS = 'rosetta.storage.CacheRosettaStorage' in " +"your settings file should fix this." +msgstr "" + +#: templates/rosetta/languages.html:14 +msgid "Filter" +msgstr "" + +#: templates/rosetta/languages.html:15 +msgid "Project" +msgstr "" + +#: templates/rosetta/languages.html:16 +msgid "Third party" +msgstr "" + +#: templates/rosetta/languages.html:18 templates/rosetta/pofile.html:131 +msgid "All" +msgstr "" + +#: templates/rosetta/languages.html:31 +msgid "Application" +msgstr "" + +#: templates/rosetta/languages.html:32 +msgid "Progress" +msgstr "" + +#: templates/rosetta/languages.html:33 +msgid "Messages" +msgstr "" + +#: templates/rosetta/languages.html:34 +msgid "Translated" +msgstr "" +#: templates/rosetta/languages.html:35 templates/rosetta/pofile.html:162 +msgid "Fuzzy" +msgstr "" +#: templates/rosetta/languages.html:36 +msgid "Obsolete" +msgstr "" + +#: templates/rosetta/languages.html:37 +msgid "File" +msgstr "" +#: templates/rosetta/languages.html:60 +msgid "Nothing to translate!" +msgstr "" + +#: templates/rosetta/languages.html:61 +msgid "" +"You haven't specified any languages in your settings file, or haven't yet " +"generated a batch of translation catalogs." +msgstr "" + +#: templates/rosetta/languages.html:62 +#, python-format +msgid "" +"Please refer to Django's I18N documentation for a guide on how to set up internationalization for your project." +msgstr "" + +#: templates/rosetta/pofile.html:20 +msgid "" +"Warning... There are fuzzy elements that will be translated as suggestion " +"says. Do you want to continue?" +msgstr "" + +#: templates/rosetta/pofile.html:57 +msgid "Please write a translation in the text area" +msgstr "" + +#: templates/rosetta/pofile.html:100 +msgid "Pick another file" +msgstr "" + +#: templates/rosetta/pofile.html:101 +msgid "Download this catalog" +msgstr "" + +#: templates/rosetta/pofile.html:102 +msgid "Update current catalogue" +msgstr "" + +#: templates/rosetta/pofile.html:117 +msgid "Progress: %(percent_translated)s%" +msgstr "" + +#: templates/rosetta/pofile.html:119 +msgid "File is read-only: download the file when done editing!" +msgstr "" + +#: templates/rosetta/pofile.html:120 +msgid "" +"Some items in your last translation block couldn't be saved: this usually " +"happens when the catalog file changes on disk after you last loaded it." +msgstr "" + +#: templates/rosetta/pofile.html:124 +#, python-format +msgid "Translate into %(rosetta_i18n_lang_name)s" +msgstr "" + +#: templates/rosetta/pofile.html:127 +msgid "Display:" +msgstr "" + +#: templates/rosetta/pofile.html:128 +msgid "Untranslated only" +msgstr "" + +#: templates/rosetta/pofile.html:129 +msgid "Translated only" +msgstr "" + +#: templates/rosetta/pofile.html:130 +msgid "Fuzzy only" +msgstr "" + +#: templates/rosetta/pofile.html:138 +msgid "Search" +msgstr "" + +#: templates/rosetta/pofile.html:140 +msgid "Go" +msgstr "" + +#: templates/rosetta/pofile.html:147 +msgid "Suggest All Translations" +msgstr "" + +#: templates/rosetta/pofile.html:159 +msgid "Original" +msgstr "" + +#: templates/rosetta/pofile.html:163 +msgid "Occurrences(s)" +msgstr "" + +#: templates/rosetta/pofile.html:177 templates/rosetta/pofile.html.py:180 +#: templates/rosetta/pofile.html:198 templates/rosetta/pofile.html.py:201 +msgid "Context hint" +msgstr "" + +#: templates/rosetta/pofile.html:208 +msgid "suggest" +msgstr "" + +#: templates/rosetta/pofile.html:220 +#, python-format +msgid "%(more_count)s more" +msgid_plural "%(more_count)s more" +msgstr[0] "" +msgstr[1] "" + +#: templates/rosetta/pofile.html:232 +msgid "Save and translate next block" +msgstr "" + +#: templates/rosetta/pofile.html:234 +msgid "Continue in" +msgstr "" + +#: templates/rosetta/pofile.html:237 +msgid "Skip to page:" +msgstr "" + +#: templates/rosetta/pofile.html:250 +msgid "Displaying:" +msgstr "" + +#: templates/rosetta/pofile.html:254 +#, python-format +msgid "%(hits)s/%(message_number)s message" +msgid_plural "%(hits)s/%(message_number)s messages" +msgstr[0] "" +msgstr[1] "" + +#: templates/rosetta/update_confirmation.html:12 +msgid "Update confirmation" +msgstr "" + +#: templates/rosetta/update_confirmation.html:18 +msgid "No changes with the next file" +msgstr "" + +#: templates/rosetta/update_confirmation.html:21 +msgid "Are you sure you want to update this file?" +msgstr "" + +#: templates/rosetta/update_confirmation.html:23 +msgid "Your action wil have these consequences:" +msgstr "" + +#: templates/rosetta/update_confirmation.html:26 +msgid "News messages created" +msgstr "" + +#: templates/rosetta/update_confirmation.html:35 +msgid "Old messages updated" +msgstr "" + +#: templates/rosetta/update_confirmation.html:39 +msgid "from" +msgstr "" + +#: templates/rosetta/update_confirmation.html:41 +msgid "to" +msgstr "" + +#: templates/rosetta/update_confirmation.html:50 +#: templates/rosetta/update_file.html:11 +msgid "Update file" +msgstr "" + +#: templates/rosetta/update_file.html:20 +msgid "Update File" +msgstr "" diff --git a/rosetta/templates/rosetta/base.html b/rosetta/templates/rosetta/base.html index c0250a80..d4409852 100644 --- a/rosetta/templates/rosetta/base.html +++ b/rosetta/templates/rosetta/base.html @@ -31,7 +31,7 @@

Rosetta

diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html index 966fb5ff..397c3cc6 100644 --- a/rosetta/templates/rosetta/pofile.html +++ b/rosetta/templates/rosetta/pofile.html @@ -99,7 +99,7 @@

{% trans "Pick another file" %} / {% trans "Download this catalog" %} / - {% trans "Update current catalog" %} + {% trans "Update current catalogue" %}

+{% endblock %} + {% block breadcumbs %}
{% trans "Home" %} › {% trans "Restart server" %}
{% endblock %} @@ -8,10 +54,20 @@ {% block main %}

{% trans "Are you sure you want to restart web server?" %}

-
-
- -
+ +
+ +
+ + +
{% endblock %} diff --git a/rosetta/urls.py b/rosetta/urls.py index e8b6b452..c5ca6b12 100644 --- a/rosetta/urls.py +++ b/rosetta/urls.py @@ -11,4 +11,6 @@ url(r'^change/catalogue/$', 'change_catalogue', name='rosetta-change-catalogue'), url(r'^select/(?P[\w\-]+)/(?P\d+)/$', 'lang_sel', name='rosetta-language-selection'), url(r'^ajax/update/translation/$', 'ajax_update_translation', name='rosetta-ajax-update-translation'), + url(r'^ajax/restart/$', 'ajax_restart', name='rosetta-ajax-restart'), + url(r'^ajax/are_you_wakeup/$', 'ajax_is_wakeup', name='rosetta-ajax-is-wakeup'), ) diff --git a/rosetta/views.py b/rosetta/views.py index 5ce61169..7957fee3 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -20,6 +20,7 @@ from rosetta.storage import get_storage import re import rosetta +import subprocess import datetime import unicodedata import hashlib @@ -360,13 +361,7 @@ def restart_server(request): Restart web server """ if request.method == 'POST': - ## No RedHAT or similars - # os.system('sleep 5 && sudo apache2ctl restart &') - ## For RedHAT CentOS ..., see install for set the correct sudoers - # os.system('sleep 5 && sudo /usr/sbin/apachectl restart &') - ## For FastCGI with supervisord control - #os.system('sleep 5 && bin/restart_django.sh & ') - do_restart(request, noresponse=True) + do_restart(request) return HttpResponseRedirect(reverse('rosetta-home')) ADMIN_MEDIA_PREFIX = settings.ADMIN_MEDIA_PREFIX return render_to_response('rosetta/confirm_restart.html', locals(), context_instance=RequestContext(request)) @@ -375,7 +370,7 @@ def restart_server(request): restart_server = never_cache(restart_server) -def do_restart(request, noresponse=False): +def do_restart(request): """ * "test" for a django instance (this do a touch over settings.py for reload) * "apache" @@ -383,19 +378,22 @@ def do_restart(request, noresponse=False): * "wsgi" * "restart_script " """ + if request.is_ajax(): + noresponse = True + else: + noresponse = False reload_method = getattr(settings, 'AUTO_RELOAD_METHOD', getattr(rosetta_settings, 'AUTO_RELOAD_METHOD', 'test')) if reload_method == 'test': - os.system('sleep 2 && touch settings.py &') + script = 'touch settings.py' ## No RedHAT or similars elif reload_method == 'apache2': - os.system('sleep 2 && sudo apache2ctl restart &') + script = 'sudo apache2ctl restart' ## RedHAT, CentOS elif reload_method == 'httpd': - os.system('sleep 2 && sudo service httpd restart &') + script = 'sudo service httpd restart' elif reload_method.startswith('restart_script'): - script = reload_method.split(" ", 1)[1] - os.system("sleep 2 && %s &" % script) - request.user.message_set.create(message=ugettext("Server restarted. Wait 10 seconds before checking translation")) + script = " ".join(reload_method.split(" ")[1:]) + subprocess.call(script.split(" ")) if noresponse: return return HttpResponseRedirect(request.environ['HTTP_REFERER']) @@ -435,7 +433,7 @@ def _update_catalogue(request, po_file=None, po_file_path=None): 'priority': priority, }) return HttpResponseRedirect(reverse('rosetta.views.update_confirmation')) - if pofile: + if po_file: rosetta_i18n_lang_name = _(storage.get('rosetta_i18n_lang_name')) rosetta_i18n_lang_code = storage.get('rosetta_i18n_lang_code') rosetta_i18n_fn = storage.get('rosetta_i18n_fn') @@ -597,6 +595,23 @@ def fix_nls(in_, out_): json_dict = simplejson.dumps({'saved': saved, 'translation': translation}) return HttpResponse(json_dict, mimetype='text/javascript') +ajax_update_translation = never_cache(ajax_update_translation) +ajax_update_translation = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(ajax_update_translation) + + +def ajax_restart(request): + json_dict = simplejson.dumps({'restarting': True}) + do_restart(request) + return HttpResponse(json_dict, mimetype='text/javascript') +ajax_restart = never_cache(ajax_restart) +ajax_restart = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(ajax_restart) + + +def ajax_is_wakeup(request): + json_dict = simplejson.dumps({'wakeup': True}) + return HttpResponse(json_dict, mimetype='text/javascript') +ajax_is_wakeup = never_cache(ajax_is_wakeup) +ajax_is_wakeup = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(ajax_is_wakeup) def reload_catalog_in_storage(request, file_path=None): From 99cf9e1a29dd8005d979b4ff3efe7c2d29a2fde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Mon, 6 Aug 2012 14:39:23 +0200 Subject: [PATCH 11/19] Translations the new features --- rosetta/locale/cs/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/de/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/es/LC_MESSAGES/django.mo | Bin 4610 -> 5919 bytes rosetta/locale/es/LC_MESSAGES/django.po | 62 ++++++++++++------ rosetta/locale/fr/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/hu/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/it/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/nl/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/pl/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/ru/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/tr/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/uk/LC_MESSAGES/django.po | 37 +++++++---- rosetta/locale/xx/LC_MESSAGES/django.po | 37 +++++++---- .../rosetta/update_confirmation.html | 2 +- 14 files changed, 318 insertions(+), 153 deletions(-) diff --git a/rosetta/locale/cs/LC_MESSAGES/django.po b/rosetta/locale/cs/LC_MESSAGES/django.po index 40454398..94faf33f 100644 --- a/rosetta/locale/cs/LC_MESSAGES/django.po +++ b/rosetta/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -31,11 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -47,25 +43,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Domů" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -313,7 +326,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/de/LC_MESSAGES/django.po b/rosetta/locale/de/LC_MESSAGES/django.po index 1ebcf81a..a2bbf307 100644 --- a/rosetta/locale/de/LC_MESSAGES/django.po +++ b/rosetta/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: Martin Mahner \n" "Language-Team: patrick lauber \n" @@ -33,11 +33,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -49,25 +45,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Home" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -316,7 +329,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/es/LC_MESSAGES/django.mo b/rosetta/locale/es/LC_MESSAGES/django.mo index a9eedc1de12868d80d49a80999b23f9174ea22a7..5901eecb43236280c061de3dc66a5dacec1626a8 100644 GIT binary patch delta 2703 zcmZXUOKcTY7{^bcyx#>xMB!9GUZu6X3iSasf}jZ!TQM~xdOCA@@3C`dF7s$X6E3h& zOnku&3yn%J3Nf-Vbt4N1bfLk=(uGl@F~NlagNZD3qTi~B?HC!@LscGZz6E97N!X!OMZM1nKlL34VyYkERQM}Ii@FZw#T(GVo3IJ)n^X%FLD}d4 zya&Efzdl!gei@2@ui!lRJ)8sofN!$DYCz6fZXAbe;6=Cq{to%6@l$G?4x7224<%p+ z6d^m{BG?N>KnBsMs&FxU2hM<>!{hJ^cqi;7%O}`h#hly=FF*}{fvey+eC1TNz*(>Z zit@)GKh?`Y1Xws19)J?~HONnW#Nh$>DSQZCgObpi=`}$cU_}-_!bu8uL)mx);*Poo zpKVa;FSwKIJ*2$?z703SOK=nX8?r>Tqmty*!%&3pgyLj36rlr9;vRys@5{6BzlW0( z+z`utt1q|?CDWTwdSLSG+Vg2J)Yqx|5;9UapOUF14>4%$Q3Isl#C8R+2|OQ9yks~z%Z0RU&58}XSftjp&s(yS}2Zo zKr|==&%hXpkcAbZ^mDQqO5juQE_ew_CO<$4)JTg zC`~6FFJl?=J|<49R_4P@8RC{$-zgXJ{dWMdR2on$mO=8jjdfhLGv)i1Atj|Tmi7weBF$J4wFSac4)$T}pMH9-cA(s|;$Li1?Nb~oq zJrmpJJsJ38uhk;^)uR(XS!P_Shl+&HUrKB|Xk*Qeu}xAFr!FkCwpN!;dUw%NHqGKt zgvC)})70oK<@qSuD>xRktj4sVybig_3Tp1Cx+u zY{Dcksf$A07ewBG_M$BC!xgFSvpO+@*6*x2kR_QRur8W%*@om3&!i@Z3Y9$9 zTQ(5ScgcV@{VDl~zxjSaWPIzRq*Zli1^h~NR}ko)F&T;KA?TP7sTsfn$s~ws#F=sw z`mK6T9QBz#G-08epJ+cC3R`qJuqHuP(Ru^T)wanaO;OnI;!>WZdO9y^)l8l{JbudJ zhE=^{h4FF&h8$9g+Bh+F8|8pP#fzw{PfNzj^qTsb?EDUcR`U5+!IY zWPYT5t69r*7KIWM!`zD|)?{h5iM^s5jD}mL4>fGvo!P-i`Y24y3-vzoqeSf{)sgcd zo|gI?J%x)l(1|M$G#m?3{b0u0#a&^_{r^U}wI!jd-_H1^t&9>~l2>DNN+jCL`B5%u zGsCPW3D`}=A(zyi5Y7XRVfr$u=V& zvnx5Z=*y?eRHxqza`d87InHdK4Wj1i*R!t7kUlPCvB`ZIes%W#hAllAjaKt1wV@wV ZRKByZj^Qs#n%I*jb|&dmNmh__)W0_3L!q_n+m)&QbX8YZ{p(*d^I!7djMCfY zs#Auth&q}2AYsf(>>tL3acS^9GmWdu+gI%rXr-&|)vPVF9&~v)G82 zQ32gRW#|cN{?|Bx_08w_!LT}Gx@k9}7FvTmGRII0oIGvUNPOM09Rm1DOt~rBHE3bZ~(Q?A>4?As0_T1pMOE^=m+Yks)G|fYNAi5qxz0opoRSE z{WhGA|DwjbxE6hE!ds~Kp5Y|?hRRTV6ZzK*3mBz=%eW{L>rgw~fm$HIKk<0ne-V}H z>$nON3??SC2I(?eP&@3y1Go>B*Rk91FMdv?JcX3%5tKBHIO88-oFOWiRdzUnQI$WQxZhMo`>QXMR}Y_`h_2Pl zi@w!di5}ISh>CTKx|4RZ;}vYG!-j6!&t*cp)7|99UX_v8bArxVzICsZJr nVmeJ6ZfI5o)}hzt@1M_lIj1W++w!=4aBL<~8y2%};05M4N~NtL diff --git a/rosetta/locale/es/LC_MESSAGES/django.po b/rosetta/locale/es/LC_MESSAGES/django.po index 7fd5f873..7d7061cd 100644 --- a/rosetta/locale/es/LC_MESSAGES/django.po +++ b/rosetta/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-11-30 12:12\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -32,12 +32,7 @@ msgstr "" "Si tu chequeas este campo, tu archivo sobreescribirá las traducciones, en " "otro caso solo se crearán nuevas entradas" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" -"Servidor reiniciando. Espera 10 segundos antes de comprobar las traducciones" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "No hay un catálogo actual" @@ -49,25 +44,44 @@ msgstr "Reiniciando el servidor" msgid "Update a catalogue" msgstr "Actualizar un catálogo" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Inicio" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "Reiniciando servidor" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "¿Estas seguro de que quieres reiniciar el servidor web?" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "Si, Estoy seguro" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "Por favor espere mientras el servidor está reiniciandose..." + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "¡Servidor reiniciado satisfactoriamente!" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "Volver a la página principal de rosetta" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" +"El servidor está tardando demasiado en responder. Probablemente esté caido, " +"¡por favor compruebelo!" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -221,6 +235,9 @@ msgid "" "Some items in your last translation block couldn't be saved: this usually " "happens when the catalog file changes on disk after you last loaded it." msgstr "" +"Algunos intems en su última traducción en bloque no han podido ser " +"guardados: esto normalmente ocurre cuando el catalogo ha cambiado en disco " +"tras la carga de este." #: templates/rosetta/pofile.html:124 #, python-format @@ -253,7 +270,7 @@ msgstr "Ir" #: templates/rosetta/pofile.html:147 msgid "Suggest All Translations" -msgstr "" +msgstr "Sugerir todas las traducciones" #: templates/rosetta/pofile.html:159 msgid "Original" @@ -304,27 +321,27 @@ msgstr[1] "%(hits)s/%(message_number)s mensajes" #: templates/rosetta/update_confirmation.html:12 msgid "Update confirmation" -msgstr "" +msgstr "Actualizar configuración" #: templates/rosetta/update_confirmation.html:18 msgid "No changes with the next file" -msgstr "" +msgstr "Ningún cambio con el siguiente archivo" #: templates/rosetta/update_confirmation.html:21 msgid "Are you sure you want to update this file?" -msgstr "" +msgstr "¿Estas segudo de que quieres actualizar este archivo?" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" -msgstr "" +msgid "Your action will have these consequences:" +msgstr "Tu acción tendrá las siguientes consecuencias:" #: templates/rosetta/update_confirmation.html:26 msgid "News messages created" -msgstr "" +msgstr "Nuevos mensajes creados" #: templates/rosetta/update_confirmation.html:35 msgid "Old messages updated" -msgstr "" +msgstr "Antiguos mensajes actualizados" #: templates/rosetta/update_confirmation.html:39 msgid "from" @@ -343,6 +360,11 @@ msgstr "Actualiza archivo" msgid "Update File" msgstr "Actualiza Archivo" +#~ msgid "Server restarted. Wait 10 seconds before checking translation" +#~ msgstr "" +#~ "Servidor reiniciando. Espera 10 segundos antes de comprobar las " +#~ "traducciones" + #~ msgid "English" #~ msgstr "Inglés" diff --git a/rosetta/locale/fr/LC_MESSAGES/django.po b/rosetta/locale/fr/LC_MESSAGES/django.po index 58d310a0..111765a0 100644 --- a/rosetta/locale/fr/LC_MESSAGES/django.po +++ b/rosetta/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -31,11 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -47,25 +43,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Accueil" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -318,7 +331,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/hu/LC_MESSAGES/django.po b/rosetta/locale/hu/LC_MESSAGES/django.po index 320a4be4..b746c10c 100644 --- a/rosetta/locale/hu/LC_MESSAGES/django.po +++ b/rosetta/locale/hu/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-10-09 19:08+0100\n" "Last-Translator: Gergely Kontra \n" "Language-Team: nomail \n" @@ -30,11 +30,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -46,25 +42,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Főoldal" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -307,7 +320,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/it/LC_MESSAGES/django.po b/rosetta/locale/it/LC_MESSAGES/django.po index 8c2e0dd7..af598273 100644 --- a/rosetta/locale/it/LC_MESSAGES/django.po +++ b/rosetta/locale/it/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "Last-Translator: Marco Bonetti \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,11 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -45,25 +41,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Inizio" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -312,7 +325,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/nl/LC_MESSAGES/django.po b/rosetta/locale/nl/LC_MESSAGES/django.po index 70503153..914594a2 100644 --- a/rosetta/locale/nl/LC_MESSAGES/django.po +++ b/rosetta/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-06-05 17:06+0200\n" "Last-Translator: Joost Cassee \n" "Language-Team: Joost Cassee \n" @@ -31,11 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -47,25 +43,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Voorpagina" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -313,7 +326,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/pl/LC_MESSAGES/django.po b/rosetta/locale/pl/LC_MESSAGES/django.po index b2a4a3bd..9717ce47 100644 --- a/rosetta/locale/pl/LC_MESSAGES/django.po +++ b/rosetta/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -31,11 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -47,25 +43,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Początek" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -312,7 +325,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/ru/LC_MESSAGES/django.po b/rosetta/locale/ru/LC_MESSAGES/django.po index 1b6b5b57..83d7940b 100644 --- a/rosetta/locale/ru/LC_MESSAGES/django.po +++ b/rosetta/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,11 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -45,25 +41,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Начало" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -305,7 +318,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/tr/LC_MESSAGES/django.po b/rosetta/locale/tr/LC_MESSAGES/django.po index 3653dea3..cc3d5091 100644 --- a/rosetta/locale/tr/LC_MESSAGES/django.po +++ b/rosetta/locale/tr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: RECEP KIRMIZI \n" "Language-Team: \n" @@ -34,11 +34,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -50,25 +46,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Ana Sayfa" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -318,7 +331,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/uk/LC_MESSAGES/django.po b/rosetta/locale/uk/LC_MESSAGES/django.po index 8a8cc41d..adb291f8 100644 --- a/rosetta/locale/uk/LC_MESSAGES/django.po +++ b/rosetta/locale/uk/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,11 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -45,25 +41,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "Домівка" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -304,7 +317,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/locale/xx/LC_MESSAGES/django.po b/rosetta/locale/xx/LC_MESSAGES/django.po index 0da1fb07..342af4f8 100644 --- a/rosetta/locale/xx/LC_MESSAGES/django.po +++ b/rosetta/locale/xx/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 14:07+0200\n" +"POT-Creation-Date: 2012-08-06 14:38+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -30,11 +30,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:398 -msgid "Server restarted. Wait 10 seconds before checking translation" -msgstr "" - -#: views.py:409 +#: views.py:407 msgid "There is not a current catalogue" msgstr "" @@ -46,25 +42,42 @@ msgstr "" msgid "Update a catalogue" msgstr "" -#: templates/rosetta/confirm_restart.html:5 templates/rosetta/languages.html:7 -#: templates/rosetta/pofile.html:114 +#: templates/rosetta/confirm_restart.html:51 +#: templates/rosetta/languages.html:7 templates/rosetta/pofile.html:114 #: templates/rosetta/update_confirmation.html:7 #: templates/rosetta/update_file.html:6 msgid "Home" msgstr "" -#: templates/rosetta/confirm_restart.html:5 +#: templates/rosetta/confirm_restart.html:51 msgid "Restart server" msgstr "" -#: templates/rosetta/confirm_restart.html:10 +#: templates/rosetta/confirm_restart.html:56 msgid "Are you sure you want to restart web server?" msgstr "" -#: templates/rosetta/confirm_restart.html:13 +#: templates/rosetta/confirm_restart.html:59 msgid "Yes, I'm sure" msgstr "" +#: templates/rosetta/confirm_restart.html:62 +msgid "Please wait while the server is restarting..." +msgstr "" + +#: templates/rosetta/confirm_restart.html:65 +msgid "Server restarted successfully!" +msgstr "" + +#: templates/rosetta/confirm_restart.html:66 +msgid "Return to rosetta home page" +msgstr "" + +#: templates/rosetta/confirm_restart.html:69 +msgid "" +"The server is taking to long to respond. Probably it is down, please check!" +msgstr "" + #: templates/rosetta/inc.invalid_message.html:5 #: templates/rosetta/inc.invalid_message.html:26 msgid "No" @@ -304,7 +317,7 @@ msgid "Are you sure you want to update this file?" msgstr "" #: templates/rosetta/update_confirmation.html:23 -msgid "Your action wil have these consequences:" +msgid "Your action will have these consequences:" msgstr "" #: templates/rosetta/update_confirmation.html:26 diff --git a/rosetta/templates/rosetta/update_confirmation.html b/rosetta/templates/rosetta/update_confirmation.html index cb468b07..a4600a73 100644 --- a/rosetta/templates/rosetta/update_confirmation.html +++ b/rosetta/templates/rosetta/update_confirmation.html @@ -20,7 +20,7 @@

{% trans "No changes with the next file" %}

{% else %}

{% trans "Are you sure you want to update this file?" %}

{{ path_destination }} -

{% trans "Your action wil have these consequences:"%}

+

{% trans "Your action will have these consequences:"%}

{% if news_entries %}
{% trans "News messages created" %}
From 4ba2f1f5d642329dd17500e9e84a7623b68ba8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Mon, 6 Aug 2012 15:04:18 +0200 Subject: [PATCH 12/19] Improve in the priority catalogues --- rosetta/locale/cs/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/de/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/es/LC_MESSAGES/django.mo | Bin 5919 -> 5948 bytes rosetta/locale/es/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/fr/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/hu/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/it/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/nl/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/pl/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/ru/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/tr/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/uk/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/locale/xx/LC_MESSAGES/django.po | 23 ++++++++++------ rosetta/poutil.py | 24 ++++++++++++++++ .../rosetta/inc.invalid_message.html | 18 ++++++++++-- rosetta/views.py | 26 ++---------------- 16 files changed, 209 insertions(+), 135 deletions(-) diff --git a/rosetta/locale/cs/LC_MESSAGES/django.po b/rosetta/locale/cs/LC_MESSAGES/django.po index 94faf33f..104e5249 100644 --- a/rosetta/locale/cs/LC_MESSAGES/django.po +++ b/rosetta/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -80,7 +80,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -92,27 +92,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/de/LC_MESSAGES/django.po b/rosetta/locale/de/LC_MESSAGES/django.po index a2bbf307..7fc7e74f 100644 --- a/rosetta/locale/de/LC_MESSAGES/django.po +++ b/rosetta/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: Martin Mahner \n" "Language-Team: patrick lauber \n" @@ -33,7 +33,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -82,7 +82,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -94,27 +94,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/es/LC_MESSAGES/django.mo b/rosetta/locale/es/LC_MESSAGES/django.mo index 5901eecb43236280c061de3dc66a5dacec1626a8..60c26d82a38ac4beab669f2a7c64e0dffe92c573 100644 GIT binary patch delta 1458 zcmYk+OGs2v9LMp$&K)h^kIJ#9ny(yn)O?iL!#4TAS~NvT1!4`jh>5U;NR0`B5NION z!bMQ2M3liqi*i#gTH2!MMM8^qErJ%|BIx_O_bxol|9tNAod0>;xnI9jpI9w$?i!_& z*iMwEnw`a3hl+A1Xx4?(ScPA)7E{yAYA}MC*pC}9=AXxLGv}koD>jWecn{U|Jo0?P zo^a5{g%`-reo^U#KbV1QNKWRYdoQNrCC;<30I#AtzJ=;=5_jMu|NO0g|1&CqAGisB zV?O;`khiC}P=s~3fMNWIMVPYD>!8@T3`@BlMm5-nO5_}F!#FB|+o%CO#+~>avvCEd z@jHg--{K6j7bma`KVS*|#XT5eemS(Gn2UXwkLQt}#i^9QC>G)*hVTLMv)5Dy@Esn+ zK$bV4PE07H9uD;2863uosE)rNvt$7t>QCVr?BYDeu&Zzp_u(gO#XPd(6+4Cu&Z4Nq zFQ8^}2sI-&Q3+4vGXLsemJ3SYAx3f0f6&SE639f2xDd4$Do_no<28(+)^rY8HG75X za2b{8H~)TsMsz=f8hB|w^RKmua6vB|#|4aG2j-BbM%Ig((s9(tW>F2zq4vTvR08i& z?fk@Q{D-@-l6BF0J*b(DB01TO1PAjROra8KrIi?-LN&aETX7XNk~LIArEGOI5Jvj2 z4kTwgfl6Qii*W?CDQEoqi`d2a8|=pJj4j?Sj-nbIL`}^wj^Q{qV1QP&RL#g%aG%xn zc0&IfoimM2p}U*(@wO1!2`V)nZcSqrSa;5--ET#6)JoJ5^+Y+L^xFsxPo>$zt@W9x zl(@B5h4pWuU8MO^sUS3GOqoT9!-R?!au=a*LPc9x+f+MBbEu*@TwnHb(nM&DR5Yhd zp<61c8;M%AsKwF$n^svnfKS8yXtkIs`T$i95&MZFgyyv)c|90RaV}pO9!ZX+t)w|E Y?F~)Ili8uv;OT+E<)_J^+?VP90bx{dMgRZ+ delta 1431 zcmY+^OGs2v9LMqhjCXwGV{**YUfR?0F*Q0lqm@~NX+Z=FH}|^eFz0^GnS1A)|M{PD=UI3gF@}o#F!Hek7X^^SDjY!#d=>fF11@{;G48`0 zYC+9qZa`5?>A{0EF5xlM#4nNTSPswl%zk4Z{o^dV5pQE0=dc6+AdgstC|R6!qXO?k zW%2|n&_UF=qo{eW1j+wN8WVh>lzsOeSU|0G33UdFSGxC0ahQGxwU=qsiteH&nn49P z>)oIC?*Bz?fy1EMk`U_oNG17yNTZ)G_TnOHMPb5KDwC)cjiM$>qs~AE6+jj>&}-a| zUvM*)upjzeD=MQgBnCT&GdP3_q%OrM=V`=I15e``oI|bTBWfUrBd!4|kU6X#iPhRr z0UW|Q96%k$%ijG7)Yjd{e#{}eWwF)nc%8j8l$z5xhDqFo^QgV5VRVi_{s8X8PO2v8 znLOZBrL^mMX`@u_sEXFRT$s%YmOH2r^)I92zMI-Y)w`#hDc>DbElZ`{C4W_FRO(&w z*CzdY=$Pq@t8Afeqmo+-Q@g1u%8!!Wr4A)VRStFHlv5Q}`(J6J7oqBfR?(iY75TE2 zt5Vdgne&@NN4u{LQ!bU@2C9lqm5N?Ky)*l%%By9s1p>b8t-^POPPD5%p1n|B>(8cx HPm2BlX_Iha diff --git a/rosetta/locale/es/LC_MESSAGES/django.po b/rosetta/locale/es/LC_MESSAGES/django.po index 7d7061cd..dca57653 100644 --- a/rosetta/locale/es/LC_MESSAGES/django.po +++ b/rosetta/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-11-30 12:12\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "" "Si tu chequeas este campo, tu archivo sobreescribirá las traducciones, en " "otro caso solo se crearán nuevas entradas" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "No hay un catálogo actual" @@ -83,7 +83,7 @@ msgstr "" "¡por favor compruebelo!" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -95,28 +95,33 @@ msgstr "Hay un catálogo más prioritario" msgid "Prioritary translation:" msgstr "Traducción prioritaria:" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "Vacío" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "¡Actualizado!" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "Error actualizando" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" "¿Actualiza el catálogo prioritario con el texto de la cajas de entrada?" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "¿Actualiza el catálogo prioritario con el texto de la caja de entrada?" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "Si, actualiza" diff --git a/rosetta/locale/fr/LC_MESSAGES/django.po b/rosetta/locale/fr/LC_MESSAGES/django.po index 111765a0..2cef90cb 100644 --- a/rosetta/locale/fr/LC_MESSAGES/django.po +++ b/rosetta/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -31,7 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -80,7 +80,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -92,27 +92,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/hu/LC_MESSAGES/django.po b/rosetta/locale/hu/LC_MESSAGES/django.po index b746c10c..6c8ceb2f 100644 --- a/rosetta/locale/hu/LC_MESSAGES/django.po +++ b/rosetta/locale/hu/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-10-09 19:08+0100\n" "Last-Translator: Gergely Kontra \n" "Language-Team: nomail \n" @@ -30,7 +30,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -79,7 +79,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -91,27 +91,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/it/LC_MESSAGES/django.po b/rosetta/locale/it/LC_MESSAGES/django.po index af598273..d92b457a 100644 --- a/rosetta/locale/it/LC_MESSAGES/django.po +++ b/rosetta/locale/it/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "Last-Translator: Marco Bonetti \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -78,7 +78,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -90,27 +90,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/nl/LC_MESSAGES/django.po b/rosetta/locale/nl/LC_MESSAGES/django.po index 914594a2..24e29845 100644 --- a/rosetta/locale/nl/LC_MESSAGES/django.po +++ b/rosetta/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-06-05 17:06+0200\n" "Last-Translator: Joost Cassee \n" "Language-Team: Joost Cassee \n" @@ -31,7 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -80,7 +80,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -92,27 +92,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/pl/LC_MESSAGES/django.po b/rosetta/locale/pl/LC_MESSAGES/django.po index 9717ce47..04df9328 100644 --- a/rosetta/locale/pl/LC_MESSAGES/django.po +++ b/rosetta/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-09-12 12:16\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -80,7 +80,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -92,27 +92,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/ru/LC_MESSAGES/django.po b/rosetta/locale/ru/LC_MESSAGES/django.po index 83d7940b..02df06e7 100644 --- a/rosetta/locale/ru/LC_MESSAGES/django.po +++ b/rosetta/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -78,7 +78,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -90,27 +90,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/tr/LC_MESSAGES/django.po b/rosetta/locale/tr/LC_MESSAGES/django.po index cc3d5091..54025d72 100644 --- a/rosetta/locale/tr/LC_MESSAGES/django.po +++ b/rosetta/locale/tr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-06-16 10:11+0100\n" "Last-Translator: RECEP KIRMIZI \n" "Language-Team: \n" @@ -34,7 +34,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -83,7 +83,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -95,27 +95,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/uk/LC_MESSAGES/django.po b/rosetta/locale/uk/LC_MESSAGES/django.po index adb291f8..14225995 100644 --- a/rosetta/locale/uk/LC_MESSAGES/django.po +++ b/rosetta/locale/uk/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "Last-Translator: Nazar Leush \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -78,7 +78,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -90,27 +90,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/locale/xx/LC_MESSAGES/django.po b/rosetta/locale/xx/LC_MESSAGES/django.po index 342af4f8..ec15808e 100644 --- a/rosetta/locale/xx/LC_MESSAGES/django.po +++ b/rosetta/locale/xx/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Rosetta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-06 14:38+0200\n" +"POT-Creation-Date: 2012-08-06 15:02+0200\n" "PO-Revision-Date: 2008-09-22 11:02\n" "Last-Translator: Admin Admin \n" "Language-Team: French \n" @@ -30,7 +30,7 @@ msgid "" "only will create new entries" msgstr "" -#: views.py:407 +#: views.py:408 msgid "There is not a current catalogue" msgstr "" @@ -79,7 +79,7 @@ msgid "" msgstr "" #: templates/rosetta/inc.invalid_message.html:5 -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "No" msgstr "" @@ -91,27 +91,32 @@ msgstr "" msgid "Prioritary translation:" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:19 +#: templates/rosetta/inc.invalid_message.html:30 +msgid "Empty" +msgstr "" + +#: templates/rosetta/inc.invalid_message.html:35 msgid "Yes" msgstr "" -#: templates/rosetta/inc.invalid_message.html:23 +#: templates/rosetta/inc.invalid_message.html:35 msgid "Updated!" msgstr "" -#: templates/rosetta/inc.invalid_message.html:26 +#: templates/rosetta/inc.invalid_message.html:38 msgid "Error updating" msgstr "" -#: templates/rosetta/inc.invalid_message.html:31 +#: templates/rosetta/inc.invalid_message.html:43 msgid "Update prioritary catalog with the text from the input boxes?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:33 +#: templates/rosetta/inc.invalid_message.html:45 msgid "Update prioritary catalog with the text from the input box?" msgstr "" -#: templates/rosetta/inc.invalid_message.html:37 +#: templates/rosetta/inc.invalid_message.html:49 msgid "Yes, update" msgstr "" diff --git a/rosetta/poutil.py b/rosetta/poutil.py index 12e47b19..73805714 100644 --- a/rosetta/poutil.py +++ b/rosetta/poutil.py @@ -209,3 +209,27 @@ def format_error_line(line): os.unlink(temp_file) return errors + + +def search_msg_id_in_other_pos(msg_list, lang, pofile_path, project_apps=True, django_apps=True, third_party_apps=True): + pofile_paths = find_pos(lang, project_apps=project_apps, django_apps=django_apps, third_party_apps=third_party_apps) + pofiles = [] + for path in pofile_paths: + pofiles.append(polib.pofile(path)) + for msg in msg_list: + valid_entry = valid_catalog = None + is_valid = True + for p in pofiles: + if p.fpath == pofile_path.fpath: + is_valid = True + break + entry = p.find(msg.msgid) + if entry: + is_valid = not entry.translated() + valid_entry = entry + valid_catalog = p + break + msg.is_valid = is_valid + msg.valid_catalog = valid_catalog + msg.valid_entry = valid_entry + return msg_list diff --git a/rosetta/templates/rosetta/inc.invalid_message.html b/rosetta/templates/rosetta/inc.invalid_message.html index 00846dad..a053b1cf 100644 --- a/rosetta/templates/rosetta/inc.invalid_message.html +++ b/rosetta/templates/rosetta/inc.invalid_message.html @@ -1,6 +1,6 @@ {% load i18n %} -{% if not message.is_valid %} +{% if message.valid_entry and message.valid_catalog %}

{% trans {% trans "There is a more prioritary catalog" %} @@ -12,12 +12,24 @@ {% for k, msgstr in message.valid_entry.msgstr_plural.items|dictsort:"0" %}

  • - {{ message.valid_entry.msgstr }} + + {% if msgstr %} + {{ msgstr }} + {% else %} + {% trans "Empty" %} + {% endif %} +
    • {% endfor %} {% else %} - {{ message.valid_entry.msgstr }} + + {% if message.valid_entry.msgstr %} + {{ message.valid_entry.msgstr }} + {% else %} + {% trans "Empty" %} + {% endif %} + {% endif %} {% trans {% trans "Updated!" %} diff --git a/rosetta/views.py b/rosetta/views.py index 7957fee3..a88e8d2e 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -15,7 +15,8 @@ from rosetta.forms import UpdatePoForm from rosetta.polib import pofile from rosetta.poutil import (find_pos, pagination_range, get_app_name, - get_differences, priority_merge, validate_format) + get_differences, priority_merge, validate_format, + search_msg_id_in_other_pos) from rosetta.signals import entry_changed, post_save from rosetta.storage import get_storage import re @@ -641,26 +642,3 @@ def can_translate(user): return translators in user.groups.all() except Group.DoesNotExist: return False - - -def search_msg_id_in_other_pos(msg_list, lang, pofile_path): - pofile_paths = find_pos(lang, project_apps=True, django_apps=True, third_party_apps=True) - pofiles = [] - for path in pofile_paths: - pofiles.append(pofile(path)) - for msg in msg_list: - for p in pofiles: - valid_entry = None - valid_catalog = p - if p.fpath == pofile_path.fpath: - is_valid = True - break - entry = p.find(msg.msgid) - if entry: - is_valid = False - valid_entry = entry - break - msg.is_valid = is_valid - msg.valid_catalog = valid_catalog - msg.valid_entry = valid_entry - return msg_list From 0b3e8c2c7e66b138b3d39cfdbda3a7f2722ea2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADn?= Date: Mon, 6 Aug 2012 15:24:20 +0200 Subject: [PATCH 13/19] A templatetag to know if a user can edit the translations. I had to move the file, but this was the same to the application. And I could not import the can_translate function --- rosetta/templates/rosetta/js/rosetta.js | 2 +- rosetta/templates/rosetta/pofile.html | 2 +- .../{rosetta.py => rosetta_tags.py} | 45 ++++++++++++++++++- 3 files changed, 45 insertions(+), 4 deletions(-) rename rosetta/templatetags/{rosetta.py => rosetta_tags.py} (61%) diff --git a/rosetta/templates/rosetta/js/rosetta.js b/rosetta/templates/rosetta/js/rosetta.js index 4399177c..b96ac2f2 100644 --- a/rosetta/templates/rosetta/js/rosetta.js +++ b/rosetta/templates/rosetta/js/rosetta.js @@ -1,4 +1,4 @@ -{% load rosetta %} +{% load rosetta_tags %} google.setOnLoadCallback(function() { $('.location a').show().toggle(function() { diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html index 397c3cc6..47e5128a 100644 --- a/rosetta/templates/rosetta/pofile.html +++ b/rosetta/templates/rosetta/pofile.html @@ -1,5 +1,5 @@ {% extends "rosetta/base.html" %} -{% load rosetta i18n %} +{% load rosetta_tags i18n %} {% block extrahead %} {{ block.super }} diff --git a/rosetta/templatetags/rosetta.py b/rosetta/templatetags/rosetta_tags.py similarity index 61% rename from rosetta/templatetags/rosetta.py rename to rosetta/templatetags/rosetta_tags.py index bb283523..b2e24705 100644 --- a/rosetta/templatetags/rosetta.py +++ b/rosetta/templatetags/rosetta_tags.py @@ -3,12 +3,17 @@ from django.utils.html import escape import re from django.template import Node -from django.utils.encoding import smart_str, smart_unicode -from django.template.defaultfilters import stringfilter +from django.template import TemplateSyntaxError +from django.utils.encoding import smart_unicode +from django.template.defaulttags import IfNode + +from rosetta.views import can_translate + register = template.Library() rx = re.compile(r'(%(\([^\s\)]*\))?[sd])') + def format_message(message): return mark_safe(rx.sub('\\1', escape(message).replace(r'\n','
    \n'))) format_message=register.filter(format_message) @@ -74,3 +79,39 @@ def rosetta_csrf_token(parser, token): except ImportError: return RosettaCsrfTokenPlaceholder() rosetta_csrf_token=register.tag(rosetta_csrf_token) + + +class IfCanAccessRosetta(template.Node): + + def __init__(self, if_node, else_node): + self.if_node = if_node + self.else_node = else_node + + def __repr__(self): + return '' + + def render(self, context): + if self.check(context): + return self.if_node.render(context) + else: + return self.else_node.render(context) + + def check(self, context): + user = template.Variable('user').resolve(context) + return can_translate(user) + + +def if_can_access_rosetta(parser, token): + bits = list(token.split_contents()) + if len(bits) != 1: + raise TemplateSyntaxError('%r takes no arguments' % bits[0]) + end_tag = 'end' + bits[0] + node_if = parser.parse(('else', end_tag)) + token = parser.next_token() + if token.contents == 'else': + node_else = parser.parse((end_tag, )) + parser.delete_first_token() + else: + node_else = template.NodeList() + return IfCanAccessRosetta(node_if, node_else) +if_can_access_rosetta = register.tag(if_can_access_rosetta) From b5e27b66a9dea4d42e5e31f75bccbd11790209ca Mon Sep 17 00:00:00 2001 From: Manuel Saelices Date: Wed, 26 Sep 2012 17:47:29 +0200 Subject: [PATCH 14/19] Changed the egg to mark the yaco version. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 33930741..9743d391 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages setup( - name='django-rosetta', + name='django-rosetta-yaco', version=__import__('rosetta').get_version(limit=3), description='A Django application that eases the translation of Django projects', author='Marco Bonetti', From 2b807cdc15003f9cf805fd675d9e99fec0c6ad92 Mon Sep 17 00:00:00 2001 From: Manuel Saelices Date: Wed, 26 Sep 2012 18:21:53 +0200 Subject: [PATCH 15/19] New translations. --- rosetta/locale/cs/LC_MESSAGES/django.mo | Bin 2969 -> 2969 bytes rosetta/locale/de/LC_MESSAGES/django.mo | Bin 2813 -> 2813 bytes rosetta/locale/es/LC_MESSAGES/django.mo | Bin 5948 -> 5946 bytes rosetta/locale/es/LC_MESSAGES/django.po | 2 +- rosetta/locale/fr/LC_MESSAGES/django.mo | Bin 3034 -> 3296 bytes rosetta/locale/hu/LC_MESSAGES/django.mo | Bin 2245 -> 2245 bytes rosetta/locale/it/LC_MESSAGES/django.mo | Bin 2995 -> 2995 bytes rosetta/locale/nl/LC_MESSAGES/django.mo | Bin 2402 -> 2402 bytes rosetta/locale/pl/LC_MESSAGES/django.mo | Bin 2590 -> 2590 bytes rosetta/locale/ru/LC_MESSAGES/django.mo | Bin 2019 -> 2019 bytes rosetta/locale/tr/LC_MESSAGES/django.mo | Bin 2997 -> 2997 bytes rosetta/locale/uk/LC_MESSAGES/django.mo | Bin 2048 -> 2048 bytes 12 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rosetta/locale/cs/LC_MESSAGES/django.mo b/rosetta/locale/cs/LC_MESSAGES/django.mo index ebb19e6e8a4f2c7e8c18c78df3b2a1d0eb4de7c6..13cc60d3f7a3f76c5122ba85ce89721ddfb545ca 100644 GIT binary patch delta 25 hcmbO!K2v}eU12Y9fQ!9hbr`XQ3003eP2Y~

    `d4&=J{ymbu7QQFftiA#sg=QIYqmoy0A}t78UO$Q delta 25 gcmew>`d4&=J{ymLu7SC(fr)~lv6abYYqmoy0A{cU7XSbN diff --git a/rosetta/locale/es/LC_MESSAGES/django.mo b/rosetta/locale/es/LC_MESSAGES/django.mo index 60c26d82a38ac4beab669f2a7c64e0dffe92c573..986d1673e5767ba92328d3a0a5ccb5be4e88be22 100644 GIT binary patch delta 242 zcmXZVu@1oi5XSMZ(FB8rQi6mC30)cylP9R8mfDHM19Y)S^aTuF!X}Y)Ya|wrVYS-~ z7XK!u-`(ZzyPKDK*C2OrB)x2DgkS9Apehy7M;AjZ;~vj=#12kt(iWH4!xUTi#36n# z%jxnYyLXWnnqdVOj#g?=tQjOgs7-5Vtj?o}AkCVhT LAC?g%Z#yu5-2obS delta 244 zcmXZWKMMf?7{~En-IXX8#}P_h%Ab@BGI;?=S@OT!AjkxTa?#fv)T>H z_hS0=JUxGY*GAB|42*47($kiz_`wpEQ&JTBSVIpJxWN-1u!!xnG{+IT7+@YBSiv`j zcUJip^?Ki7V!8VIAfRkhCPgBBnv$Z15GiGE8O88n`m$}f-S#h O-YsJ>Tlz11V15BELK}Yo diff --git a/rosetta/locale/es/LC_MESSAGES/django.po b/rosetta/locale/es/LC_MESSAGES/django.po index dca57653..aa3a18a7 100644 --- a/rosetta/locale/es/LC_MESSAGES/django.po +++ b/rosetta/locale/es/LC_MESSAGES/django.po @@ -38,7 +38,7 @@ msgstr "No hay un catálogo actual" #: templates/rosetta/base.html:33 msgid "Restart web server" -msgstr "Reiniciando el servidor" +msgstr "Reiniciar el servidor" #: templates/rosetta/base.html:34 msgid "Update a catalogue" diff --git a/rosetta/locale/fr/LC_MESSAGES/django.mo b/rosetta/locale/fr/LC_MESSAGES/django.mo index 646f01a7592d6ccebf4f47ebe45ce83e0726da3b..0b31755deaed34d5d7657104d37505256820621b 100644 GIT binary patch delta 1047 zcmZY8O=uHA6u|M>e6}%dP5r1f8n=m2a!5%6Z8a2Wv53VMv3_1Ggk+%!X(F2~C?Wwx zK`(x+MetI+_ND>7D2f+v6|9H^)CwNGc<7}b^#9V$$suok`(~4wx3iOG-&%kDTd!wP z(c;7&VnS1D2+J-y+L&9Z<2a57@ecA)&*`?{3k>2r?7$Ds_!rzk{u4d8fg|`AeK^9P zSE;%>!bO0A36wQYA|EwF*Nf*-CN7~&Sab5**iHVx$)93~d>QZJD`$L)Rs7^;?G8d`W0W#SDy&91pfCdtoHZ4#d#HK-Mo zc~?<>{~bH=HwIW={o!Ia`WTf72k-vN%dad%krl#IM(&wAbm=89%PzmzkrD~*^p zq6IU_)S+Z*SWgdSQ}(nkJSyqoWG17h)7exeFqNxW$unlIQY+`Is+rZt3-iT_(~ssP z8Ef@}`RaUQ*_YNrla)d-Z|M2Wau$rT-Spq`QH)77vmH6jT{0|tt#jQ|G|XCKHQ?9& E0U)@3OaK4? delta 795 zcmZ|LPiWI%9LDiCw%MN+oo>iBnUc+II$ZQkS}275QShKBDn$=Np%fP+FjGyk!4w_B z6g-J59t1%U&qIwzamRrNCnyLG#yoiNBK05$Ui|)~;>nWa^FASY^6R_V`>A_jqci(J z@f+am;~X_4DK)m`pT}5^llS2r%-}NS@ddWw>tnD%nZmeJn-oUN6i1%>`NBF)P zWGtEJ6n5YgN^yV*UdL8!;1s*_6OWV2+_do#(xu*@?8q9n<2p+37utVN!6B&>z=mus`JbuRWJYpnV=AD$&2OlGFj fqcvNtM1}l$|u7QQFftiA#sg=QI6V{2$09us>U;qFB delta 25 gcmX>qcvNtM1}l$&u7SC(fr)~lv6abY6V{2$09scDT>t<8 diff --git a/rosetta/locale/it/LC_MESSAGES/django.mo b/rosetta/locale/it/LC_MESSAGES/django.mo index b731208da885215bb6e441c709a3421342487ebd..812d557026e81790c18c5b45f146d43ec9927e6f 100644 GIT binary patch delta 25 hcmdlizFB<3b2c6$T>}eU12Y9fQ!9hbpV}eU12Y9fQ!9hbM_D6T0ATnB0{{R3 delta 25 gcmbOyGEZc~PF5ZRT?2Dn0}};9V=I%*M_D6T0ARWY00000 diff --git a/rosetta/locale/ru/LC_MESSAGES/django.mo b/rosetta/locale/ru/LC_MESSAGES/django.mo index 45627281ae89c5e508afbe265dd3dfaad60c1fb2..2b07849c083232ffab91dcfb93892c24e44aec65 100644 GIT binary patch delta 25 gcmaFN|CoOR8w-z-u7QQFftiA#sg=QIA(o5G09_LXk^lez delta 25 gcmaFN|CoOR8w-ztu7SC(fr)~lv6abYA(o5G09@4uj{pDw diff --git a/rosetta/locale/tr/LC_MESSAGES/django.mo b/rosetta/locale/tr/LC_MESSAGES/django.mo index 7bed8c0a18596753a6e839cbc4bd8fe12ec7d49b..62b27d77a80bb4de525191e0485e3821f5b2c52b 100644 GIT binary patch delta 53 zcmdlgzEym~95!AfT>}eU12Y9fQ!4|b$t&54ChM_B3Hc=ErI#kAr&=k5lon-Y7H24I JZfDnH0RXUe5LW;I delta 52 zcmdlgzEym~95!A9T|+}4QZO{NGBKUJlC4P4CowO*G%-EZN+G1QC_A$_W3nWB%;pYu GT^0bO!4Mt* diff --git a/rosetta/locale/uk/LC_MESSAGES/django.mo b/rosetta/locale/uk/LC_MESSAGES/django.mo index 58627ed657fc4a41dd141ccf3150d2670825690b..d58985f90c9897993a09baef6a6d6c881e296fd1 100644 GIT binary patch delta 25 gcmZn=Xb{-I#=>KyYha;kV5VSbYGtrlh~*tK07~lx>i_@% delta 25 gcmZn=Xb{-I#=>KuYhbQxV4`4XY-O@ph~*tK07|U|=l}o! From b013ed4c40b25f0bb0e8c4a4d2aa092e39a14219 Mon Sep 17 00:00:00 2001 From: Manuel Saelices Date: Thu, 17 Oct 2013 12:03:52 +0200 Subject: [PATCH 16/19] New ROSETTA_EXCLUDE_LOCALE_PATHS setting to exclude catalogs found in locale paths. --- README.rst | 1 + rosetta/conf/settings.py | 1 + rosetta/poutil.py | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index be394c1b..2f97a0c9 100644 --- a/README.rst +++ b/README.rst @@ -58,6 +58,7 @@ Rosetta can be configured via the following parameters, to be defined in your pr * ``ROSETTA_MESSAGES_SOURCE_LANGUAGE_CODE`` and ``ROSETTA_MESSAGES_SOURCE_LANGUAGE_NAME``: Change these if the source language in your PO files isn't English. Default to ``'en'`` and ``'English'`` respectively. * ``ROSETTA_WSGI_AUTO_RELOAD`` and ``ROSETTA_UWSGI_AUTO_RELOAD``: When running WSGI daemon mode, using ``mod_wsgi`` 2.0c5 or later, this setting controls whether the contents of the gettext catalog files should be automatically reloaded by the WSGI processes each time they are modified. For performance reasons, this setting should be disabled in production environments. Default to ``False``. * ``ROSETTA_EXCLUDED_APPLICATIONS``: Exclude applications defined in this list from being translated. Defaults to ``()``. +* ``ROSETTA_EXCLUDE_LOCALE_PATHS``: Exclude catalogs from ``LOCALE_PATHS``. * ``ROSETTA_REQUIRES_AUTH``: Require authentication for all Rosetta views. Defaults to ``True``. * ``ROSETTA_POFILE_WRAP_WIDTH``: Sets the line-length of the edited PO file. Set this to ``0`` to mimic ``makemessage``'s ``--no-wrap`` option. Defaults to ``78``. * ``ROSETTA_STORAGE_CLASS``: See the note below on Storages. Defaults to ``rosetta.storage.CacheRosettaStorage`` diff --git a/rosetta/conf/settings.py b/rosetta/conf/settings.py index 967afaff..098e5ef8 100644 --- a/rosetta/conf/settings.py +++ b/rosetta/conf/settings.py @@ -45,6 +45,7 @@ # Exclude applications defined in this list from being translated EXCLUDED_APPLICATIONS = getattr(settings, 'ROSETTA_EXCLUDED_APPLICATIONS', ()) +EXCLUDE_LOCALE_PATHS = getattr(settings, 'ROSETTA_EXCLUDE_LOCALE_PATHS', False) # Line length of the updated PO file POFILE_WRAP_WIDTH = getattr(settings, 'ROSETTA_POFILE_WRAP_WIDTH', 78) diff --git a/rosetta/poutil.py b/rosetta/poutil.py index 73805714..bbeb55f3 100644 --- a/rosetta/poutil.py +++ b/rosetta/poutil.py @@ -33,9 +33,10 @@ def find_pos(lang, project_apps=True, django_apps=False, third_party_apps=False) paths.append(os.path.abspath(os.path.join(os.path.dirname(project.__file__), 'locale'))) # settings - for localepath in settings.LOCALE_PATHS: - if os.path.isdir(localepath): - paths.append(localepath) + if not rosetta_settings.EXCLUDE_LOCALE_PATHS: + for localepath in settings.LOCALE_PATHS: + if os.path.isdir(localepath): + paths.append(localepath) # django/locale if django_apps: From 0c3d7223060ff883ec176fdadf696738f9237705 Mon Sep 17 00:00:00 2001 From: Manuel Saelices Date: Thu, 17 Oct 2013 12:05:34 +0200 Subject: [PATCH 17/19] New 0.6.9 version. --- CHANGES | 4 ++++ rosetta/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 79e080c2..aa8b4b94 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Version 0.6.9 +------------- + +* New ROSETTA_EXCLUDE_LOCALE_PATHS setting. * Actually move to the next block when submitting a lot of translations (Issue #13) * Add msgctxt to the entry hash to differentiate entries with context. Thanks @metalpriest (Issue #39) diff --git a/rosetta/__init__.py b/rosetta/__init__.py index 664a7c74..972af04a 100644 --- a/rosetta/__init__.py +++ b/rosetta/__init__.py @@ -1,4 +1,4 @@ -VERSION = (0, 6, 8) +VERSION = (0, 6, 9) def get_version(svn=False, limit=3): From 7fb01c784ad340f7e05ba814350c52d40f5f1686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Wed, 19 Mar 2014 14:10:52 +0100 Subject: [PATCH 18/19] Fixed "continue translate" button error --- rosetta/views.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/rosetta/views.py b/rosetta/views.py index a88e8d2e..033b19f0 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -55,6 +55,7 @@ def fix_nls(in_, out_): storage = get_storage(request) version = rosetta.get_version(True) + query_arg = '' if storage.has('rosetta_i18n_fn'): rosetta_i18n_fn = storage.get('rosetta_i18n_fn') rosetta_i18n_app = get_app_name(rosetta_i18n_fn) @@ -177,7 +178,6 @@ def fix_nls(in_, out_): except: storage.set('rosetta_i18n_write', False) storage.set('rosetta_i18n_pofile', rosetta_i18n_pofile) - # Retain query arguments query_arg = '?_next=1' if 'query' in request.GET or 'query' in request.POST: @@ -187,9 +187,12 @@ def fix_nls(in_, out_): return HttpResponseRedirect(reverse('rosetta-home') + iri_to_uri(query_arg)) rosetta_i18n_lang_name = _(storage.get('rosetta_i18n_lang_name')) rosetta_i18n_lang_code = storage.get('rosetta_i18n_lang_code') - if 'query' in request.REQUEST and request.REQUEST.get('query', '').strip(): query = request.REQUEST.get('query').strip() + if query_arg: + query_arg += '&query=%s' % request.REQUEST.get('query') + else: + query_arg = '?query=%s' % request.REQUEST.get('query') rx = re.compile(re.escape(query), re.IGNORECASE) paginator = Paginator([e for e in rosetta_i18n_pofile if not e.obsolete and rx.search(smart_unicode(e.msgstr) + smart_unicode(e.msgid) + u''.join([o[0] for o in e.occurrences]))], rosetta_settings.MESSAGES_PER_PAGE) else: @@ -201,7 +204,6 @@ def fix_nls(in_, out_): paginator = Paginator([e for e in rosetta_i18n_pofile.fuzzy_entries() if not e.obsolete], rosetta_settings.MESSAGES_PER_PAGE) else: paginator = Paginator([e for e in rosetta_i18n_pofile if not e.obsolete], rosetta_settings.MESSAGES_PER_PAGE) - if 'page' in request.GET and int(request.GET.get('page')) <= paginator.num_pages and int(request.GET.get('page')) > 0: page = int(request.GET.get('page')) else: @@ -478,6 +480,7 @@ def lang_sel(request, langid, idx): """ Selects a file to be translated """ + query_arg = '' storage = get_storage(request) if langid not in [l[0] for l in settings.LANGUAGES]: raise Http404 @@ -507,7 +510,13 @@ def lang_sel(request, langid, idx): except OSError: storage.set('rosetta_i18n_write', False) - return HttpResponseRedirect(reverse('rosetta-home')) + if 'query' in request.REQUEST and request.REQUEST.get('query', '').strip(): + if query_arg: + query_arg += '&query=%s' % request.REQUEST.get('query') + else: + query_arg = '?query=%s' % request.REQUEST.get('query') + + return HttpResponseRedirect(reverse('rosetta-home') + query_arg) lang_sel = never_cache(lang_sel) lang_sel = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(lang_sel) From fd56c2ef87295deba4402511ca058978192d9d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Wed, 19 Mar 2014 14:28:59 +0100 Subject: [PATCH 19/19] Improve "continue translate" buttons with pagination. --- rosetta/views.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/rosetta/views.py b/rosetta/views.py index 033b19f0..dac15fa7 100644 --- a/rosetta/views.py +++ b/rosetta/views.py @@ -187,12 +187,9 @@ def fix_nls(in_, out_): return HttpResponseRedirect(reverse('rosetta-home') + iri_to_uri(query_arg)) rosetta_i18n_lang_name = _(storage.get('rosetta_i18n_lang_name')) rosetta_i18n_lang_code = storage.get('rosetta_i18n_lang_code') + query_arg = '?' + request.GET.urlencode() if 'query' in request.REQUEST and request.REQUEST.get('query', '').strip(): query = request.REQUEST.get('query').strip() - if query_arg: - query_arg += '&query=%s' % request.REQUEST.get('query') - else: - query_arg = '?query=%s' % request.REQUEST.get('query') rx = re.compile(re.escape(query), re.IGNORECASE) paginator = Paginator([e for e in rosetta_i18n_pofile if not e.obsolete and rx.search(smart_unicode(e.msgstr) + smart_unicode(e.msgid) + u''.join([o[0] for o in e.occurrences]))], rosetta_settings.MESSAGES_PER_PAGE) else: @@ -480,7 +477,6 @@ def lang_sel(request, langid, idx): """ Selects a file to be translated """ - query_arg = '' storage = get_storage(request) if langid not in [l[0] for l in settings.LANGUAGES]: raise Http404 @@ -510,12 +506,8 @@ def lang_sel(request, langid, idx): except OSError: storage.set('rosetta_i18n_write', False) - if 'query' in request.REQUEST and request.REQUEST.get('query', '').strip(): - if query_arg: - query_arg += '&query=%s' % request.REQUEST.get('query') - else: - query_arg = '?query=%s' % request.REQUEST.get('query') - + query_arg = '?' + query_arg += request.GET.urlencode() return HttpResponseRedirect(reverse('rosetta-home') + query_arg) lang_sel = never_cache(lang_sel) lang_sel = user_passes_test(lambda user: can_translate(user), settings.LOGIN_URL)(lang_sel)