fixes

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 4e5b2cb..f59b356 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -9,7 +9,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS
-from catalogue.models import Book, Chunk
+from catalogue.models import Book, Chunk, Image
 
 class DocumentCreateForm(forms.ModelForm):
     """
@@ -154,3 +154,30 @@ class ChooseMasterForm(forms.Form):
     """
 
     master = forms.ChoiceField(choices=((m, m) for m in MASTERS))
+
+
+class ImageForm(forms.ModelForm):
+    """Form used for editing an Image."""
+    user = forms.ModelChoiceField(queryset=
+        User.objects.annotate(count=Count('chunk')).
+        order_by('-count', 'last_name', 'first_name'), required=False,
+        label=_('Assigned to')) 
+
+    class Meta:
+        model = Image
+        fields = ['title', 'slug', 'user', 'stage']
+
+    def __init__(self, *args, **kwargs):
+        super(ImageForm, self).__init__(*args, **kwargs)
+        self.fields['slug'].widget.attrs={'class': 'autoslug'}
+        self.fields['title'].widget.attrs={'class': 'autoslug-source'}
+
+
+class ReadonlyImageForm(ImageForm):
+    """Form used for not editing a Book."""
+
+    def __init__(self, *args, **kwargs):
+        ret = super(ReadonlyImageForm, self).__init__(*args, **kwargs)
+        for field in self.fields.values():
+            field.widget.attrs.update({"readonly": True})
+        return ret

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index e6f7d3b..0739dc5 100644 (file)
Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 65d9ba3..9d80f9d 100644 (file)
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-01 16:21+0100\n"
-"PO-Revision-Date: 2011-12-01 16:23+0100\n"
+"POT-Creation-Date: 2011-12-14 15:25+0100\n"
+"PO-Revision-Date: 2011-12-14 15:27+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: pl\n"
@@ -34,6 +34,7 @@ msgid "Directories are documents in chunks"
 msgstr "Katalogi zawierają dokumenty w częściach"
 
 #: forms.py:76
+#: forms.py:164
 msgid "Assigned to"
 msgstr "Przypisane do"
 
@@ -46,30 +47,33 @@ msgstr "Część z tym slugiem już istnieje"
 msgid "Append to"
 msgstr "Dołącz do"
 
-#: views.py:158
+#: views.py:165
 #, python-format
 msgid "Slug already used for %s"
 msgstr "Slug taki sam jak dla pliku %s"
 
-#: views.py:160
+#: views.py:167
 msgid "Slug already used in repository."
 msgstr "Dokument o tym slugu już istnieje w repozytorium."
 
-#: views.py:166
+#: views.py:173
 msgid "File should be UTF-8 encoded."
 msgstr "Plik powinien mieć kodowanie UTF-8."
 
 #: models/book.py:23
 #: models/chunk.py:23
+#: models/image.py:20
 msgid "title"
 msgstr "tytuł"
 
 #: models/book.py:24
 #: models/chunk.py:24
+#: models/image.py:21
 msgid "slug"
 msgstr "slug"
 
 #: models/book.py:25
+#: models/image.py:22
 msgid "public"
 msgstr "publiczna"
 
@@ -85,37 +89,37 @@ msgstr "rodzic"
 msgid "parent number"
 msgstr "numeracja rodzica"
 
-#: models/book.py:45
+#: models/book.py:46
 #: models/chunk.py:21
 #: models/publish_log.py:17
 msgid "book"
 msgstr "książka"
 
-#: models/book.py:46
+#: models/book.py:47
 msgid "books"
 msgstr "książki"
 
-#: models/book.py:221
+#: models/book.py:222
 msgid "No chunks in the book."
 msgstr "Książka nie ma części."
 
-#: models/book.py:225
+#: models/book.py:226
 msgid "Not all chunks have publishable revisions."
 msgstr "Niektóre części nie są gotowe do publikacji."
 
-#: models/book.py:234
+#: models/book.py:235
 msgid "Invalid XML"
 msgstr "Nieprawidłowy XML"
 
-#: models/book.py:236
+#: models/book.py:237
 msgid "No Dublin Core found."
 msgstr "Brak sekcji Dublin Core."
 
-#: models/book.py:238
+#: models/book.py:239
 msgid "Invalid Dublin Core"
 msgstr "Nieprawidłowy Dublin Core"
 
-#: models/book.py:241
+#: models/book.py:242
 msgid "rdf:about is not"
 msgstr "rdf:about jest różny od"
 
@@ -135,11 +139,23 @@ msgstr "część"
 msgid "chunks"
 msgstr "części"
 
+#: models/image.py:19
+#: models/image.py:33
+#: models/publish_log.py:45
+msgid "image"
+msgstr "obraz"
+
+#: models/image.py:34
+msgid "images"
+msgstr "obrazy"
+
 #: models/publish_log.py:18
+#: models/publish_log.py:46
 msgid "time"
 msgstr "czas"
 
 #: models/publish_log.py:19
