From: Lukasz Anwajler Date: Thu, 5 Aug 2010 11:31:51 +0000 (-0500) Subject: Merge branch 'master' of git@github.com:fnp/redakcja X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/74081c8b2e9a8588505c40257556e17274fc80de?hp=42a46397a91a4bd24211bb98516a99c567247bf8 Merge branch 'master' of git@github.com:fnp/redakcja --- diff --git a/apps/toolbar/fixtures/initial_data.yaml b/apps/toolbar/fixtures/initial_data.yaml index 723732d2..a117f9b1 100644 --- a/apps/toolbar/fixtures/initial_data.yaml +++ b/apps/toolbar/fixtures/initial_data.yaml @@ -38,8 +38,8 @@ model: toolbar.buttongroup pk: 17 - fields: - group: [14, 12] accesskey: a + group: [14, 12] label: akapit link: '' params: '{"tag": "akap"}' @@ -49,8 +49,8 @@ model: toolbar.button pk: 39 - fields: - group: [14] accesskey: '' + group: [14] label: akapit cd. link: '' params: '{"tag": "akap_cd"}' @@ -60,8 +60,8 @@ model: toolbar.button pk: 40 - fields: - group: [14] accesskey: d + group: [14] label: akapit dialogowy link: '' params: '{"tag": "akap_dialog"}' @@ -71,8 +71,8 @@ model: toolbar.button pk: 41 - fields: - group: [1] accesskey: '' + group: [1] label: akt link: '' params: '{"tag": "akt"}' @@ -82,8 +82,8 @@ model: toolbar.button pk: 14 - fields: - group: [13] accesskey: '' + group: [13] label: autor link: '' params: '{"tag": "autor_utworu"}' @@ -93,24 +93,25 @@ model: toolbar.button pk: 32 - fields: - group: [2] accesskey: '' + group: [2] label: Podstawowa link: '' params: '[["fulltextregexp", {"exprs": [["\ufeff", ""], ["$[\\s]*\\d+[\\s]*^", - ""], ["-\\s*^", ""], ["\\,\\.\\.|\\.\\,\\.|\\.\\.\\,", "..."]]}], ["lineregexp", - {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"], - ["(\\d)[\u2014-](\\d)", "$1--$2"], ["[\u2014]", "---"], ["<(/?)P([aert])", - "<$1p$2"], ["([^\\.])(\\s*)\u2193" link: '' params: '[]' @@ -653,8 +664,8 @@ model: toolbar.button pk: 76 - fields: - group: [15] accesskey: '' + group: [15] label: "tytu\u0142 dzie\u0142a" link: '' params: '{"tag": "tytul_dziela"}' @@ -664,8 +675,8 @@ model: toolbar.button pk: 92 - fields: - group: [15] accesskey: '' + group: [15] label: "tytu\u0142 dzie\u0142a typ 1" link: '' params: '{"tag": "tytul_dziela", "attrs": {"typ": "1"}}' @@ -675,8 +686,8 @@ model: toolbar.button pk: 45 - fields: - group: [27] accesskey: '' + group: [27] label: uwaga link: '' params: '{"tag": "uwaga"}' @@ -686,8 +697,8 @@ model: toolbar.button pk: 51 - fields: - group: [14, 17] accesskey: '' + group: [14, 17] label: wers akap. link: '' params: '{"tag": "wers_akap"}' @@ -697,8 +708,8 @@ model: toolbar.button pk: 83 - fields: - group: [12, 17] accesskey: '' + group: [12, 17] label: wers cd. link: '' params: '{"tag": "wers_cd"}' @@ -708,8 +719,8 @@ model: toolbar.button pk: 85 - fields: - group: [12, 17] accesskey: w + group: [12, 17] label: "wers mocno wci\u0119ty" link: '' params: '{"tag": "wers_wciety", "attrs": {"typ": ""}}' @@ -719,8 +730,8 @@ model: toolbar.button pk: 84 - fields: - group: [12, 17] accesskey: q + group: [12, 17] label: "wers wci\u0119ty" link: '' params: '{"tag": "wers_wciety", "attrs": {"typ": "1"}}' @@ -730,8 +741,8 @@ model: toolbar.button pk: 91 - fields: - group: [15] accesskey: '' + group: [15] label: www link: '' params: '{"tag": "www"}' @@ -741,8 +752,8 @@ model: toolbar.button pk: 48 - fields: - group: [15] accesskey: '' + group: [15] label: "wyr\xF3\u017Cnienie" link: '' params: '{"tag": "wyroznienie"}' @@ -752,8 +763,8 @@ model: toolbar.button pk: 44 - fields: - group: [11] accesskey: '' + group: [11] label: wywiad link: '' params: '{"tag": "wywiad"}' @@ -763,8 +774,8 @@ model: toolbar.button pk: 25 - fields: - group: [21] accesskey: '' + group: [21] label: "wywiad odpowied\u017A" link: '' params: '{"tag": "wywiad_odp"}' @@ -774,8 +785,8 @@ model: toolbar.button pk: 73 - fields: - group: [21] accesskey: '' + group: [21] label: wywiad pytanie link: '' params: '{"tag": "wywiad_pyt"}' @@ -785,21 +796,8 @@ model: toolbar.button pk: 72 - fields: - group: [2] accesskey: '' - label: "Zamie\u0144 dywiz" - link: '' - params: '{"exprs": [["(\\s)-(\\s)", "$1---$2"], ["^(\\s*)-(\\s)", "$1---$2"], - ["(\\s)-(\\s*)$", "$1---$2"], ["(\\d)[\u2014\u2013\u2010-](\\d)", "$1--$2"], - ["\u2014\u2013\u2010", "---"]]}' - scriptlet: lineregexp - slug: zamien_dywiz - tooltip: "Zamienia '\u2014' na '---', oraz '1\u20142' na '1--2'." - model: toolbar.button - pk: 2 -- fields: group: [16] - accesskey: '' label: "zast\u0119pnik wersu" link: '' params: '{"tag": "zastepnik_wersu"}' diff --git a/apps/toolbar/locale/pl/LC_MESSAGES/django.mo b/apps/toolbar/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 00000000..54dabdf9 Binary files /dev/null and b/apps/toolbar/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/toolbar/locale/pl/LC_MESSAGES/django.po b/apps/toolbar/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 00000000..8c7cfb16 --- /dev/null +++ b/apps/toolbar/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-08-03 12:14+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: models.py:17 +msgid "button group" +msgstr "grupa przycisków" + +#: models.py:17 +msgid "button groups" +msgstr "grupy przycisków" + +#: models.py:51 +msgid "button" +msgstr "przycisk" + +#: models.py:51 +msgid "buttons" +msgstr "przyciski" + +#: models.py:75 +msgid "javascript" +msgstr "" diff --git a/apps/wiki/constants.py b/apps/wiki/constants.py index d96ce8bc..de6d0e2d 100644 --- a/apps/wiki/constants.py +++ b/apps/wiki/constants.py @@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _ DOCUMENT_STAGES = ( ("", u"-----"), + ("first_correction", _(u"First correction")), ("tagging", _(u"Tagging")), ("proofreading", _(u"Initial Proofreading")), ("annotation-proofreading", _(u"Annotation Proofreading")), diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 00000000..ffadebc8 Binary files /dev/null and b/apps/wiki/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 00000000..159aa853 --- /dev/null +++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,272 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-08-03 12:13+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Radek Czajka \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: constants.py:6 +msgid "First correction" +msgstr "Autokorekta" + +#: constants.py:7 +msgid "Tagging" +msgstr "Tagowanie" + +#: constants.py:8 +msgid "Initial Proofreading" +msgstr "Korekta" + +#: constants.py:9 +msgid "Annotation Proofreading" +msgstr "Sprawdzenie przypisów źródła" + +#: constants.py:10 +msgid "Modernisation" +msgstr "Uwspółcześnienie" + +#: constants.py:11 +msgid "Themes" +msgstr "Motywy" + +#: constants.py:12 +msgid "Editor's Proofreading" +msgstr "Ostateczna redakcja literacka" + +#: constants.py:13 +msgid "Technical Editor's Proofreading" +msgstr "Ostateczna redakcja techniczna" + +#: constants.py:17 +msgid "Ready to publish" +msgstr "Gotowe do publikacji" + +#: forms.py:62 +msgid "Author" +msgstr "Autor" + +#: forms.py:63 +msgid "Your name/" +msgstr "Imię i nazwisko/" + +#: forms.py:68 +msgid "Author's email" +msgstr "E-mail autora" + +#: forms.py:69 +msgid "Your email address, so we can show a gravatar :)" +msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)" + +#: forms.py:75 +msgid "Your comments" +msgstr "Twój komentarz" + +#: forms.py:76 +msgid "Describe changes you made." +msgstr "Opisz swoje zmiany" + +#: forms.py:82 +msgid "Completed" +msgstr "Ukończono" + +#: forms.py:83 +msgid "If you completed a life cycle stage, select it." +msgstr "Jeśli został ukończony etap prac, wskaż go." + +#: models.py:93 +#, python-format +msgid "Finished stage: %s" +msgstr "Ukończony etap: %s" + +#: models.py:149 +msgid "name" +msgstr "nazwa" + +#: models.py:153 +msgid "theme" +msgstr "motyw" + +#: models.py:154 +msgid "themes" +msgstr "motywy" + +#: views.py:279 +msgid "Tag added" +msgstr "Dodano tag" + +#: templates/wiki/base.html:15 +msgid "Platforma Redakcyjna" +msgstr "" + +#: templates/wiki/diff_table.html:5 +msgid "Old version" +msgstr "Stara wersja" + +#: templates/wiki/diff_table.html:6 +msgid "New version" +msgstr "Nowa wersja" + +#: templates/wiki/document_create_missing.html:8 +msgid "Create document" +msgstr "Utwórz dokument" + +#: templates/wiki/document_details.html:31 +msgid "Click to open/close gallery" +msgstr "Kliknij, aby (ro)zwinąć galerię" + +#: templates/wiki/document_details_base.html:36 +msgid "Help" +msgstr "Pomoc" + +#: templates/wiki/document_details_base.html:38 +msgid "Version" +msgstr "Wersja" + +#: templates/wiki/document_details_base.html:38 +msgid "Unknown" +msgstr "nieznana" + +#: templates/wiki/document_details_base.html:40 +#: templates/wiki/tag_dialog.html:15 +msgid "Save" +msgstr "Zapisz" + +#: templates/wiki/document_details_base.html:41 +msgid "Save attempt in progress" +msgstr "" + +#: templates/wiki/document_list.html:30 +msgid "Clear filter" +msgstr "Wyczyść filtr" + +#: templates/wiki/document_list.html:48 +msgid "Your last edited documents" +msgstr "Twoje ostatnie edycje" + +#: templates/wiki/tag_dialog.html:16 +msgid "Cancel" +msgstr "Anuluj" + +#: templates/wiki/tabs/gallery_view.html:7 +msgid "Previous" +msgstr "Poprzednie" + +#: templates/wiki/tabs/gallery_view.html:13 +msgid "Next" +msgstr "Następne" + +#: templates/wiki/tabs/gallery_view.html:15 +msgid "Zoom in" +msgstr "Powiększ" + +#: templates/wiki/tabs/gallery_view.html:16 +msgid "Zoom out" +msgstr "Zmniejsz" + +#: templates/wiki/tabs/gallery_view_item.html:3 +msgid "Gallery" +msgstr "Galeria" + +#: templates/wiki/tabs/history_view.html:5 +msgid "Compare versions" +msgstr "Porównaj wersje" + +#: templates/wiki/tabs/history_view.html:7 +msgid "Mark version" +msgstr "Oznacz wersję" + +#: templates/wiki/tabs/history_view.html:9 +msgid "Revert document" +msgstr "Przywróć wersję" + +#: templates/wiki/tabs/history_view.html:12 +msgid "View version" +msgstr "Zobacz wersję" + +#: templates/wiki/tabs/history_view_item.html:3 +msgid "History" +msgstr "Historia" + +#: templates/wiki/tabs/search_view.html:3 +#: templates/wiki/tabs/search_view.html:5 +msgid "Search" +msgstr "Szukaj" + +#: templates/wiki/tabs/search_view.html:8 +msgid "Replace with" +msgstr "Zamień na" + +#: templates/wiki/tabs/search_view.html:10 +msgid "Replace" +msgstr "Zamień" + +#: templates/wiki/tabs/search_view.html:13 +msgid "Options" +msgstr "Opcje" + +#: templates/wiki/tabs/search_view.html:15 +msgid "Case sensitive" +msgstr "Rozróżniaj wielkość liter" + +#: templates/wiki/tabs/search_view.html:17 +msgid "From cursor" +msgstr "Zacznij od kursora" + +#: templates/wiki/tabs/search_view_item.html:3 +msgid "Search and replace" +msgstr "Znajdź i zamień" + +#: templates/wiki/tabs/source_editor_item.html:5 +msgid "Source code" +msgstr "Kod źródłowy" + +#: templates/wiki/tabs/summary_view.html:10 +msgid "Title" +msgstr "Tytuł" + +#: templates/wiki/tabs/summary_view.html:15 +msgid "Document ID" +msgstr "ID dokumentu" + +#: templates/wiki/tabs/summary_view.html:19 +msgid "Current version" +msgstr "Aktualna wersja" + +#: templates/wiki/tabs/summary_view.html:22 +msgid "Last edited by" +msgstr "Ostatnio edytowane przez" + +#: templates/wiki/tabs/summary_view.html:26 +msgid "Link to gallery" +msgstr "Link do galerii" + +#: templates/wiki/tabs/summary_view.html:31 +msgid "Publish" +msgstr "Opublikuj" + +#: templates/wiki/tabs/summary_view_item.html:4 +msgid "Summary" +msgstr "Podsumowanie" + +#: templates/wiki/tabs/wysiwyg_editor.html:9 +msgid "Insert theme" +msgstr "Wstaw motyw" + +#: templates/wiki/tabs/wysiwyg_editor.html:12 +msgid "Insert annotation" +msgstr "Wstaw przypis" + +#: templates/wiki/tabs/wysiwyg_editor_item.html:3 +msgid "Visual editor" +msgstr "Edytor wizualny" diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html index 67b3c478..9657e0f6 100644 --- a/apps/wiki/templates/wiki/document_details.html +++ b/apps/wiki/templates/wiki/document_details.html @@ -22,8 +22,18 @@ {% include "wiki/tabs/source_editor.html" %} {% endblock %} +{% block tabs-right %} + {% include "wiki/tabs/gallery_view_item.html" %} + {% include "wiki/tabs/search_view_item.html" %} +{% endblock %} + {% block splitter-extra %} - {% include "wiki/tabs/gallery_view.html" %} +
+
+ {% endblock %} {% block dialogs %} diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html index 28567e1f..3c6843d7 100644 --- a/apps/wiki/templates/wiki/document_details_base.html +++ b/apps/wiki/templates/wiki/document_details_base.html @@ -38,11 +38,15 @@ | {% trans "Version" %}: {% trans "Unknown" %} {% if not readonly %} | + {% trans "Save attempt in progress" %} {% endif %} -
    +
      {% block tabs-menu %} {% endblock %}
    +
      + {% block tabs-right %} {% endblock %} +
    diff --git a/apps/wiki/templates/wiki/tabs/gallery_view.html b/apps/wiki/templates/wiki/tabs/gallery_view.html index 8f18372b..b4be5339 100644 --- a/apps/wiki/templates/wiki/tabs/gallery_view.html +++ b/apps/wiki/templates/wiki/tabs/gallery_view.html @@ -1,6 +1,4 @@ {% load i18n %} -
    -