+#: models/publish_log.py:47
 #: templates/catalogue/wall.html:18
 msgid "user"
 msgstr "użytkownik"
@@ -154,6 +170,7 @@ msgid "book publish records"
 msgstr "zapisy publikacji książek"
 
 #: models/publish_log.py:34
+#: models/publish_log.py:48
 msgid "change"
 msgstr "zmiana"
 
@@ -165,6 +182,14 @@ msgstr "zapis publikacji części"
 msgid "chunk publish records"
 msgstr "zapisy publikacji części"
 
+#: models/publish_log.py:53
+msgid "image publish record"
+msgstr "zapis publikacji obrazu"
+
+#: models/publish_log.py:54
+msgid "image publish records"
+msgstr "zapisy publikacji obrazów"
+
 #: templates/catalogue/activity.html:10
 #: templatetags/catalogue.py:29
 msgid "Activity"
@@ -181,6 +206,7 @@ msgstr "Dołącz książkę"
 #: templates/catalogue/book_detail.html:14
 #: templates/catalogue/book_edit.html:9
 #: templates/catalogue/chunk_edit.html:13
+#: templates/catalogue/image_detail.html:14
 msgid "Save"
 msgstr "Zapisz"
 
@@ -234,6 +260,7 @@ msgid "This book can't be published yet, because:"
 msgstr "Ta książka nie może jeszcze zostać opublikowana. Powód:"
 
 #: templates/catalogue/book_detail.html:87
+#: templates/catalogue/image_detail.html:21
 msgid "Comments"
 msgstr "Komentarze"
 
@@ -290,7 +317,7 @@ msgstr "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie
 
 #: templates/catalogue/document_upload.html:17
 #: templates/catalogue/upload_pdf.html:13
-#: templatetags/catalogue.py:35
+#: templatetags/catalogue.py:36
 msgid "Upload"
 msgstr "Załaduj"
 
@@ -322,6 +349,49 @@ msgstr "Pominięte pliki"
 msgid "Files skipped due to no <code>.xml</code> extension"
 msgstr "Pliki pominięte z powodu braku rozszerzenia <code>.xml</code>."
 
+#: templates/catalogue/image_short.html:4
+msgid "Image settings"
+msgstr "Ustawienia obrazu"
+
+#: templates/catalogue/image_table.html:19
+#: templates/catalogue/book_list/book_list.html:24
+msgid "Search in book titles"
+msgstr "Szukaj w tytułach książek"
+
+#: templates/catalogue/image_table.html:24
+#: templates/catalogue/book_list/book_list.html:29
+msgid "stage"
+msgstr "etap"
+
+#: templates/catalogue/image_table.html:26
+#: templates/catalogue/image_table.html:37
+#: templates/catalogue/book_list/book_list.html:31
+#: templates/catalogue/book_list/book_list.html:42
+msgid "none"
+msgstr "brak"
+
+#: templates/catalogue/image_table.html:35
+#: templates/catalogue/book_list/book_list.html:40
+msgid "editor"
+msgstr "redaktor"
+
+#: templates/catalogue/image_table.html:46
+#: templates/catalogue/book_list/book_list.html:51
+msgid "status"
+msgstr "status"
+
+#: templates/catalogue/image_table.html:63
+#, python-format
+msgid "%(c)s image"
+msgid_plural "%(c)s images"
+msgstr[0] "%(c)s obraz"
+msgstr[1] "%(c)s obrazy"
+msgstr[2] "%(c)s obrazów"
+
+#: templates/catalogue/image_table.html:68
+msgid "No images found."
+msgstr "Nie znaleziono obrazów."
+
 #: templates/catalogue/my_page.html:13
 msgid "Your last edited documents"
 msgstr "Twoje ostatnie edycje"
@@ -336,7 +406,7 @@ msgid "PDF file upload"
 msgstr ""
 
 #: templates/catalogue/user_list.html:7
-#: templatetags/catalogue.py:31
+#: templatetags/catalogue.py:32
 msgid "Users"
 msgstr "Użytkownicy"
 
@@ -357,27 +427,6 @@ msgstr "Ustawienia książki"
 msgid "Show hidden books"
 msgstr "Pokaż ukryte książki"
 
-#: templates/catalogue/book_list/book_list.html:24
-msgid "Search in book titles"
-msgstr "Szukaj w tytułach książek"
-
-#: templates/catalogue/book_list/book_list.html:29
-msgid "stage"
-msgstr "etap"
-
-#: templates/catalogue/book_list/book_list.html:31
-#: templates/catalogue/book_list/book_list.html:42
-msgid "none"
-msgstr "brak"
-
-#: templates/catalogue/book_list/book_list.html:40
-msgid "editor"
-msgstr "redaktor"
-
-#: templates/catalogue/book_list/book_list.html:51
-msgid "status"
-msgstr "status"
-
 #: templates/catalogue/book_list/book_list.html:75
 #, python-format
 msgid "%(c)s book"
@@ -391,22 +440,27 @@ msgid "No books found."
 msgstr "Nie znaleziono książek."
 
 #: templatetags/book_list.py:84
+#: templatetags/book_list.py:145
 msgid "publishable"
 msgstr "do publikacji"
 
 #: templatetags/book_list.py:85
+#: templatetags/book_list.py:146
 msgid "changed"
 msgstr "zmienione"
 
 #: templatetags/book_list.py:86
+#: templatetags/book_list.py:147
 msgid "published"
 msgstr "opublikowane"
 
 #: templatetags/book_list.py:87
+#: templatetags/book_list.py:148
 msgid "unpublished"
 msgstr "nie opublikowane"
 
 #: templatetags/book_list.py:88
+#: templatetags/book_list.py:149
 msgid "empty"
 msgstr "puste"
 
@@ -418,7 +472,11 @@ msgstr "Moja strona"
 msgid "All"
 msgstr "Wszystkie"
 
-#: templatetags/catalogue.py:34
+#: templatetags/catalogue.py:31
+msgid "Images"
+msgstr "Obrazy"
+
+#: templatetags/catalogue.py:35
 msgid "Add"
 msgstr "Dodaj"
 

diff --git a/apps/catalogue/models/image.py b/apps/catalogue/models/image.py
index 53f8830..c5d6bf0 100755 (executable)
--- a/apps/catalogue/models/image.py
+++ b/apps/catalogue/models/image.py
@@ -42,7 +42,7 @@ class Image(dvcs_models.Document):
 
     @models.permalink
     def get_absolute_url(self):
-        return ("wiki_img_editor", [self.slug])
+        return ("catalogue_image", [self.slug])
 
     # State & cache
     # =============

diff --git a/apps/catalogue/templates/catalogue/image_detail.html b/apps/catalogue/templates/catalogue/image_detail.html
new file mode 100755 (executable)
index 0000000..fea775b
--- /dev/null
+++ b/apps/catalogue/templates/catalogue/image_detail.html
@@ -0,0 +1,29 @@
+{% extends "catalogue/base.html" %}
+{% load book_list comments i18n %}
+
+{% block content %}
+
+
+<h1>{{ object.title }}</h1>
+
+
+{% if editable %}<form method='POST'>{% csrf_token %}{% endif %}
+<table class='editable'><tbody>
+    {{ form.as_table }}
+    {% if editable %}
+        <tr><td></td><td><button type="submit">{% trans "Save" %}</button></td></tr>
+    {% endif %}
+</tbody></table>
+{% if editable %}</form>{% endif %}
+
+
+<div class='section'>
+    <h2>{% trans "Comments" %}</h2>
+
+    {% render_comment_list for object %}
+    {% with object.get_absolute_url as next %}
+        {% render_comment_form for object %}
+    {% endwith %}
+</div>
+
+{% endblock content %}

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 3c37ee6..52008c9 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -23,7 +23,8 @@ from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab
-from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord
+from catalogue.models import (Book, Chunk, BookPublishRecord, 
+        ChunkPublishRecord, Image)
 from catalogue.tasks import publishable_error
 
 #

diff --git a/apps/dvcs/locale/pl/LC_MESSAGES/django.mo b/apps/dvcs/locale/pl/LC_MESSAGES/django.mo
index 4c3a1ff..dfd85c2 100644 (file)
Binary files a/apps/dvcs/locale/pl/LC_MESSAGES/django.mo and b/apps/dvcs/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/dvcs/locale/pl/LC_MESSAGES/django.po b/apps/dvcs/locale/pl/LC_MESSAGES/django.po
index 64ddfd7..c0365d5 100644 (file)
--- a/apps/dvcs/locale/pl/LC_MESSAGES/django.po
+++ b/apps/dvcs/locale/pl/LC_MESSAGES/django.po
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 15:35+0200\n"
-"PO-Revision-Date: 2011-10-03 15:35+0100\n"
+"POT-Creation-Date: 2011-12-14 15:25+0100\n"
+"PO-Revision-Date: 2011-12-14 15:27+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: models.py:19
 msgid "name"
@@ -30,86 +29,96 @@ msgstr "slug"
 msgid "ordering"
 msgstr "kolejność"
 
-#: models.py:29
-msgid "tag"
-msgstr "tag"
-
-#: models.py:30 models.py:196
-msgid "tags"
-msgstr "tagi"
-
-#: models.py:72
+#: models.py:70
 msgid "author"
 msgstr "autor"
 
-#: models.py:73
+#: models.py:71
 msgid "author name"
 msgstr "imię i nazwisko autora"
 
-#: models.py:75 models.py:79
+#: models.py:73
+#: models.py:77
 msgid "Used if author is not set."
 msgstr "Używane, gdy nie jest ustawiony autor."
 
-#: models.py:77
+#: models.py:75
 msgid "author email"
 msgstr "e-mail autora"
 
-#: models.py:81
+#: models.py:79
 msgid "revision"
 msgstr "rewizja"
 
-#: models.py:85
+#: models.py:83
 msgid "parent"
 msgstr "rodzic"
 
-#: models.py:90
+#: models.py:88
 msgid "merge parent"
 msgstr "drugi rodzic"
 
-#: models.py:93
+#: models.py:91
 msgid "description"
 msgstr "opis"
 
-#: models.py:96
+#: models.py:94
 msgid "publishable"
 msgstr "do publikacji"
 
-#: models.py:102
+#: models.py:176
+msgid "tag"
+msgstr "tag"
+
+#: models.py:176
+#: models.py:178
+#: models.py:194
+#: models.py:196
+msgid "for:"
+msgstr "dla:"
+
+#: models.py:178
+#: models.py:202
+msgid "tags"
+msgstr "tagi"
+
+#: models.py:194
 msgid "change"
 msgstr "zmiana"
 
-#: models.py:103
+#: models.py:196
 msgid "changes"
 msgstr "zmiany"
 
-#: models.py:195
+#: models.py:201
 msgid "document"
 msgstr "dokument"
 
-#: models.py:197
+#: models.py:203
 msgid "data"
 msgstr "dane"
 
-#: models.py:211
+#: models.py:217
 msgid "stage"
 msgstr "etap"
 
-#: models.py:219
+#: models.py:225
 msgid "head"
 msgstr "głowica"
 
-#: models.py:220
+#: models.py:226
 msgid "This document's current head."
 msgstr "Aktualna wersja dokumentu."
 
-#: models.py:224
+#: models.py:230
 msgid "creator"
 msgstr "utworzył"
 
-#: models.py:239
+#: models.py:245
 msgid "user"
 msgstr "użytkownik"
 
-#: models.py:239
+#: models.py:245
 msgid "Work assignment."
 msgstr "Przypisanie pracy użytkownikowi."
+

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index d7816fa..2526028 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -6,7 +6,7 @@ from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage
 from django.db import models, transaction
 from django.db.models.base import ModelBase
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import string_concat, ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 
 from django.conf import settings
@@ -26,8 +26,6 @@ class Tag(models.Model):
     class Meta:
         abstract = True
         ordering = ['ordering']
-        verbose_name = _("tag")
-        verbose_name_plural = _("tags")
 
     def __unicode__(self):
         return self.name
@@ -99,8 +97,6 @@ class Change(models.Model):
         abstract = True
         ordering = ('created_at',)
         unique_together = ['tree', 'revision']
-        verbose_name = _("change")
-        verbose_name_plural = _("changes")
 
     def __unicode__(self):
         return u"Id: %r, Tree %r, Parent %r, Data: %s" % (self.id, self.tree_id, self.parent_id, self.data)
@@ -170,11 +166,17 @@ class Change(models.Model):
         post_publishable.send(sender=self, publishable=publishable)
 
 
+
+
 def create_tag_model(model):
     name = model.__name__ + 'Tag'
 
     class Meta(Tag.Meta):
         app_label = model._meta.app_label
+        verbose_name = string_concat(_("tag"), " ", _("for:"), " ", 
+                model._meta.verbose_name)
+        verbose_name_plural = string_concat(_("tags"), " ", _("for:"), " ",
+                model._meta.verbose_name)
 
     attrs = {
         '__module__': model.__module__,
@@ -189,6 +191,10 @@ def create_change_model(model):
 
     class Meta(Change.Meta):
         app_label = model._meta.app_label
+        verbose_name = string_concat(_("change"), " ", _("for:"), " ",
+                model._meta.verbose_name)
+        verbose_name_plural = string_concat(_("changes"), " ", _("for:"), " ",
+                model._meta.verbose_name)
 
     attrs = {
         '__module__': model.__module__,

diff --git a/apps/dvcs/views.py b/apps/dvcs/views.py
deleted file mode 100644 (file)
index 7918e96..0000000
--- a/apps/dvcs/views.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Create your views here.
-from django.views.generic.simple import direct_to_template
-from django import http
-from dvcs.models import Document
-
-def document_list(request, template_name="dvcs/document_list.html"):
-    return direct_to_template(request, template_name, {
-        "documents": Document.objects.all(),
-    })
-
-def document_data(request, document_id, version=None):
-    doc = Document.objects.get(pk=document_id)
-    return http.HttpResponse(doc.materialize(version or None), content_type="text/plain")
-
-def document_history(request, docid, template_name="dvcs/document_history.html"):
-    document = Document.objects.get(pk=docid)
-    return direct_to_template(request, template_name, {
-        "document": document,
-        "changes": document.history(),
-    })
-

diff --git a/apps/wiki_img/locale/pl/LC_MESSAGES/django.mo b/apps/wiki_img/locale/pl/LC_MESSAGES/django.mo
index c334ead..3987728 100644 (file)
Binary files a/apps/wiki_img/locale/pl/LC_MESSAGES/django.mo and b/apps/wiki_img/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/wiki_img/locale/pl/LC_MESSAGES/django.po b/apps/wiki_img/locale/pl/LC_MESSAGES/django.po
index 568e844..432d289 100644 (file)
--- a/apps/wiki_img/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki_img/locale/pl/LC_MESSAGES/django.po
@@ -7,340 +7,301 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-29 15:34+0200\n"
-"PO-Revision-Date: 2010-09-29 15:36+0100\n"
+"POT-Creation-Date: 2011-12-14 15:25+0100\n"
+"PO-Revision-Date: 2011-12-14 15:26+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
+"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"
+#: forms.py:18
+msgid "Completed"
+msgstr "Ukończono"
 
-#: constants.py:7
-msgid "Tagging"
-msgstr "Tagowanie"
+#: forms.py:19
+msgid "If you completed a life cycle stage, select it."
+msgstr "Jeśli został ukończony etap prac, wskaż go."
 
-#: constants.py:8
-msgid "Initial Proofreading"
-msgstr "Korekta"
+#: views.py:126
+msgid "Publishable"
+msgstr "Gotowe do publikacji"
 
-#: constants.py:9
-msgid "Annotation Proofreading"
-msgstr "Sprawdzenie przypisów źródła"
+#: templates/wiki_img/base.html:15
+msgid "Platforma Redakcyjna"
+msgstr ""
 
-#: constants.py:10
-msgid "Modernisation"
-msgstr "Uwspółcześnienie"
+#: templates/wiki_img/diff_table.html:5
+msgid "Old version"
+msgstr "Stara wersja"
 
-#: constants.py:11
-#: templates/wiki/tabs/annotations_view_item.html:3
-msgid "Annotations"
-msgstr "Przypisy"
+#: templates/wiki_img/diff_table.html:6
+msgid "New version"
+msgstr "Nowa wersja"
 
-#: constants.py:12
-msgid "Themes"
-msgstr "Motywy"
+#: templates/wiki_img/document_details_base.html:31
+msgid "Help"
+msgstr "Pomoc"
 
-#: constants.py:13
-msgid "Editor's Proofreading"
-msgstr "Ostateczna redakcja literacka"
+#: templates/wiki_img/document_details_base.html:33
+msgid "Version"
+msgstr "Wersja"
 
-#: constants.py:14
-msgid "Technical Editor's Proofreading"
-msgstr "Ostateczna redakcja techniczna"
+#: templates/wiki_img/document_details_base.html:33
+msgid "Unknown"
+msgstr "nieznana"
 
-#: constants.py:18
-msgid "Ready to publish"
-msgstr "Gotowe do publikacji"
+#: templates/wiki_img/document_details_base.html:35
+#: templates/wiki_img/tag_dialog.html:15
+msgid "Save"
+msgstr "Zapisz"
 
-#: forms.py:49
-msgid "ZIP file"
-msgstr "Plik ZIP"
+#: templates/wiki_img/document_details_base.html:36
+msgid "Save attempt in progress"
+msgstr "Trwa zapisywanie"
 
-#: forms.py:82
-msgid "Author"
-msgstr "Autor"
+#: templates/wiki_img/document_details_base.html:37
+msgid "There is a newer version of this document!"
+msgstr "Istnieje nowsza wersja tego dokumentu!"
 
-#: forms.py:83
-msgid "Your name"
-msgstr "Imię i nazwisko"
+#: templates/wiki_img/tag_dialog.html:16
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: forms.py:88
-msgid "Author's email"
-msgstr "E-mail autora"
+#: templates/wiki_img/tabs/history_view.html:5
+msgid "Compare versions"
+msgstr "Porównaj wersje"
 
-#: forms.py:89
-msgid "Your email address, so we can show a gravatar :)"
-msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
+#: templates/wiki_img/tabs/history_view.html:8
+msgid "Mark for publishing"
+msgstr "Oznacz do publikacji"
 
-#: forms.py:95
-msgid "Your comments"
-msgstr "Twój komentarz"
+#: templates/wiki_img/tabs/history_view.html:11
+msgid "Revert document"
+msgstr "Przywróć wersję"
 
-#: forms.py:96
-msgid "Describe changes you made."
-msgstr "Opisz swoje zmiany"
+#: templates/wiki_img/tabs/history_view.html:14
+msgid "View version"
+msgstr "Zobacz wersję"
 
-#: forms.py:102
-msgid "Completed"
-msgstr "Ukończono"
+#: templates/wiki_img/tabs/motifs_editor.html:4
+#: templates/wiki_img/tabs/motifs_editor_item.html:3
+msgid "Motifs"
+msgstr "Motywy"
 
-#: forms.py:103
-msgid "If you completed a life cycle stage, select it."
-msgstr "Jeśli został ukończony etap prac, wskaż go."
+#: templates/wiki_img/tabs/motifs_editor.html:5
+#: templates/wiki_img/tabs/objects_editor.html:5
+msgid "Add"
+msgstr "Dodaj"
 
-#: models.py:93
-#, python-format
-msgid "Finished stage: %s"
-msgstr "Ukończony etap: %s"
+#: templates/wiki_img/tabs/objects_editor.html:4
+msgid "Object name"
+msgstr "Nazwa obiektu"
 
-#: models.py:152
-msgid "name"
-msgstr "nazwa"
+#: templates/wiki_img/tabs/objects_editor_item.html:3
+msgid "Objects"
+msgstr "Obiekty"
 
-#: models.py:156
-msgid "theme"
-msgstr "motyw"
+#: templates/wiki_img/tabs/source_editor_item.html:5
+msgid "Source code"
+msgstr "Kod źródłowy"
 
-#: models.py:157
-msgid "themes"
-msgstr "motywy"
+#: templates/wiki_img/tabs/summary_view.html:8
+msgid "Title"
+msgstr "Tytuł"
 
-#: views.py:167
-#, python-format
-msgid "Title already used for %s"
-msgstr "Nazwa taka sama jak dla pliku %s"
+#: templates/wiki_img/tabs/summary_view.html:13
+msgid "Document ID"
+msgstr "ID dokumentu"
 
-#: views.py:169
-msgid "Title already used in repository."
-msgstr "Plik o tej nazwie już istnieje w repozytorium."
+#: templates/wiki_img/tabs/summary_view.html:17
+msgid "Current version"
+msgstr "Aktualna wersja"
 
-#: views.py:175
-msgid "File should be UTF-8 encoded."
-msgstr "Plik powinien mieć kodowanie UTF-8."
+#: templates/wiki_img/tabs/summary_view.html:20
+msgid "Last edited by"
+msgstr "Ostatnio edytowane przez"
 
-#: views.py:358
-msgid "Tag added"
-msgstr "Dodano tag"
+#: templates/wiki_img/tabs/summary_view_item.html:4
+msgid "Summary"
+msgstr "Podsumowanie"
 
-#: templates/wiki/base.html:15
-msgid "Platforma Redakcyjna"
-msgstr ""
+#~ msgid "First correction"
+#~ msgstr "Autokorekta"
 
-#: templates/wiki/diff_table.html:5
-msgid "Old version"
-msgstr "Stara wersja"
+#~ msgid "Tagging"
+#~ msgstr "Tagowanie"
 
-#: templates/wiki/diff_table.html:6
-msgid "New version"
-msgstr "Nowa wersja"
+#~ msgid "Initial Proofreading"
+#~ msgstr "Korekta"
 
-#: templates/wiki/document_create_missing.html:8
-msgid "Create document"
-msgstr "Utwórz dokument"
+#~ msgid "Annotation Proofreading"
+#~ msgstr "Sprawdzenie przypisów źródła"
 
-#: templates/wiki/document_details.html:32
-msgid "Click to open/close gallery"
-msgstr "Kliknij, aby (ro)zwinąć galerię"
+#~ msgid "Modernisation"
+#~ msgstr "Uwspółcześnienie"
 
-#: templates/wiki/document_details_base.html:36
-msgid "Help"
-msgstr "Pomoc"
+#~ msgid "Annotations"
+#~ msgstr "Przypisy"
 
-#: templates/wiki/document_details_base.html:38
-msgid "Version"
-msgstr "Wersja"
+#~ msgid "Themes"
+#~ msgstr "Motywy"
 
-#: templates/wiki/document_details_base.html:38
-msgid "Unknown"
-msgstr "nieznana"
+#~ msgid "Editor's Proofreading"
+#~ msgstr "Ostateczna redakcja literacka"
 
-#: templates/wiki/document_details_base.html:40
-#: templates/wiki/tag_dialog.html:15
-msgid "Save"
-msgstr "Zapisz"
+#~ msgid "Technical Editor's Proofreading"
+#~ msgstr "Ostateczna redakcja techniczna"
 
-#: templates/wiki/document_details_base.html:41
-msgid "Save attempt in progress"
-msgstr "Trwa zapisywanie"
+#~ msgid "ZIP file"
+#~ msgstr "Plik ZIP"
 
-#: templates/wiki/document_details_base.html:42
-msgid "There is a newer version of this document!"
-msgstr "Istnieje nowsza wersja tego dokumentu!"
+#~ msgid "Author"
+#~ msgstr "Autor"
 
-#: templates/wiki/document_list.html:30
-msgid "Clear filter"
-msgstr "Wyczyść filtr"
+#~ msgid "Your name"
+#~ msgstr "Imię i nazwisko"
 
-#: templates/wiki/document_list.html:48
-msgid "Your last edited documents"
-msgstr "Twoje ostatnie edycje"
+#~ msgid "Author's email"
+#~ msgstr "E-mail autora"
 
-#: templates/wiki/document_upload.html:9
-msgid "Bulk documents upload"
-msgstr "Hurtowe dodawanie dokumentów"
+#~ msgid "Your email address, so we can show a gravatar :)"
+#~ msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 
-#: templates/wiki/document_upload.html:12
-msgid "Please submit a ZIP with UTF-8 encoded XML files. Files not ending with <code>.xml</code> will be ignored."
-msgstr "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie kończące się na <code>.xml</code> zostaną zignorowane."
+#~ msgid "Your comments"
+#~ msgstr "Twój komentarz"
 
-#: templates/wiki/document_upload.html:17
-msgid "Upload"
-msgstr "Dodaj"
+#~ msgid "Describe changes you made."
+#~ msgstr "Opisz swoje zmiany"
 
-#: templates/wiki/document_upload.html:24
-msgid "There have been some errors. No files have been added to the repository."
-msgstr "Wystąpiły błędy. Żadne pliki nie zostały dodane do repozytorium."
+#~ msgid "Finished stage: %s"
+#~ msgstr "Ukończony etap: %s"
 
-#: templates/wiki/document_upload.html:25
-msgid "Offending files"
-msgstr "Błędne pliki"
+#~ msgid "name"
+#~ msgstr "nazwa"
 
-#: templates/wiki/document_upload.html:33
-msgid "Correct files"
-msgstr "Poprawne pliki"
+#~ msgid "theme"
+#~ msgstr "motyw"
 
-#: templates/wiki/document_upload.html:44
-msgid "Files have been successfully uploaded to the repository."
-msgstr "Pliki zostały dodane do repozytorium."
+#~ msgid "themes"
+#~ msgstr "motywy"
 
-#: templates/wiki/document_upload.html:45
-msgid "Uploaded files"
-msgstr "Dodane pliki"
+#~ msgid "Title already used for %s"
+#~ msgstr "Nazwa taka sama jak dla pliku %s"
 
-#: templates/wiki/document_upload.html:55
-msgid "Skipped files"
-msgstr "Pominięte pliki"
+#~ msgid "Title already used in repository."
+#~ msgstr "Plik o tej nazwie już istnieje w repozytorium."
 
-#: templates/wiki/document_upload.html:56
-msgid "Files skipped due to no <code>.xml</code> extension"
-msgstr "Pliki pominięte z powodu braku rozszerzenia <code>.xml</code>."
+#~ msgid "File should be UTF-8 encoded."
+#~ msgstr "Plik powinien mieć kodowanie UTF-8."
 
-#: templates/wiki/tag_dialog.html:16
-msgid "Cancel"
-msgstr "Anuluj"
+#~ msgid "Tag added"
+#~ msgstr "Dodano tag"
 
-#: templates/wiki/tabs/annotations_view.html:5
-msgid "Refresh"
-msgstr "Odśwież"
+#~ msgid "Create document"
+#~ msgstr "Utwórz dokument"
 
-#: templates/wiki/tabs/gallery_view.html:7
-msgid "Previous"
-msgstr "Poprzednie"
+#~ msgid "Click to open/close gallery"
+#~ msgstr "Kliknij, aby (ro)zwinąć galerię"
 
-#: templates/wiki/tabs/gallery_view.html:13
-msgid "Next"
-msgstr "Następne"
+#~ msgid "Clear filter"
+#~ msgstr "Wyczyść filtr"
 
-#: templates/wiki/tabs/gallery_view.html:15
-msgid "Zoom in"
-msgstr "Powiększ"
+#~ msgid "Your last edited documents"
+#~ msgstr "Twoje ostatnie edycje"
 
-#: templates/wiki/tabs/gallery_view.html:16
-msgid "Zoom out"
-msgstr "Zmniejsz"
+#~ msgid "Bulk documents upload"
+#~ msgstr "Hurtowe dodawanie dokumentów"
 
-#: templates/wiki/tabs/gallery_view_item.html:3
-msgid "Gallery"
-msgstr "Galeria"
+#~ msgid ""
+#~ "Please submit a ZIP with UTF-8 encoded XML files. Files not ending with "
+#~ "<code>.xml</code> will be ignored."
+#~ msgstr ""
+#~ "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie "
+#~ "kończące się na <code>.xml</code> zostaną zignorowane."
 
-#: templates/wiki/tabs/history_view.html:5
-msgid "Compare versions"
-msgstr "Porównaj wersje"
+#~ msgid "Upload"
+#~ msgstr "Dodaj"
 
-#: templates/wiki/tabs/history_view.html:7
-msgid "Mark version"
-msgstr "Oznacz wersję"
+#~ msgid ""
+#~ "There have been some errors. No files have been added to the repository."
+#~ msgstr "Wystąpiły błędy. Żadne pliki nie zostały dodane do repozytorium."
 
-#: templates/wiki/tabs/history_view.html:9
-msgid "Revert document"
-msgstr "Przywróć wersję"
+#~ msgid "Offending files"
+#~ msgstr "Błędne pliki"
 
-#: templates/wiki/tabs/history_view.html:12
-msgid "View version"
-msgstr "Zobacz wersję"
+#~ msgid "Correct files"
+#~ msgstr "Poprawne pliki"
 
-#: templates/wiki/tabs/history_view_item.html:3
-msgid "History"
-msgstr "Historia"
+#~ msgid "Files have been successfully uploaded to the repository."
+#~ msgstr "Pliki zostały dodane do repozytorium."
 
-#: templates/wiki/tabs/search_view.html:3
-#: templates/wiki/tabs/search_view.html:5
-msgid "Search"
-msgstr "Szukaj"
+#~ msgid "Uploaded files"
+#~ msgstr "Dodane pliki"
 
-#: templates/wiki/tabs/search_view.html:8
-msgid "Replace with"
-msgstr "Zamień na"
+#~ msgid "Skipped files"
+#~ msgstr "Pominięte pliki"
 
-#: templates/wiki/tabs/search_view.html:10
-msgid "Replace"
-msgstr "Zamień"
+#~ msgid "Files skipped due to no <code>.xml</code> extension"
+#~ msgstr "Pliki pominięte z powodu braku rozszerzenia <code>.xml</code>."
 
-#: templates/wiki/tabs/search_view.html:13
-msgid "Options"
-msgstr "Opcje"
+#~ msgid "Refresh"
+#~ msgstr "Odśwież"
 
-#: templates/wiki/tabs/search_view.html:15
-msgid "Case sensitive"
-msgstr "Rozróżniaj wielkość liter"
+#~ msgid "Previous"
+#~ msgstr "Poprzednie"
 
-#: templates/wiki/tabs/search_view.html:17
-msgid "From cursor"
-msgstr "Zacznij od kursora"
+#~ msgid "Next"
+#~ msgstr "Następne"
 
-#: templates/wiki/tabs/search_view_item.html:3
-msgid "Search and replace"
-msgstr "Znajdź i zamień"
+#~ msgid "Zoom in"
+#~ msgstr "Powiększ"
 
-#: templates/wiki/tabs/source_editor_item.html:5
-msgid "Source code"
-msgstr "Kod źródłowy"
+#~ msgid "Zoom out"
+#~ msgstr "Zmniejsz"
 
-#: templates/wiki/tabs/summary_view.html:10
-msgid "Title"
-msgstr "Tytuł"
+#~ msgid "Gallery"
+#~ msgstr "Galeria"
 
-#: templates/wiki/tabs/summary_view.html:15
-msgid "Document ID"
-msgstr "ID dokumentu"
+#~ msgid "Mark version"
+#~ msgstr "Oznacz wersję"
 
-#: templates/wiki/tabs/summary_view.html:19
-msgid "Current version"
-msgstr "Aktualna wersja"
+#~ msgid "History"
+#~ msgstr "Historia"
 
-#: templates/wiki/tabs/summary_view.html:22
-msgid "Last edited by"
-msgstr "Ostatnio edytowane przez"
+#~ msgid "Search"
+#~ msgstr "Szukaj"
 
-#: templates/wiki/tabs/summary_view.html:26
-msgid "Link to gallery"
-msgstr "Link do galerii"
+#~ msgid "Replace with"
+#~ msgstr "Zamień na"
 
-#: templates/wiki/tabs/summary_view.html:31
-msgid "Publish"
-msgstr "Opublikuj"
+#~ msgid "Replace"
+#~ msgstr "Zamień"
 
-#: templates/wiki/tabs/summary_view_item.html:4
-msgid "Summary"
-msgstr "Podsumowanie"
+#~ msgid "Options"
+#~ msgstr "Opcje"
+
+#~ msgid "Case sensitive"
+#~ msgstr "Rozróżniaj wielkość liter"
+
+#~ msgid "From cursor"
+#~ msgstr "Zacznij od kursora"
+
+#~ msgid "Search and replace"
+#~ msgstr "Znajdź i zamień"
 
-#: templates/wiki/tabs/wysiwyg_editor.html:9
-msgid "Insert theme"
-msgstr "Wstaw motyw"
+#~ msgid "Link to gallery"
+#~ msgstr "Link do galerii"
 
-#: templates/wiki/tabs/wysiwyg_editor.html:12
-msgid "Insert annotation"
-msgstr "Wstaw przypis"
+#~ msgid "Insert theme"
+#~ msgstr "Wstaw motyw"
 
-#: templates/wiki/tabs/wysiwyg_editor.html:15
-msgid "Insert special character"
-msgstr "Wstaw znak specjalny"
+#~ msgid "Insert annotation"
+#~ msgstr "Wstaw przypis"
 
-#: templates/wiki/tabs/wysiwyg_editor_item.html:3
-msgid "Visual editor"
-msgstr "Edytor wizualny"
+#~ msgid "Insert special character"
+#~ msgstr "Wstaw znak specjalny"
 
+#~ msgid "Visual editor"
+#~ msgstr "Edytor wizualny"