changeset 2031:f1a134e749c7

update de, ru, pt_BR translations (ru and pt_BR needs help!)
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 03 Mar 2013 19:52:02 +0100
parents 013c1cf8358f
children 4307c3e76076
files MoinMoin/translations/de/LC_MESSAGES/messages.po MoinMoin/translations/pt_BR/LC_MESSAGES/messages.po MoinMoin/translations/ru/LC_MESSAGES/messages.po
diffstat 3 files changed, 2195 insertions(+), 1597 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/translations/de/LC_MESSAGES/messages.po	Sun Mar 03 19:39:31 2013 +0100
+++ b/MoinMoin/translations/de/LC_MESSAGES/messages.po	Sun Mar 03 19:52:02 2013 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: MoinMoin 2.0\n"
 "Report-Msgid-Bugs-To: German <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2012-08-26 22:24+0200\n"
+"POT-Creation-Date: 2013-03-03 19:37+0100\n"
 "PO-Revision-Date: 2011-03-20 23:37+0100\n"
 "Last-Translator: Julian Brost <julian.brost@googlemail.com>\n"
 "Language-Team: German <moin-user@lists.sourceforge.net>\n"
@@ -18,67 +18,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/forms.py:45
+#: MoinMoin/forms.py:73
 msgid "Invalid JSON."
 msgstr "Ungültiges JSON"
 
-#: MoinMoin/forms.py:58
+#: MoinMoin/forms.py:86
 msgid "OpenID"
 msgstr "OpenID"
 
-#: MoinMoin/forms.py:58
+#: MoinMoin/forms.py:86
 msgid "OpenID address"
 msgstr "OpenID-Adresse"
 
-#: MoinMoin/forms.py:60
+#: MoinMoin/forms.py:88
 msgid "Your OpenID address"
 msgstr "Ihre OpenID-Adresse"
 
-#: MoinMoin/forms.py:62
+#: MoinMoin/forms.py:90
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: MoinMoin/forms.py:62
+#: MoinMoin/forms.py:91
 msgid "E-Mail address"
 msgstr "E-Mail-Adresse"
 
-#: MoinMoin/forms.py:64
+#: MoinMoin/forms.py:93
 msgid "Your E-Mail address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: MoinMoin/forms.py:66
+#: MoinMoin/forms.py:95
 msgid "Password"
 msgstr "Passwort"
 
-#: MoinMoin/forms.py:91 MoinMoin/config/default.py:336
+#: MoinMoin/forms.py:130 MoinMoin/config/default.py:366
 msgid "Tags"
 msgstr "Schlagworte"
 
-#: MoinMoin/forms.py:93
+#: MoinMoin/forms.py:133 MoinMoin/apps/frontend/views.py:1399
+msgid "Names"
+msgstr "Namen"
+
+#: MoinMoin/forms.py:135
 msgid "Search Query"
 msgstr "Such-Anfrage"
 
-#: MoinMoin/forms.py:139
+#: MoinMoin/forms.py:182
 msgid "YYYY-MM-DD HH:MM:SS (example: 2013-12-31 23:59:59)"
 msgstr "JJJJ-MM-TT HH:MM:SS (z.B.: 2013-12-31 23:59:59)"
 
-#: MoinMoin/forms.py:140
+#: MoinMoin/forms.py:183
 msgid "Please use the following format: YYYY-MM-DD HH:MM:SS"
 msgstr "Bitte benutzen Sie folgendes Format: JJJJ-MM-TT HH:MM:SS"
 
-#: MoinMoin/forms.py:144
-msgid "OK"
-msgstr "OK"
-
-#: MoinMoin/forms.py:160
+#: MoinMoin/forms.py:201
 msgid "Invalid Reference."
 msgstr "Ungültige Referenz."
 
-#: MoinMoin/forms.py:167
+#: MoinMoin/forms.py:209
 msgid "(None)"
 msgstr "(Nichts)"
 
-#: MoinMoin/user.py:54
+#: MoinMoin/user.py:56
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -91,16 +91,16 @@
 "vorkommen dürfen. Der Benutzername darf auch kein existierender "
 "Gruppenname sein."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:62
 msgid "This user name already belongs to somebody else."
 msgstr "Dieser Benutzername ist bereits vergeben."
 
-#: MoinMoin/user.py:68
+#: MoinMoin/user.py:71
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Dieses Passwort ist nicht ausreichend: %(msg)s"
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:77
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
@@ -108,15 +108,15 @@
 "Bitte geben Sie Ihre E-Mail-Adresse an. Wenn Sie Ihre Logindaten "
 "vergessen, können Sie Ihnen per E-Mail zugesendet werden."
 
-#: MoinMoin/user.py:84
+#: MoinMoin/user.py:83
 msgid "This email already belongs to somebody else."
 msgstr "Diese E-Mail-Adresse wird bereits verwendet."
 
-#: MoinMoin/user.py:90
+#: MoinMoin/user.py:89
 msgid "This OpenID already belongs to somebody else."
 msgstr "Diese OpenID gehört bereits zu jemand anderem."
 
-#: MoinMoin/user.py:730
+#: MoinMoin/user.py:759
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -140,12 +140,12 @@
 "ignorieren.\n"
 "\n"
 
-#: MoinMoin/user.py:733
+#: MoinMoin/user.py:761
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Passwort vergessen"
 
-#: MoinMoin/user.py:751
+#: MoinMoin/user.py:779
 #, python-format
 msgid ""
 "Somebody has created an account with this email address.\n"
@@ -168,161 +168,127 @@
 "E-Mail ignorieren.\n"
 "\n"
 
-#: MoinMoin/user.py:754
+#: MoinMoin/user.py:781
 #, python-format
 msgid "[%(sitename)s] Please verify your email address"
 msgstr "[%(sitename)s] Bitte überprüfen Sie Ihre E-Mail-Addresse"
 
-#: MoinMoin/apps/admin/views.py:31 MoinMoin/config/default.py:338
+#: MoinMoin/apps/admin/views.py:31 MoinMoin/config/default.py:368
 msgid "Admin"
 msgstr "Admin"
 
-#: MoinMoin/apps/admin/views.py:35 MoinMoin/config/default.py:337
+#: MoinMoin/apps/admin/views.py:36 MoinMoin/config/default.py:367
 msgid "User"
 msgstr "Benutzer"
 
 #: MoinMoin/apps/admin/views.py:53
 #: MoinMoin/apps/admin/templates/admin/index.html:5
-msgid "User Browser"
-msgstr "Benutzer-Browser"
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:3
+msgid "Users"
+msgstr "Benutzer"
 
 #: MoinMoin/apps/admin/views.py:65
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Profil von %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:109
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "System-Items upgraden"
+#: MoinMoin/apps/admin/views.py:144
+#: MoinMoin/apps/admin/templates/admin/index.html:6
+#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
+msgid "Show Wiki Configuration"
+msgstr "Wiki-Konfiguration anzeigen"
 
-#: MoinMoin/apps/admin/views.py:115
-#, python-format
-msgid "System items upgrade failed due to the following error: %(error)s."
-msgstr ""
-"Das Upgrade der Systemitems ist aus folgendem Grund fehlgeschlagen: "
-"%(error)s."
-
-#: MoinMoin/apps/admin/views.py:117
-msgid "System items have been upgraded successfully!"
-msgstr "Das Upgrade der Systemitems war erfolgreich!"
-
-#: MoinMoin/apps/admin/views.py:164
-msgid "Wiki Configuration"
-msgstr "Wiki-Konfiguration"
-
-#: MoinMoin/apps/admin/views.py:193
+#: MoinMoin/apps/admin/views.py:173
+#: MoinMoin/apps/admin/templates/admin/index.html:7
+#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
 msgid "Wiki Configuration Help"
 msgstr "Wiki-Konfigurations-Hilfe"
 
-#: MoinMoin/apps/admin/views.py:201
+#: MoinMoin/apps/admin/views.py:182
 msgid "Lexer description"
 msgstr "Lexer-Beschreibung"
 
-#: MoinMoin/apps/admin/views.py:202
+#: MoinMoin/apps/admin/views.py:183
 msgid "Lexer names"
 msgstr "Lexer-Namen"
 
-#: MoinMoin/apps/admin/views.py:203
+#: MoinMoin/apps/admin/views.py:184
 msgid "File patterns"
 msgstr "Dateitypen"
 
-#: MoinMoin/apps/admin/views.py:204
+#: MoinMoin/apps/admin/views.py:185
 msgid "Mimetypes"
 msgstr "MIME-Typen"
 
-#: MoinMoin/apps/admin/views.py:210
-msgid "Highlighter Help"
-msgstr "Highlighter-Hilfe"
+#: MoinMoin/apps/admin/views.py:191
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:14
+msgid "Highlighters"
+msgstr "Highlighters"
 
-#: MoinMoin/apps/admin/views.py:218
+#: MoinMoin/apps/admin/views.py:200
 msgid "InterWiki name"
 msgstr "InterWiki-Name"
 
-#: MoinMoin/apps/admin/views.py:219
+#: MoinMoin/apps/admin/views.py:201 MoinMoin/templates/crash.html:13
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:223
-msgid "Interwiki Help"
-msgstr "InterWiki-Hilfe"
+#: MoinMoin/apps/admin/views.py:205
+msgid "Interwiki Names"
+msgstr "InterWiki-Namen"
 
-#: MoinMoin/apps/admin/views.py:231 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/apps/admin/views.py:214 MoinMoin/converter/archive_in.py:62
 #: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
 #: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Größe"
 
-#: MoinMoin/apps/admin/views.py:232 MoinMoin/templates/index.html:153
+#: MoinMoin/apps/admin/views.py:215 MoinMoin/templates/index.html:194
 msgid "Item name"
 msgstr "Item-Name"
 
-#: MoinMoin/apps/admin/views.py:238
-msgid "Item Size"
-msgstr "Item-Größe"
+#: MoinMoin/apps/admin/views.py:221
+msgid "Item Sizes"
+msgstr "Item-Größen"
 
 #: MoinMoin/apps/admin/templates/admin/index.html:3
 msgid "Admin Menu"
 msgstr "Admin-Menü"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:6
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
-msgid "Upgrade system items"
-msgstr "Upgrade System-Items"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:7
-msgid "Show Wiki Configuration"
-msgstr "Wiki-Konfiguration anzeigen"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:8
-msgid "Show Wiki Configuration Help"
-msgstr "Wiki-Konfigurations-Hilfe anzeigen"
-
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
-msgid ""
-"You can upgrade your system items by uploading an xml file with new items"
-" below."
-msgstr ""
-"Sie können Ihre System-Items upgraden, indem Sie eine XML-Datei mit neuen"
-" Items hochladen."
-
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:5
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
 msgid "User name"
 msgstr "Benutzername"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
 msgid "Member of Groups"
 msgstr "Mitglied der Gruppen"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:9
 #: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Aktionen"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:12
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:13
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Enable user"
 msgstr "aktivieren"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Disable user"
 msgstr "deaktivieren"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:28
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:29
 msgid "Mail account data"
 msgstr "Account-Daten zusenden"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
-msgid "Wiki configuration"
-msgstr "Wiki-Konfiguration"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:5
 msgid ""
 "This table shows all settings in this wiki that do not have default "
@@ -337,19 +303,15 @@
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:14
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:12
-msgid "Variable name"
+msgid "Variable Name"
 msgstr "Variablenname"
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:15
 msgid "Setting"
 msgstr "Einstellung"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
-msgid "WikiConfig Help"
-msgstr "Hilfe zur Wiki-Konfiguration"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:13
-#: MoinMoin/constants/itemtypes.py:29
+#: MoinMoin/items/__init__.py:657
 msgid "Default"
 msgstr "Standardeinstellung"
 
@@ -357,11 +319,6 @@
 msgid "Description"
 msgstr "Beschreibung"
 
-#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:13
-msgid "Available Highlighters"
-msgstr "Verfügbare Highlighter"
-
 #: MoinMoin/apps/admin/templates/user/index_user.html:3
 msgid "Documentation"
 msgstr "Dokumentation"
@@ -375,43 +332,48 @@
 msgstr "Benutzer-Menü"
 
 #: MoinMoin/apps/admin/templates/user/index_user.html:9
-#: MoinMoin/apps/frontend/views.py:928 MoinMoin/apps/frontend/views.py:930
+#: MoinMoin/apps/frontend/views.py:789 MoinMoin/apps/frontend/views.py:790
+msgid "My Changes"
+msgstr "Meine Änderungen"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:10
+#: MoinMoin/apps/frontend/views.py:927 MoinMoin/apps/frontend/views.py:929
 msgid "Wanted Items"
 msgstr "Fehlende Items"
 
-#: MoinMoin/apps/admin/templates/user/index_user.html:10
-#: MoinMoin/apps/frontend/views.py:944 MoinMoin/apps/frontend/views.py:947
+#: MoinMoin/apps/admin/templates/user/index_user.html:11
+#: MoinMoin/apps/frontend/views.py:943 MoinMoin/apps/frontend/views.py:946
 msgid "Orphaned Items"
 msgstr "Verwaiste Items"
 
-#: MoinMoin/apps/admin/templates/user/index_user.html:11
+#: MoinMoin/apps/admin/templates/user/index_user.html:12
 #: MoinMoin/apps/admin/templates/user/itemsize.html:4
-msgid "Item sizes (latest revision)"
-msgstr "Item-Größen (neueste Revision)"
+msgid "Item Sizes (last revision)"
+msgstr "Item-Größen (letzte Revision)"
 
-#: MoinMoin/apps/admin/templates/user/index_user.html:12
+#: MoinMoin/apps/admin/templates/user/index_user.html:13
 #: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
-msgid "Known InterWiki names"
-msgstr "Bekannte InterWiki-Namen"
+msgid "InterWiki Names"
+msgstr "InterWiki-Namen"
 
-#: MoinMoin/apps/feed/views.py:85
+#: MoinMoin/apps/feed/views.py:84
 msgid "MoinMoin feels unhappy."
 msgstr "MoinMoin ist unglücklich."
 
-#: MoinMoin/apps/frontend/views.py:139 MoinMoin/search/__init__.py:29
+#: MoinMoin/apps/frontend/views.py:140
 msgid "search also in non-current revisions"
 msgstr "auch in nicht-aktuellen Revisionen suchen"
 
-#: MoinMoin/apps/frontend/views.py:140 MoinMoin/apps/frontend/views.py:164
+#: MoinMoin/apps/frontend/views.py:141 MoinMoin/apps/frontend/views.py:165
 #: MoinMoin/templates/lookup.html:6
 msgid "Lookup"
 msgstr "Nachschlagen"
 
-#: MoinMoin/apps/frontend/views.py:503
+#: MoinMoin/apps/frontend/views.py:497
 msgid "Target"
 msgstr "Ziel"
 
-#: MoinMoin/apps/frontend/views.py:503
+#: MoinMoin/apps/frontend/views.py:497
 msgid "The name of the target item"
 msgstr "Name des Ziel-Items"
 
@@ -419,80 +381,75 @@
 msgid "Filter"
 msgstr "Filter"
 
-#: MoinMoin/apps/frontend/views.py:791 MoinMoin/apps/frontend/views.py:792
-msgid "My Changes"
-msgstr "Meine Änderungen"
-
-#: MoinMoin/apps/frontend/views.py:823
+#: MoinMoin/apps/frontend/views.py:821
 #, python-format
 msgid "Items which refer to '%(item_name)s'"
 msgstr "Items, die auf '%(item_name)s' verweisen"
 
-#: MoinMoin/apps/frontend/views.py:894 MoinMoin/config/default.py:334
+#: MoinMoin/apps/frontend/views.py:892 MoinMoin/config/default.py:364
 #: MoinMoin/templates/global_history.html:10
 msgid "Global History"
 msgstr "Globale Historie"
 
-#: MoinMoin/apps/frontend/views.py:957 MoinMoin/apps/frontend/views.py:976
+#: MoinMoin/apps/frontend/views.py:956 MoinMoin/apps/frontend/views.py:975
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Sie müssen sich hierzu anmelden: %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:960
+#: MoinMoin/apps/frontend/views.py:959
 msgid "A quicklink to this page could not be added for you."
 msgstr "Es konnte kein Quicklink zu dieser Item für Sie erstellt werden."
 
-#: MoinMoin/apps/frontend/views.py:963
+#: MoinMoin/apps/frontend/views.py:962
 msgid "Your quicklink to this page could not be removed."
 msgstr "Ihr Quicklink zu dieser Item konnte nicht entfernt werden."
 
-#: MoinMoin/apps/frontend/views.py:978
+#: MoinMoin/apps/frontend/views.py:977
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Sie dürfen kein Item abonnieren, für das Sie keine Leserechte haben."
 
-#: MoinMoin/apps/frontend/views.py:982
+#: MoinMoin/apps/frontend/views.py:981
 msgid "Can't remove regular expression subscription!"
 msgstr ""
 "Ein auf einem regulären Ausdruck basierendes Abonnement kann nicht "
 "entfernt werden."
 
-#: MoinMoin/apps/frontend/views.py:983
+#: MoinMoin/apps/frontend/views.py:982
 msgid "Edit the subscription regular expressions in your settings."
 msgstr ""
 "Bitte bearbeiten Sie die zu den Abonnements gehörenden regulären "
 "Ausdrücke in Ihren Einstellungen."
 
-#: MoinMoin/apps/frontend/views.py:987
+#: MoinMoin/apps/frontend/views.py:986
 msgid "You could not get subscribed to this item."
 msgstr "Sie konnten nicht zu den Abonnenten dieses Items hinzugefügt werden."
 
-#: MoinMoin/apps/frontend/views.py:996 MoinMoin/apps/frontend/views.py:1189
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:995 MoinMoin/apps/frontend/views.py:1191
+#: MoinMoin/apps/frontend/views.py:1332
 msgid "The passwords do not match."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: MoinMoin/apps/frontend/views.py:1012 MoinMoin/apps/frontend/views.py:1147
-#: MoinMoin/apps/frontend/views.py:1207 MoinMoin/apps/frontend/views.py:1274
-#: MoinMoin/apps/frontend/views.py:1387 MoinMoin/converter/archive_in.py:59
-#: MoinMoin/templates/history.html:24
+#: MoinMoin/apps/frontend/views.py:1011 MoinMoin/apps/frontend/views.py:1148
+#: MoinMoin/apps/frontend/views.py:1211 MoinMoin/apps/frontend/views.py:1281
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Name"
 
-#: MoinMoin/apps/frontend/views.py:1012 MoinMoin/apps/frontend/views.py:1387
+#: MoinMoin/apps/frontend/views.py:1011
 msgid "The login name you want to use"
 msgstr "Der Anmelde-Name, den Sie benutzen wollen"
 
-#: MoinMoin/apps/frontend/views.py:1013 MoinMoin/apps/frontend/views.py:1209
-#: MoinMoin/apps/frontend/views.py:1348
+#: MoinMoin/apps/frontend/views.py:1012 MoinMoin/apps/frontend/views.py:1215
+#: MoinMoin/apps/frontend/views.py:1361
 msgid "The login password you want to use"
 msgstr "Das Anmelde-Passwort, das Sie benutzen wollen"
 
-#: MoinMoin/apps/frontend/views.py:1014 MoinMoin/apps/frontend/views.py:1210
-#: MoinMoin/apps/frontend/views.py:1349
+#: MoinMoin/apps/frontend/views.py:1013 MoinMoin/apps/frontend/views.py:1217
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Repeat the same password"
 msgstr "Wiederholen Sie das gleiche Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1017 MoinMoin/apps/frontend/views.py:1056
+#: MoinMoin/apps/frontend/views.py:1016 MoinMoin/apps/frontend/views.py:1056
 msgid "Register"
 msgstr "Registrieren"
 
@@ -515,199 +472,206 @@
 "\"\"%(message)s\" Bitte kontaktieren Sie einen Administrator, um Ihr "
 "Konto zu aktivieren."
 
-#: MoinMoin/apps/frontend/views.py:1105
+#: MoinMoin/apps/frontend/views.py:1106
 msgid "Account created, please log in now."
 msgstr "Das Benutzerkonto wurde erstellt. Bitte melden Sie sich an."
 
-#: MoinMoin/apps/frontend/views.py:1123
+#: MoinMoin/apps/frontend/views.py:1124
 msgid "Your account has been activated, you can log in now."
 msgstr "Ihr Account wurde aktiviert, Sie können sich jetzt anmelden."
 
-#: MoinMoin/apps/frontend/views.py:1125 MoinMoin/apps/frontend/views.py:1234
-msgid "Your token is invalid!"
-msgstr "Ihr Code ist ungültig!"
+#: MoinMoin/apps/frontend/views.py:1126
+msgid "Your username and/or token is invalid!"
+msgstr "Ihr Benutzername und/oder Token ist ungültig!"
 
-#: MoinMoin/apps/frontend/views.py:1132
+#: MoinMoin/apps/frontend/views.py:1133
 msgid "Your user name or your email address is needed."
 msgstr "Bitte geben Sie Ihren Benutzernamen oder Ihre E-Mail-Adresse an."
 
-#: MoinMoin/apps/frontend/views.py:1147 MoinMoin/apps/frontend/views.py:1207
+#: MoinMoin/apps/frontend/views.py:1148 MoinMoin/apps/frontend/views.py:1211
 msgid "Your login name"
 msgstr "Ihr Anmelde-Name"
 
-#: MoinMoin/apps/frontend/views.py:1149
+#: MoinMoin/apps/frontend/views.py:1150
 msgid "Recover password"
 msgstr "Passwort zurücksetzen"
 
-#: MoinMoin/apps/frontend/views.py:1157 MoinMoin/templates/lostpass.html:5
+#: MoinMoin/apps/frontend/views.py:1158 MoinMoin/templates/lostpass.html:5
 msgid "Lost Password"
 msgstr "Passwort vergessen"
 
-#: MoinMoin/apps/frontend/views.py:1179
+#: MoinMoin/apps/frontend/views.py:1180
 msgid "If this account exists, you will be notified."
 msgstr "Wenn dieses Benutzerkonto existiert, werden Sie benachrichtigt."
 
-#: MoinMoin/apps/frontend/views.py:1190 MoinMoin/apps/frontend/views.py:1324
-msgid "New password is unacceptable, encoding trouble."
+#: MoinMoin/apps/frontend/views.py:1192 MoinMoin/apps/frontend/views.py:1334
+msgid "New password is unacceptable, could not get processed."
 msgstr ""
-"Das neue Passwort kann nicht verwendet werden, da es Probleme bei der "
-"Kodierung gab."
+"Das neue Passwort kann nicht verwendet werden, da es nicht verarbeitet "
+"werden konnte."
 
-#: MoinMoin/apps/frontend/views.py:1208
+#: MoinMoin/apps/frontend/views.py:1212
 msgid "Recovery token"
 msgstr "Wiederherstellungscode"
 
-#: MoinMoin/apps/frontend/views.py:1208
+#: MoinMoin/apps/frontend/views.py:1213
 msgid "The recovery token that has been sent to you"
 msgstr "Das Recovery-Token, das an Sie gesendet wurde"
 
-#: MoinMoin/apps/frontend/views.py:1209 MoinMoin/apps/frontend/views.py:1348
+#: MoinMoin/apps/frontend/views.py:1214 MoinMoin/apps/frontend/views.py:1360
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1210 MoinMoin/apps/frontend/views.py:1349
+#: MoinMoin/apps/frontend/views.py:1216 MoinMoin/apps/frontend/views.py:1362
 msgid "New password (repeat)"
 msgstr "Neues Passwort (wiederholen)"
 
-#: MoinMoin/apps/frontend/views.py:1211 MoinMoin/apps/frontend/views.py:1350
-#: MoinMoin/templates/usersettings_forms.html:28
+#: MoinMoin/apps/frontend/views.py:1218 MoinMoin/apps/frontend/views.py:1364
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: MoinMoin/apps/frontend/views.py:1219 MoinMoin/templates/recoverpass.html:5
+#: MoinMoin/apps/frontend/views.py:1226 MoinMoin/templates/recoverpass.html:5
 msgid "Recover Password"
 msgstr "Passwort wiederherstellen"
 
-#: MoinMoin/apps/frontend/views.py:1232
+#: MoinMoin/apps/frontend/views.py:1239
 msgid "Your password has been changed, you can log in now."
 msgstr "Ihr Passwort wurde geändert. Sie können sich jetzt anmelden."
 
-#: MoinMoin/apps/frontend/views.py:1246
+#: MoinMoin/apps/frontend/views.py:1241
+msgid "Your token is invalid!"
+msgstr "Ihr Code ist ungültig!"
+
+#: MoinMoin/apps/frontend/views.py:1253
 msgid "Either your username or password was invalid."
 msgstr "Ihr Benutzername oder Passwort war ungültig."
 
-#: MoinMoin/apps/frontend/views.py:1247
+#: MoinMoin/apps/frontend/views.py:1254
 msgid "Failed to authenticate with this OpenID."
 msgstr "Mit dieser OpenID konnte nicht authentifiziert werden."
 
-#: MoinMoin/apps/frontend/views.py:1277
+#: MoinMoin/apps/frontend/views.py:1287
 msgid "Log in"
 msgstr "Anmelden"
 
-#: MoinMoin/apps/frontend/views.py:1285 MoinMoin/templates/layout.html:63
+#: MoinMoin/apps/frontend/views.py:1295 MoinMoin/templates/layout.html:63
 msgid "Login"
 msgstr "Anmelden"
 
-#: MoinMoin/apps/frontend/views.py:1314
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "You are now logged out."
 msgstr "Sie sind jetzt abgemeldet."
 
-#: MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1333
 msgid "The current password was wrong."
 msgstr "Das aktuelle Passwort war nicht korrekt."
 
-#: MoinMoin/apps/frontend/views.py:1347
+#: MoinMoin/apps/frontend/views.py:1358
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1347
+#: MoinMoin/apps/frontend/views.py:1359
 msgid "Your current login password"
 msgstr "Ihr aktuelles Anmelde-Passwort"
 
-#: MoinMoin/apps/frontend/views.py:1355 MoinMoin/apps/frontend/views.py:1361
-#: MoinMoin/apps/frontend/views.py:1376 MoinMoin/apps/frontend/views.py:1398
-#: MoinMoin/apps/frontend/views.py:1409
-#: MoinMoin/templates/usersettings_forms.html:14
-#: MoinMoin/templates/usersettings_forms.html:42
-#: MoinMoin/templates/usersettings_forms.html:56
-#: MoinMoin/templates/usersettings_forms.html:67
-#: MoinMoin/templates/usersettings_forms.html:81
+#: MoinMoin/apps/frontend/views.py:1370 MoinMoin/apps/frontend/views.py:1378
+#: MoinMoin/apps/frontend/views.py:1388 MoinMoin/apps/frontend/views.py:1409
+#: MoinMoin/apps/frontend/views.py:1421
 msgid "Save"
 msgstr "Speichern"
 
-#: MoinMoin/apps/frontend/views.py:1372
+#: MoinMoin/apps/frontend/views.py:1383
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 "Veröffentliche meine E-Mail-Adresse (statt meiner Wiki-Homepage) in den "
 "Autoreninformationen"
 
-#: MoinMoin/apps/frontend/views.py:1373
+#: MoinMoin/apps/frontend/views.py:1384
 msgid "Open editor on double click"
 msgstr "Editor durch Doppelklick öffnen"
 
-#: MoinMoin/apps/frontend/views.py:1374
+#: MoinMoin/apps/frontend/views.py:1385
+msgid "Scroll page after edit"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1386
 msgid "Show comment sections"
 msgstr "Kommentarbereiche anzeigen"
 
-#: MoinMoin/apps/frontend/views.py:1375
+#: MoinMoin/apps/frontend/views.py:1387
 msgid "Disable this account forever"
 msgstr "Benutzerkonto dauerhaft deaktivieren"
 
-#: MoinMoin/apps/frontend/views.py:1382 MoinMoin/templates/usersettings.html:5
+#: MoinMoin/apps/frontend/views.py:1394 MoinMoin/templates/usersettings.html:5
 msgid "User Settings"
 msgstr "Benutzer-Einstellungen"
 
-#: MoinMoin/apps/frontend/views.py:1388
-msgid "Alias-Name"
-msgstr "Alias-Name"
+#: MoinMoin/apps/frontend/views.py:1399
+msgid "The login names you want to use"
+msgstr "Die Anmelde-Namen, die Sie benutzen wollen"
 
-#: MoinMoin/apps/frontend/views.py:1388
-msgid "Your alias name (informational)"
-msgstr "Ihr Alias-Name (informativ)"
+#: MoinMoin/apps/frontend/views.py:1400
+msgid "Display-Name"
+msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1392
+#: MoinMoin/apps/frontend/views.py:1401
+msgid "Your display name (informational)"
+msgstr "Ihr Anzeige-Name (informativ)"
+
+#: MoinMoin/apps/frontend/views.py:1405
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: MoinMoin/apps/frontend/views.py:1397
+#: MoinMoin/apps/frontend/views.py:1407
 msgid "Locale"
 msgstr "Lokalisierung"
 
-#: MoinMoin/apps/frontend/views.py:1405
+#: MoinMoin/apps/frontend/views.py:1413
 msgid "Theme name"
 msgstr "Theme-Name"
 
-#: MoinMoin/apps/frontend/views.py:1406
+#: MoinMoin/apps/frontend/views.py:1415
 msgid "User CSS URL"
 msgstr "Benutzerdefiniertes CSS"
 
-#: MoinMoin/apps/frontend/views.py:1406
+#: MoinMoin/apps/frontend/views.py:1416
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "Geben Sie die URL Ihres benutzerspezifischen CSS an (optional)"
 
-#: MoinMoin/apps/frontend/views.py:1407
+#: MoinMoin/apps/frontend/views.py:1417
 msgid "Editor size"
 msgstr "Größe des Editors"
 
-#: MoinMoin/apps/frontend/views.py:1407
+#: MoinMoin/apps/frontend/views.py:1418
 msgid "Editor textarea height (0=auto)"
 msgstr "Höhe des Editors (0=automatisch)"
 
-#: MoinMoin/apps/frontend/views.py:1408
+#: MoinMoin/apps/frontend/views.py:1419
 msgid "History results per page"
 msgstr "Anzahl Historien-Ergebnisse pro Seite"
 
-#: MoinMoin/apps/frontend/views.py:1408
+#: MoinMoin/apps/frontend/views.py:1420
 msgid "Number of results per page (0=no paging)"
 msgstr "Anzahl der Ergebnisse pro Seite (0=nicht seitenweise)"
 
-#: MoinMoin/apps/frontend/views.py:1451
+#: MoinMoin/apps/frontend/views.py:1463
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: MoinMoin/apps/frontend/views.py:1456
+#: MoinMoin/apps/frontend/views.py:1469
 msgid "This openid is already in use."
 msgstr "Diese OpenID wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1460
-msgid "This username is already in use."
-msgstr "Dieser Benutzername wird bereits verwendet."
+#: MoinMoin/apps/frontend/views.py:1476
+#, python-format
+msgid "The username %(name)r is already in use."
+msgstr "Der Benutzername %(name)r wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1466
+#: MoinMoin/apps/frontend/views.py:1483
 msgid "This email is already in use"
 msgstr "Diese E-Mail-Adresse wird bereits verwendet."
 
-#: MoinMoin/apps/frontend/views.py:1481
+#: MoinMoin/apps/frontend/views.py:1498
 msgid ""
 "Your account has been disabled because you changed your email address. "
 "Please see the email we sent to your address to reactivate it."
@@ -716,7 +680,7 @@
 " Bitte prüfen Sie die E-Mail, die wir an Ihre Adresse gesandt haben, um "
 "es wieder zu reaktivieren."
 
-#: MoinMoin/apps/frontend/views.py:1488
+#: MoinMoin/apps/frontend/views.py:1507
 msgid ""
 "Your email address was not changed because sending the verification email"
 " failed. Please try again later."
@@ -725,38 +689,38 @@
 "Überprüfungs-E-Mail fehlgeschlagen ist. Bitte versuchen Sie es später "
 "erneut."
 
-#: MoinMoin/apps/frontend/views.py:1494
+#: MoinMoin/apps/frontend/views.py:1515
 msgid "Your changes have been saved."
 msgstr "Ihre Änderungen wurden gespeichert."
 
-#: MoinMoin/apps/frontend/views.py:1546
+#: MoinMoin/apps/frontend/views.py:1567
 msgid "You must log in to use bookmarks."
 msgstr "Sie müssen sich anmelden, um Lesezeichen verwenden zu können."
 
-#: MoinMoin/apps/frontend/views.py:1672
+#: MoinMoin/apps/frontend/views.py:1693
 #, python-format
 msgid "Items with similar names to '%(item_name)s'"
 msgstr "Items mit ähnlichen Namen wie '%(item_name)s'"
 
-#: MoinMoin/apps/frontend/views.py:1856 MoinMoin/apps/frontend/views.py:1883
+#: MoinMoin/apps/frontend/views.py:1876 MoinMoin/apps/frontend/views.py:1904
 msgid "All tags in this wiki"
 msgstr "Alle Schlagworte in diesem Wiki"
 
-#: MoinMoin/apps/frontend/views.py:1897
+#: MoinMoin/apps/frontend/views.py:1918
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Items, die mit dem Schlagwort %(tag)s markiert wurden"
 
-#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
+#: MoinMoin/auth/__init__.py:254 MoinMoin/auth/ldap_login.py:131
 msgid "Missing password. Please enter user name and password."
 msgstr "Fehlendes Passwort. Bitte geben Sie Benutzername und Passwort ein."
 
-#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
-#: MoinMoin/auth/ldap_login.py:248
+#: MoinMoin/auth/__init__.py:262 MoinMoin/auth/ldap_login.py:202
+#: MoinMoin/auth/ldap_login.py:254
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort ungültig."
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:266
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
@@ -765,16 +729,16 @@
 "Wenn Sie kein Benutzerkonto haben, <a href=\"%(register_url)s\">können "
 "Sie jetzt eines anlegen</a>. "
 
-#: MoinMoin/auth/__init__.py:258
+#: MoinMoin/auth/__init__.py:268
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Passwort vergessen?</a>"
 
-#: MoinMoin/auth/http.py:59
+#: MoinMoin/auth/http.py:60
 msgid "Please log in first."
 msgstr "Bitte melden Sie sich erst an."
 
-#: MoinMoin/auth/ldap_login.py:262
+#: MoinMoin/auth/ldap_login.py:268
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "Verbindung zum LDAP-Server %(server)s fehlgeschlagen."
@@ -807,15 +771,15 @@
 msgid "No OpenID service at this URL."
 msgstr "Kein OpenID-Service unter dieser URL."
 
-#: MoinMoin/config/default.py:258
+#: MoinMoin/config/default.py:278
 msgid "Password is too short."
 msgstr "Das Passwort ist zu kurz."
 
-#: MoinMoin/config/default.py:260
+#: MoinMoin/config/default.py:280
 msgid "Password has not enough different characters."
 msgstr "Das Passwort besteht nicht aus genug verschiedenen Zeichen."
 
-#: MoinMoin/config/default.py:266
+#: MoinMoin/config/default.py:286
 msgid ""
 "Password is too easy to guess (password contains name or name contains "
 "password)."
@@ -823,188 +787,160 @@
 "Das Passwort ist zu leicht zu erraten (Passwort ist Teil des "
 "Benutzernamens oder umgekehrt)."
 
-#: MoinMoin/config/default.py:275
+#: MoinMoin/config/default.py:295
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Das Passwort ist zu leicht zu erraten (Zeichenfolge auf der Tastatur)."
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home"
 msgstr "Start"
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home Page"
 msgstr "HomePage"
 
-#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:363
+#: MoinMoin/config/default.py:364 MoinMoin/config/default.py:392
 msgid "History"
 msgstr "Historie"
 
-#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:368
+#: MoinMoin/config/default.py:365 MoinMoin/config/default.py:397
 msgid "Index"
 msgstr "Index"
 
-#: MoinMoin/config/default.py:335 MoinMoin/templates/index.html:7
-#: MoinMoin/templates/index.html:71
+#: MoinMoin/config/default.py:365 MoinMoin/templates/index.html:7
+#: MoinMoin/templates/index.html:118
 msgid "Global Index"
 msgstr "Globaler Index"
 
-#: MoinMoin/config/default.py:336
+#: MoinMoin/config/default.py:366
 msgid "Global Tags Index"
 msgstr "Globaler Schlagwort-Index"
 
-#: MoinMoin/config/default.py:338
+#: MoinMoin/config/default.py:368
 msgid "Administration & Docs"
 msgstr "Administration & Doku"
 
-#: MoinMoin/config/default.py:361
+#: MoinMoin/config/default.py:390
 msgid "Show"
 msgstr "Anzeigen"
 
-#: MoinMoin/config/default.py:362 MoinMoin/templates/index.html:34
+#: MoinMoin/config/default.py:391 MoinMoin/templates/index.html:27
 msgid "Download"
 msgstr "Herunterladen"
 
-#: MoinMoin/config/default.py:363
+#: MoinMoin/config/default.py:392
 msgid "Revision History"
 msgstr "Revisions-Historie"
 
-#: MoinMoin/config/default.py:366 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:395 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: MoinMoin/config/default.py:366
+#: MoinMoin/config/default.py:395
 msgid "Edit or Upload"
 msgstr "Bearbeiten oder Hochladen"
 
-#: MoinMoin/config/default.py:368
+#: MoinMoin/config/default.py:397
 msgid "List sub-items"
 msgstr "Liste untergeordneter Items"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:398
 msgid "Comments"
 msgstr "Kommentare"
 
-#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:89
+#: MoinMoin/config/default.py:398 MoinMoin/templates/common.js:56
 msgid "Hide comments"
 msgstr "Kommentare verstecken"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:399
 msgid "Transclusions"
 msgstr "Transclusions"
 
-#: MoinMoin/config/default.py:370 MoinMoin/templates/common.js:123
+#: MoinMoin/config/default.py:399 MoinMoin/templates/common.js:90
 msgid "Show transclusions"
 msgstr "Transclusions anzeigen"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:400
 msgid "Highlight"
 msgstr "Hervorheben"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:400
 msgid "Show with Syntax-Highlighting"
 msgstr "Mit Syntax-Highlighting anzeigen"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:401
 msgid "Meta"
 msgstr "Meta"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:401
 msgid "Display Metadata"
 msgstr "Metadaten anzeigen"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:402
 msgid "Create or remove a navigation link to this item"
 msgstr "Einen Navigations-Link zu diesem Item anlegen oder entfernen"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:403
 msgid "Switch notifications about item changes on or off"
 msgstr "Benachrichtigungen über Item-Änderungen an- oder abschalten"
 
-#: MoinMoin/config/default.py:375
+#: MoinMoin/config/default.py:404
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: MoinMoin/config/default.py:375
+#: MoinMoin/config/default.py:404
 msgid "Rename this item"
 msgstr "Dieses Item umbenennen"
 
-#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:38
+#: MoinMoin/config/default.py:405 MoinMoin/templates/index.html:31
 msgid "Delete"
 msgstr "Löschen"
 
-#: MoinMoin/config/default.py:376
+#: MoinMoin/config/default.py:405
 msgid "Delete this item"
 msgstr "Dieses Item löschen"
 
-#: MoinMoin/config/default.py:377 MoinMoin/templates/index.html:43
+#: MoinMoin/config/default.py:406 MoinMoin/templates/index.html:36
 msgid "Destroy"
 msgstr "Vernichten"
 
-#: MoinMoin/config/default.py:377
+#: MoinMoin/config/default.py:406
 msgid "Completely destroy this item"
 msgstr "Dieses Item vollständig zerstören"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:407
 msgid "Referrers"
 msgstr "Referenzen"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:407
 msgid "What refers here?"
 msgstr "Was verweist hierher?"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:408
 msgid "Site Map"
 msgstr "Sitemap"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:408
 msgid "Local Site Map of this item"
 msgstr "Lokale Sitemap dieses Items"
 
-#: MoinMoin/config/default.py:380
+#: MoinMoin/config/default.py:409
 msgid "Similar"
 msgstr "Ähnliches"
 
-#: MoinMoin/config/default.py:380
+#: MoinMoin/config/default.py:409
 msgid "Items with similar names"
 msgstr "Items mit ähnlichen Namen"
 
-#: MoinMoin/constants/itemtypes.py:29
-msgid "Wiki item"
-msgstr "Wiki-Item"
-
-#: MoinMoin/constants/itemtypes.py:30
-msgid "Ticket"
-msgstr "Ticket"
-
-#: MoinMoin/constants/itemtypes.py:30
-msgid "Ticket item"
-msgstr "Ticket-Item"
-
-#: MoinMoin/constants/itemtypes.py:31
-msgid "Blog"
-msgstr "Blog"
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Zeit"
 
-#: MoinMoin/constants/itemtypes.py:31
-msgid "Blog item"
-msgstr "Blog-Item"
-
-#: MoinMoin/constants/itemtypes.py:32
-msgid "Blog entry"
-msgstr "Blog-Eintrag"
-
-#: MoinMoin/constants/itemtypes.py:32
-msgid "Blog entry item"
-msgstr "Blog-Eintrags-Item"
-
-#: MoinMoin/converter/archive_in.py:59
-msgid "Date"
-msgstr "Datum"
-
-#: MoinMoin/converter/html_out.py:539
+#: MoinMoin/converter/html_out.py:560
 msgid "Link to this heading"
 msgstr "Link zu dieser Überschrift"
 
-#: MoinMoin/converter/html_out.py:605
+#: MoinMoin/converter/html_out.py:624
 msgid "Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -1012,80 +948,112 @@
 msgid "Error: invalid macro name."
 msgstr "Fehler: ungültiger Macro-Name"
 
-#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
+#: MoinMoin/converter/macro.py:90 MoinMoin/converter/macro_Verbatim.py:66
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr ""
 "<<%(macro_name)s: Ausführung fehlgeschlagen [%(error_msg)s] (Sie finden "
 "weitere Informationen im Log)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1034
+#: MoinMoin/converter/moinwiki_in.py:950
 msgid "Error:"
 msgstr "Fehler:"
 
-#: MoinMoin/converter/moinwiki_in.py:1035
+#: MoinMoin/converter/moinwiki_in.py:951
 msgid "is invalid within"
 msgstr "ist ungültig innerhalb von"
 
-#: MoinMoin/converter/nonexistent_in.py:31
+#: MoinMoin/converter/nonexistent_in.py:32
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "%(item_name)s existiert nicht, möchten Sie es jetzt erstellen?"
 
-#: MoinMoin/items/__init__.py:125 MoinMoin/templates/atom.html:12
+#: MoinMoin/items/__init__.py:174 MoinMoin/templates/atom.html:12
 #: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
 msgid "Comment"
 msgstr "Kommentar"
 
-#: MoinMoin/items/__init__.py:125
+#: MoinMoin/items/__init__.py:174
 msgid "Comment about your change"
 msgstr "Kommentar zu Ihrer Änderung"
 
-#: MoinMoin/items/__init__.py:130
+#: MoinMoin/items/__init__.py:175
+msgid "OK"
+msgstr "OK"
+
+#: MoinMoin/items/__init__.py:179
 msgid "Item type"
 msgstr "Item-Typ"
 
-#: MoinMoin/items/__init__.py:131
+#: MoinMoin/items/__init__.py:180
 msgid "Content type"
 msgstr "Content-Type"
 
-#: MoinMoin/items/__init__.py:135 MoinMoin/items/ticket.py:40
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: MoinMoin/items/__init__.py:135 MoinMoin/items/ticket.py:40
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
 msgid "One-line summary of the item"
 msgstr "Einzeilige Zusammenfassung dieses Items"
 
-#: MoinMoin/items/__init__.py:331
+#: MoinMoin/items/__init__.py:406
 msgid "Extra MetaData (JSON)"
 msgstr "Extra Metadaten (JSON)"
 
-#: MoinMoin/items/blog.py:31
+#: MoinMoin/items/__init__.py:658
+msgid "Wiki item"
+msgstr "Wiki-Item"
+
+#: MoinMoin/items/__init__.py:749
+msgid "User profile"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:750
+msgid "User profile item (not implemented yet!)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:32
 msgid "Supertags (Categories)"
 msgstr "Super-Tags (Kategorien)"
 
-#: MoinMoin/items/blog.py:32
+#: MoinMoin/items/blog.py:33
 msgid "Ordered comma separated list of tags"
 msgstr "Geordnete komma-separierte Liste von Tags"
 
-#: MoinMoin/items/blog.py:35
+#: MoinMoin/items/blog.py:37
 msgid "Title"
 msgstr "Titel"
 
-#: MoinMoin/items/blog.py:36
+#: MoinMoin/items/blog.py:38
 msgid "One-line title of the blog entry"
 msgstr "Einzeiliger Titel des Blog-Eintrags"
 
-#: MoinMoin/items/blog.py:37
+#: MoinMoin/items/blog.py:39
 msgid "Publication time (UTC)"
 msgstr "Zeitpunkt der Veröffentlichung (UTC)"
 
-#: MoinMoin/items/content.py:278
+#: MoinMoin/items/blog.py:45
+msgid "Blog"
+msgstr "Blog"
+
+#: MoinMoin/items/blog.py:46
+msgid "Blog item"
+msgstr "Blog-Item"
+
+#: MoinMoin/items/blog.py:98
+msgid "Blog entry"
+msgstr "Blog-Eintrag"
+
+#: MoinMoin/items/blog.py:99
+msgid "Blog entry item"
+msgstr "Blog-Eintrags-Item"
+
+#: MoinMoin/items/content.py:319
 msgid "Upload file:"
 msgstr "Datei hochladen:"
 
-#: MoinMoin/items/content.py:296
+#: MoinMoin/items/content.py:337
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
@@ -1093,119 +1061,145 @@
 "Die Items haben die gleiche Hash-Code (das bedeutet, dass sie "
 "wahrscheinlich den selben Inhalt haben)."
 
-#: MoinMoin/items/content.py:298
+#: MoinMoin/items/content.py:339
 msgid "The items have different data."
 msgstr "Der Inhalt der Items ist verschieden."
 
-#: MoinMoin/items/content.py:310
+#: MoinMoin/items/content.py:351
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr ""
 "Es ist nicht möglich, die Daten zu diesem Contenttype umzuwandeln: "
 "%(contenttype)s"
 
-#: MoinMoin/items/content.py:697
+#: MoinMoin/items/content.py:805
 msgid "Type your text here"
 msgstr "Tippen Sie hier"
 
-#: MoinMoin/items/content.py:933 MoinMoin/items/content.py:1001
+#: MoinMoin/items/content.py:1060
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Zeichnung %(filename)s bearbeiten (öffnet in neuem Fenster)"
 
-#: MoinMoin/items/content.py:948 MoinMoin/items/content.py:1018
+#: MoinMoin/items/content.py:1064
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Anklickbare Zeichnung: %(filename)s"
 
-#: MoinMoin/items/ticket.py:41
+#: MoinMoin/items/ticket.py:43
 msgid "Effort"
 msgstr "Aufwand"
 
-#: MoinMoin/items/ticket.py:42
+#: MoinMoin/items/ticket.py:44
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
-#: MoinMoin/items/ticket.py:43
+#: MoinMoin/items/ticket.py:45
 msgid "Severity"
 msgstr "Schweregrad"
 
-#: MoinMoin/items/ticket.py:44
+#: MoinMoin/items/ticket.py:46
 msgid "Priority"
 msgstr "Priorität"
 
-#: MoinMoin/items/ticket.py:46
+#: MoinMoin/items/ticket.py:48
 msgid "Assigned To"
 msgstr "Zugewiesen an"
 
-#: MoinMoin/items/ticket.py:47
+#: MoinMoin/items/ticket.py:49
 msgid "Superseded By"
 msgstr "Ersetzt von"
 
-#: MoinMoin/items/ticket.py:48
+#: MoinMoin/items/ticket.py:50
 msgid "Depends On"
 msgstr "Hängt ab von"
 
-#: MoinMoin/items/ticket.py:51
+#: MoinMoin/items/ticket.py:54
 msgid "Supersedes"
 msgstr "Ersetzt"
 
-#: MoinMoin/items/ticket.py:52
+#: MoinMoin/items/ticket.py:55
 msgid "Required By"
 msgstr "Benötigt von"
 
-#: MoinMoin/items/ticket.py:53
+#: MoinMoin/items/ticket.py:56
 msgid "Subscribers"
 msgstr "Abonnenten"
 
-#: MoinMoin/items/ticket.py:64
+#: MoinMoin/items/ticket.py:68
 msgid "Message"
 msgstr "Nachricht"
 
-#: MoinMoin/items/ticket.py:65
+#: MoinMoin/items/ticket.py:79
+msgid "Submit ticket"
+msgstr "Ticket absenden"
+
+#: MoinMoin/items/ticket.py:98
 msgid "Update ticket"
 msgstr "Ticket aktualisieren"
 
-#: MoinMoin/items/ticket.py:134
-msgid "Submit ticket"
-msgstr "Ticket absenden"
+#: MoinMoin/items/ticket.py:100
+msgid "Update & reopen ticket"
+msgstr "Ticket aktualisieren & wieder eröffnen"
 
-#: MoinMoin/mail/sendmail.py:94
+#: MoinMoin/items/ticket.py:101
+msgid "Update & close ticket"
+msgstr "Ticket aktualisieren & schließen"
+
+#: MoinMoin/items/ticket.py:139
+msgid "Ticket"
+msgstr "Ticket"
+
+#: MoinMoin/items/ticket.py:140
+msgid "Ticket item"
+msgstr "Ticket-Item"
+
+#: MoinMoin/mail/sendmail.py:91
+msgid ""
+"Contact administrator: cannot send password recovery e-mail because mail "
+"configuration is incomplete."
+msgstr ""
+
+#: MoinMoin/mail/sendmail.py:99
 msgid "No recipients, nothing to do"
 msgstr "Keine Empfänger, nichts zu tun"
 
-#: MoinMoin/mail/sendmail.py:170
+#: MoinMoin/mail/sendmail.py:175
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Verbindung zum Mailserver '%(server)s' fehlgeschlagen: %(reason)s"
 
-#: MoinMoin/mail/sendmail.py:184
+#: MoinMoin/mail/sendmail.py:189
 msgid "Mail not sent"
 msgstr "E-Mail wurde nicht versandt"
 
-#: MoinMoin/mail/sendmail.py:187
+#: MoinMoin/mail/sendmail.py:192
 msgid "Mail sent successfully"
 msgstr "E-Mail wurde erfolgreich versandt"
 
-#: MoinMoin/search/__init__.py:17
+#: MoinMoin/search/__init__.py:18
 msgid "Search query too short."
 msgstr "Such-Anfrage ist zu kurz."
 
-#: MoinMoin/search/__init__.py:30 MoinMoin/templates/search.html:8
+#: MoinMoin/search/__init__.py:31
+msgid "search all revisions"
+msgstr "alle Revisionen durchsuchen"
+
+#: MoinMoin/search/__init__.py:32 MoinMoin/templates/search.html:8
 msgid "Search"
 msgstr "Suche"
 
-#: MoinMoin/security/textcha.py:158
+#: MoinMoin/security/textcha.py:162
 msgid "The entered TextCha was incorrect."
 msgstr "Das eingegebene TextCha war falsch."
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/security/textcha.py:163
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr ""
 "Die TextCha-Frage ist ungültig oder ist abgelaufen. Bitte versuchen Sie "
 "es erneut."
 
-#: MoinMoin/security/textcha.py:178
+#: MoinMoin/security/textcha.py:183
 msgid "TextCha"
 msgstr "TextCha"
 
@@ -1219,14 +1213,36 @@
 msgid "Revision"
 msgstr "Revision"
 
-#: MoinMoin/templates/common.js:92
+#: MoinMoin/templates/common.js:59
 msgid "Show comments"
 msgstr "Kommentare anzeigen"
 
-#: MoinMoin/templates/common.js:126
+#: MoinMoin/templates/common.js:93
 msgid "Hide transclusions"
 msgstr "Transclusions verstecken"
 
+#: MoinMoin/templates/crash.html:1
+msgid "Oops!"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:3
+msgid "An error happened while processing your request."
+msgstr ""
+
+#: MoinMoin/templates/crash.html:6
+msgid ""
+"More details have been logged. The following data is helpful for locating"
+" the corresponding log entries:"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:9
+msgid "Error ID"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:11
+msgid "Server time"
+msgstr "Server-Zeit"
+
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
@@ -1234,8 +1250,8 @@
 
 #: MoinMoin/templates/destroy.html:4
 #, python-format
-msgid "DESTROY COMPLETE item '%(item_name)s'"
-msgstr "Item '%(item_name)s' VOLLSTÄNDIG VERNICHTEN"
+msgid "DESTROY COMPLETE ITEM '%(item_name)s'"
+msgstr "KOMPLETTES ITEM '%(item_name)s' ZERSTÖREN"
 
 #: MoinMoin/templates/destroy.html:20
 #, python-format
@@ -1259,28 +1275,28 @@
 msgid "Line"
 msgstr "Zeile"
 
-#: MoinMoin/templates/forms.html:215
+#: MoinMoin/templates/forms.html:218
 msgid "Upload"
 msgstr "Hochladen"
 
-#: MoinMoin/templates/forms.html:216
+#: MoinMoin/templates/forms.html:219
 msgid "Upload files"
 msgstr "Dateien hochladen"
 
-#: MoinMoin/templates/forms.html:221
+#: MoinMoin/templates/forms.html:224
 msgid "Start All"
 msgstr "Alle starten"
 
-#: MoinMoin/templates/forms.html:222
+#: MoinMoin/templates/forms.html:225
 msgid "Cancel All"
 msgstr "Alle abbrechen"
 
-#: MoinMoin/templates/forms.html:226
+#: MoinMoin/templates/forms.html:229
 msgid "Start"
 msgstr "Starten"
 
-#: MoinMoin/templates/forms.html:227 MoinMoin/templates/index.html:143
-#: MoinMoin/templates/index.html:161
+#: MoinMoin/templates/forms.html:230 MoinMoin/templates/index.html:184
+#: MoinMoin/templates/index.html:202
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1288,7 +1304,7 @@
 msgid "Set bookmark"
 msgstr "Lesezeichen setzen"
 
-#: MoinMoin/templates/global_history.html:49
+#: MoinMoin/templates/global_history.html:48
 msgid "Delete bookmark"
 msgstr "Lesezeichen löschen"
 
@@ -1314,10 +1330,6 @@
 msgid "Rev."
 msgstr "Rev."
 
-#: MoinMoin/templates/history.html:26
-msgid "Timestamp"
-msgstr "Zeit"
-
 #: MoinMoin/templates/history.html:29
 msgid "Editor"
 msgstr "Autor"
@@ -1355,67 +1367,83 @@
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Liste der Subitems von '%(item_name)s'"
 
-#: MoinMoin/templates/index.html:22
+#: MoinMoin/templates/index.html:15
 msgid "Select All"
 msgstr "Alle selektieren"
 
-#: MoinMoin/templates/index.html:32
+#: MoinMoin/templates/index.html:25
 msgid "New item"
 msgstr "Neues Item"
 
-#: MoinMoin/templates/index.html:51
+#: MoinMoin/templates/index.html:44
 msgid "Filter by content type"
 msgstr "Nach Content-Type filtern"
 
-#: MoinMoin/templates/index.html:52
+#: MoinMoin/templates/index.html:45
 msgid "items having unknown mime types"
 msgstr "Items mit unbekanntem Mime-Type"
 
-#: MoinMoin/templates/index.html:56
+#: MoinMoin/templates/index.html:49
 msgid "Toggle"
 msgstr "Umschalten"
 
-#: MoinMoin/templates/index.html:57 MoinMoin/templates/index.html:123
+#: MoinMoin/templates/index.html:50
 msgid "More"
 msgstr "Mehr"
 
-#: MoinMoin/templates/index.html:86
+#: MoinMoin/templates/index.html:84
+msgid "This item itself also matches your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:105
+msgid "This item also has subitems that match your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:133
 msgid "Recently uploaded items"
 msgstr "Kürzlich hochgeladene Items"
 
-#: MoinMoin/templates/index.html:95 MoinMoin/templates/index.html:97
+#: MoinMoin/templates/index.html:142 MoinMoin/templates/index.html:144
 msgid "All"
 msgstr "Alle"
 
-#: MoinMoin/templates/index.html:135 MoinMoin/templates/index.html:148
+#: MoinMoin/templates/index.html:156
+msgid "These items have subitems that match your filter:"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
+msgid "X"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
 msgid "Close"
 msgstr "Schliessen"
 
-#: MoinMoin/templates/index.html:136
+#: MoinMoin/templates/index.html:177
 msgid "Please provide comment for this action"
 msgstr "Bitte geben Sie einen Kommentar für diese Aktion ein"
 
-#: MoinMoin/templates/index.html:139
+#: MoinMoin/templates/index.html:180
 msgid "Enter your comment"
 msgstr "Geben Sie Ihren Kommentar ein"
 
-#: MoinMoin/templates/index.html:142
+#: MoinMoin/templates/index.html:183
 msgid "Submit"
 msgstr "Absenden"
 
-#: MoinMoin/templates/index.html:149
+#: MoinMoin/templates/index.html:190
 msgid "Create new item"
 msgstr "Neues Item erstellen"
 
-#: MoinMoin/templates/index.html:155 MoinMoin/templates/index.html:157
+#: MoinMoin/templates/index.html:196 MoinMoin/templates/index.html:198
 msgid "Enter item name here"
 msgstr "Hier den Item-Namen eingeben"
 
-#: MoinMoin/templates/index.html:160
+#: MoinMoin/templates/index.html:201
 msgid "Create"
 msgstr "Erzeugen"
 
-#: MoinMoin/templates/index.html:171
+#: MoinMoin/templates/index.html:212
 msgid "(Drag and drop multiple files to this white area to upload them.)"
 msgstr ""
 "(Auf diese weisse Fläche hier mehrere Dateien draufwerfen, um sie "
@@ -1478,7 +1506,7 @@
 msgid "Moin login"
 msgstr "Moin-Login"
 
-#: MoinMoin/templates/login.html:25
+#: MoinMoin/templates/login.html:26
 msgid "OpenID login"
 msgstr "OpenID-Login"
 
@@ -1591,27 +1619,27 @@
 msgid "No results found (%(runtime).3f secs)."
 msgstr "Keine Ergebnisse gefunden (%(runtime).3f Sekunden)."
 
-#: MoinMoin/templates/search.html:35
+#: MoinMoin/templates/search.html:37
 #, python-format
 msgid "name term suggestions: %(termlist)s"
 msgstr "Vorschläge für Namens-Terme: %(termlist)s"
 
-#: MoinMoin/templates/search.html:36
+#: MoinMoin/templates/search.html:38
 #, python-format
 msgid "content term suggestions: %(termlist)s"
 msgstr "Vorschläge für Inhalts-Terme: %(termlist)s"
 
-#: MoinMoin/templates/search.html:51 MoinMoin/templates/show.html:54
+#: MoinMoin/templates/search.html:53 MoinMoin/templates/show.html:54
 #, python-format
 msgid "Summary: %(summary)s"
 msgstr "Zusammenfassung: %(summary)s"
 
-#: MoinMoin/templates/search.html:57
+#: MoinMoin/templates/search.html:59
 #, python-format
 msgid "Revision: %(revid)s Last Change: %(mtime)s"
 msgstr "Revision: %(revid)s Letzte Änderung: %(mtime)s"
 
-#: MoinMoin/templates/search.html:65
+#: MoinMoin/templates/search.html:67
 msgid "You don't have read permission for this item."
 msgstr "Sie haben keine Lese-Berechtigung für dieses Item."
 
@@ -1667,29 +1695,9 @@
 msgid "Ticket: '%(item_name)s'"
 msgstr "Ticket: '%(item_name)s'"
 
-#: MoinMoin/templates/usersettings.html:8
-msgid "Personal Settings"
-msgstr "Persönliche Einstellungen"
-
-#: MoinMoin/templates/usersettings.html:13
-msgid "Change Password"
-msgstr "Passwort ändern"
-
-#: MoinMoin/templates/usersettings.html:18
-msgid "Notification Settings"
-msgstr "Benachrichtigungseinstellungen"
-
-#: MoinMoin/templates/usersettings.html:23
-msgid "Wiki Appearance Settings"
-msgstr "Erscheinungsbildeinstellungen"
-
-#: MoinMoin/templates/usersettings.html:28
-msgid "Navigation Settings"
-msgstr "Navigationseinstellungen"
-
-#: MoinMoin/templates/usersettings.html:33
-msgid "Options"
-msgstr "Optionen"
+#: MoinMoin/templates/ticket.html:20
+msgid "(Closed)"
+msgstr "(Geschlossen)"
 
 #: MoinMoin/templates/usersettings_forms.html:35
 msgid ""
@@ -1699,11 +1707,35 @@
 "Wenn Sie Ihre E-Mail-Adresse ändern, müssen Sie sie verifizieren. \"\n"
 "\"Ein Link wird ihnen zugesandt werden."
 
-#: MoinMoin/templates/utils.html:64
+#: MoinMoin/templates/usersettings_forms.html:90
+msgid "Personal Settings"
+msgstr "Persönliche Einstellungen"
+
+#: MoinMoin/templates/usersettings_forms.html:94
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: MoinMoin/templates/usersettings_forms.html:98
+msgid "Notification Settings"
+msgstr "Benachrichtigungseinstellungen"
+
+#: MoinMoin/templates/usersettings_forms.html:102
+msgid "Wiki Appearance Settings"
+msgstr "Erscheinungsbildeinstellungen"
+
+#: MoinMoin/templates/usersettings_forms.html:106
+msgid "Navigation Settings"
+msgstr "Navigationseinstellungen"
+
+#: MoinMoin/templates/usersettings_forms.html:110
+msgid "Options"
+msgstr "Optionen"
+
+#: MoinMoin/templates/utils.html:72
 msgid "Expand Subitem"
 msgstr "Untergeordnetes Item expandieren"
 
-#: MoinMoin/templates/utils.html:81
+#: MoinMoin/templates/utils.html:91
 msgid "Subitems"
 msgstr "Untergeordnete Items"
 
@@ -1748,112 +1780,144 @@
 msgid "only this blog"
 msgstr "nur dieses Blog"
 
-#: MoinMoin/themes/__init__.py:57
-msgid "Access denied"
+#: MoinMoin/themes/__init__.py:58
+msgid "Access Denied"
 msgstr "Zugriff verweigert"
 
-#: MoinMoin/themes/__init__.py:58
+#: MoinMoin/themes/__init__.py:59
 msgid "You are not allowed to access this resource."
 msgstr "Sie haben nicht die notwendigen Rechte, um auf diese Ressource zuzugreifen"
 
-#: MoinMoin/themes/__init__.py:292
+#: MoinMoin/themes/__init__.py:286
 msgid "anonymous"
 msgstr "anonym"
 
-#: MoinMoin/util/paramparser.py:316
+#: MoinMoin/util/paramparser.py:318
 #, python-format
 msgid "Argument \"%(name)s\" must be a boolean value, not \"%(value)s\""
 msgstr "Argument \"%(name)s\" muss ein boolescher Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:319
+#: MoinMoin/util/paramparser.py:321
 #, python-format
 msgid "Argument must be a boolean value, not \"%(value)s\""
 msgstr "Argument muss ein boolescher Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:345
+#: MoinMoin/util/paramparser.py:347
 #, python-format
 msgid "Argument \"%(name)s\" must be an integer value, not \"%(value)s\""
 msgstr "Argument \"%(name)s\" muss ein ganzzahliger Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:348
+#: MoinMoin/util/paramparser.py:350
 #, python-format
 msgid "Argument must be an integer value, not \"%(value)s\""
 msgstr "Argument muss ein ganzzahliger Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:373
+#: MoinMoin/util/paramparser.py:375
 #, python-format
 msgid "Argument \"%(name)s\" must be a floating point value, not \"%(value)s\""
 msgstr "Argument \"%(name)s\" muss eine Fließkommazahl sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:376
+#: MoinMoin/util/paramparser.py:378
 #, python-format
 msgid "Argument must be a floating point value, not \"%(value)s\""
 msgstr "Argument muss eine Fließkommazahl sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:403
+#: MoinMoin/util/paramparser.py:405
 #, python-format
 msgid "Argument \"%(name)s\" must be a complex value, not \"%(value)s\""
 msgstr "Argument \"%(name)s\" muss ein komplexer Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:406
+#: MoinMoin/util/paramparser.py:408
 #, python-format
 msgid "Argument must be a complex value, not \"%(value)s\""
 msgstr "Argument muss ein komplexer Wert sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:460
+#: MoinMoin/util/paramparser.py:462
 #, python-format
 msgid "Argument \"%(name)s\" must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr ""
 "Argument \"%(name)s\" muss eines von \"%(choices)s\" sein, nicht "
 "\"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:465
+#: MoinMoin/util/paramparser.py:467
 #, python-format
 msgid "Argument must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr "Argument muss eines von \"%(choices)s\" sein, nicht \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:690
+#: MoinMoin/util/paramparser.py:691
 msgid "Too many arguments"
 msgstr "Zu viele Argumente"
 
-#: MoinMoin/util/paramparser.py:695
+#: MoinMoin/util/paramparser.py:696
 msgid "Cannot have arguments without name following named arguments"
 msgstr "Unbenannte Argumente können nicht auf benannte Argumente folgen"
 
-#: MoinMoin/util/paramparser.py:711
+#: MoinMoin/util/paramparser.py:712
 #, python-format
 msgid "Argument \"%(name)s\" is required"
 msgstr "Argument \"%(name)s\" wird benötigt"
 
-#: MoinMoin/util/paramparser.py:723
+#: MoinMoin/util/paramparser.py:724
 #, python-format
 msgid "No argument named \"%(name)s\""
 msgstr "Kein Argument mit dem Namen \"%(name)s\""
 
-#~ msgid "name"
-#~ msgstr ""
-
-#~ msgid "name_exact"
-#~ msgstr ""
-
-#~ msgid "itemid"
-#~ msgstr ""
-
-#~ msgid "revid"
-#~ msgstr ""
+#~ msgid "User Browser"
+#~ msgstr "Benutzer-Browser"
 
-#~ msgid "userid"
-#~ msgstr ""
-
-#~ msgid "language"
-#~ msgstr ""
+#~ msgid "System items upgrade"
+#~ msgstr "System-Items upgraden"
 
-#~ msgid "itemlinks"
+#~ msgid "System items upgrade failed due to the following error: %(error)s."
 #~ msgstr ""
+#~ "Das Upgrade der Systemitems ist aus "
+#~ "folgendem Grund fehlgeschlagen: %(error)s."
 
-#~ msgid "itemtransclusions"
-#~ msgstr ""
+#~ msgid "System items have been upgraded successfully!"
+#~ msgstr "Das Upgrade der Systemitems war erfolgreich!"
 
-#~ msgid "refs"
+#~ msgid "Wiki Configuration"
+#~ msgstr "Wiki-Konfiguration"
+
+#~ msgid "Highlighter Help"
+#~ msgstr "Highlighter-Hilfe"
+
+#~ msgid "Interwiki Help"
+#~ msgstr "InterWiki-Hilfe"
+
+#~ msgid "Upgrade system items"
+#~ msgstr "Upgrade System-Items"
+
+#~ msgid "Show Wiki Configuration Help"
+#~ msgstr "Wiki-Konfigurations-Hilfe anzeigen"
+
+#~ msgid ""
+#~ "You can upgrade your system items "
+#~ "by uploading an xml file with new"
+#~ " items below."
 #~ msgstr ""
+#~ "Sie können Ihre System-Items upgraden,"
+#~ " indem Sie eine XML-Datei mit "
+#~ "neuen Items hochladen."
 
+#~ msgid "Wiki configuration"
+#~ msgstr "Wiki-Konfiguration"
+
+#~ msgid "WikiConfig Help"
+#~ msgstr "Hilfe zur Wiki-Konfiguration"
+
+#~ msgid "Available Highlighters"
+#~ msgstr "Verfügbare Highlighter"
+
+#~ msgid "Known InterWiki names"
+#~ msgstr "Bekannte InterWiki-Namen"
+
+#~ msgid "Alias-Name"
+#~ msgstr "Alias-Name"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "DESTROY COMPLETE item '%(item_name)s'"
+#~ msgstr "Item '%(item_name)s' VOLLSTÄNDIG VERNICHTEN"
+
--- a/MoinMoin/translations/pt_BR/LC_MESSAGES/messages.po	Sun Mar 03 19:39:31 2013 +0100
+++ b/MoinMoin/translations/pt_BR/LC_MESSAGES/messages.po	Sun Mar 03 19:52:02 2013 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: moin 2.0.0a0\n"
 "Report-Msgid-Bugs-To: English <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2012-07-15 23:32+0200\n"
+"POT-Creation-Date: 2013-03-03 19:37+0100\n"
 "PO-Revision-Date: 2012-04-03 05:10-0300\n"
 "Last-Translator: MoinMoin:DiogenesAugusto\n"
 "Language-Team: pt_BR <LL@li.org>\n"
@@ -17,49 +17,70 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/forms.py:37
+#: MoinMoin/forms.py:73
+msgid "Invalid JSON."
+msgstr "JSON inválido"
+
+#: MoinMoin/forms.py:86
 msgid "OpenID"
 msgstr "OpenID"
 
-#: MoinMoin/forms.py:37
+#: MoinMoin/forms.py:86
 #, fuzzy
 msgid "OpenID address"
 msgstr "Seu endereço OpenID"
 
-#: MoinMoin/forms.py:39
+#: MoinMoin/forms.py:88
 msgid "Your OpenID address"
 msgstr "Seu endereço OpenID"
 
-#: MoinMoin/forms.py:41
+#: MoinMoin/forms.py:90
 msgid "E-Mail"
 msgstr "Email"
 
-#: MoinMoin/forms.py:41
+#: MoinMoin/forms.py:91
 #, fuzzy
 msgid "E-Mail address"
 msgstr "Endereço de email"
 
-#: MoinMoin/forms.py:43
+#: MoinMoin/forms.py:93
 msgid "Your E-Mail address"
 msgstr "Seu endereço de email"
 
-#: MoinMoin/forms.py:45
+#: MoinMoin/forms.py:95
 msgid "Password"
 msgstr "Senha"
 
-#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+#: MoinMoin/forms.py:130 MoinMoin/config/default.py:366
 msgid "Tags"
 msgstr "Tags"
 
-#: MoinMoin/forms.py:58
+#: MoinMoin/forms.py:133 MoinMoin/apps/frontend/views.py:1399
+#, fuzzy
+msgid "Names"
+msgstr "Renomear"
+
+#: MoinMoin/forms.py:135
 msgid "Search Query"
 msgstr "Busca"
 
-#: MoinMoin/forms.py:70
-msgid "OK"
-msgstr "OK"
+#: MoinMoin/forms.py:182
+msgid "YYYY-MM-DD HH:MM:SS (example: 2013-12-31 23:59:59)"
+msgstr ""
 
-#: MoinMoin/user.py:54
+#: MoinMoin/forms.py:183
+msgid "Please use the following format: YYYY-MM-DD HH:MM:SS"
+msgstr ""
+
+#: MoinMoin/forms.py:201
+msgid "Invalid Reference."
+msgstr ""
+
+#: MoinMoin/forms.py:209
+msgid "(None)"
+msgstr ""
+
+#: MoinMoin/user.py:56
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -72,16 +93,16 @@
 "único espaço em branco opcional entre palavras. Nomes de grupos não são "
 "permitidos."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:62
 msgid "This user name already belongs to somebody else."
 msgstr "Este nome de usuário já pertence a alguém."
 
-#: MoinMoin/user.py:68
+#: MoinMoin/user.py:71
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Senha inválida : %(msg)s"
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:77
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
@@ -89,15 +110,15 @@
 "Por favor forneça um endereço de email válido. Se você perder seus dados "
 "de login, poderá recuperá-los neste endereço."
 
-#: MoinMoin/user.py:84
+#: MoinMoin/user.py:83
 msgid "This email already belongs to somebody else."
 msgstr "Este endereço de email já está cadastrado por alguém."
 
-#: MoinMoin/user.py:90
+#: MoinMoin/user.py:89
 msgid "This OpenID already belongs to somebody else."
 msgstr "Este OpenID já pertence a alguém."
 
-#: MoinMoin/user.py:730
+#: MoinMoin/user.py:759
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -120,12 +141,12 @@
 " desconsidere esta mensagem.\n"
 "\n"
 
-#: MoinMoin/user.py:733
+#: MoinMoin/user.py:761
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Link para recuperação de senha"
 
-#: MoinMoin/user.py:751
+#: MoinMoin/user.py:779
 #, fuzzy, python-format
 msgid ""
 "Somebody has created an account with this email address.\n"
@@ -148,208 +169,131 @@
 " desconsidere esta mensagem.\n"
 "\n"
 
-#: MoinMoin/user.py:754
+#: MoinMoin/user.py:781
 #, python-format
 msgid "[%(sitename)s] Please verify your email address"
 msgstr ""
 
-#: MoinMoin/apps/admin/views.py:30
+#: MoinMoin/apps/admin/views.py:31 MoinMoin/config/default.py:368
 msgid "Admin"
 msgstr ""
 
-#: MoinMoin/apps/admin/views.py:48
-#: MoinMoin/apps/admin/templates/admin/index.html:9
-msgid "User Browser"
-msgstr "Gerenciador de usuários"
+#: MoinMoin/apps/admin/views.py:36 MoinMoin/config/default.py:367
+msgid "User"
+msgstr ""
 
-#: MoinMoin/apps/admin/views.py:60
+#: MoinMoin/apps/admin/views.py:53
+#: MoinMoin/apps/admin/templates/admin/index.html:5
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:3
+msgid "Users"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:65
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Perfil do usuário %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:104
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "Atualização de itens de sistema"
+#: MoinMoin/apps/admin/views.py:144
+#: MoinMoin/apps/admin/templates/admin/index.html:6
+#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
+msgid "Show Wiki Configuration"
+msgstr "Mostrar configuração do Wiki"
 
-#: MoinMoin/apps/admin/views.py:110
-#, python-format
-msgid "System items upgrade failed due to the following error: %(error)s."
-msgstr ""
-"A atualização de itens de sistema falhou devido aos seguintes erros: "
-"%(error)s."
-
-#: MoinMoin/apps/admin/views.py:112
-msgid "System items have been upgraded successfully!"
-msgstr "Itens de sistema foram atualizados corretamente!"
-
-#: MoinMoin/apps/admin/views.py:159
-#, fuzzy
-msgid "Wiki Configuration"
-msgstr "Configuração do Wiki"
-
-#: MoinMoin/apps/admin/views.py:188
+#: MoinMoin/apps/admin/views.py:173
+#: MoinMoin/apps/admin/templates/admin/index.html:7
+#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
 #, fuzzy
 msgid "Wiki Configuration Help"
 msgstr "Configuração do Wiki"
 
-#: MoinMoin/apps/admin/views.py:196
+#: MoinMoin/apps/admin/views.py:182
 msgid "Lexer description"
 msgstr "Descrição Lexer"
 
-#: MoinMoin/apps/admin/views.py:197
+#: MoinMoin/apps/admin/views.py:183
 msgid "Lexer names"
 msgstr "Nomes Lexer"
 
-#: MoinMoin/apps/admin/views.py:198
+#: MoinMoin/apps/admin/views.py:184
 msgid "File patterns"
 msgstr "Padrões para arquivos"
 
-#: MoinMoin/apps/admin/views.py:199
+#: MoinMoin/apps/admin/views.py:185
 msgid "Mimetypes"
 msgstr "Mimetypes"
 
-#: MoinMoin/apps/admin/views.py:205
+#: MoinMoin/apps/admin/views.py:191
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:14
 #, fuzzy
-msgid "Highlighter Help"
+msgid "Highlighters"
 msgstr "realçe"
 
-#: MoinMoin/apps/admin/views.py:213
+#: MoinMoin/apps/admin/views.py:200
 msgid "InterWiki name"
 msgstr "Nome InterWiki"
 
-#: MoinMoin/apps/admin/views.py:214
+#: MoinMoin/apps/admin/views.py:201 MoinMoin/templates/crash.html:13
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:218
+#: MoinMoin/apps/admin/views.py:205
 #, fuzzy
-msgid "Interwiki Help"
+msgid "Interwiki Names"
 msgstr "Nome InterWiki"
 
-#: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/apps/admin/views.py:214 MoinMoin/converter/archive_in.py:62
 #: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
 #: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Tamanho"
 
-#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
+#: MoinMoin/apps/admin/views.py:215 MoinMoin/templates/index.html:194
 msgid "Item name"
 msgstr "Nome do item"
 
-#: MoinMoin/apps/admin/views.py:233
+#: MoinMoin/apps/admin/views.py:221
 #, fuzzy
-msgid "Item Size"
+msgid "Item Sizes"
 msgstr "Tamanho do editor"
 
-#: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
-#: MoinMoin/apps/admin/templates/admin/index.html:20
-#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:9
-msgid "Available Highlighters"
-msgstr "Realçadores disponíveis"
-
 #: MoinMoin/apps/admin/templates/admin/index.html:3
-msgid "Documentation"
-msgstr "Documentação"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:5
-msgid "Documentation (local)"
-msgstr "Documentação (local)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:7
 msgid "Admin Menu"
 msgstr "Menu Admin"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:10
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
-msgid "Upgrade system items"
-msgstr "Atualizar itens de sistema"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:11
-msgid "Show Wiki Configuration"
-msgstr "Mostrar configuração do Wiki"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:12
-msgid "Show Wiki Configuration Help"
-msgstr "Mostrar ajuda para configuração do Wiki"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:14
-#: MoinMoin/apps/admin/templates/user/index_user.html:3
-msgid "User Menu"
-msgstr "Menu do usuário"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/admin/templates/user/index_user.html:5
-#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
-msgid "Wanted Items"
-msgstr "Itens desejados (tem link para eles, mas não existem)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/admin/templates/user/index_user.html:6
-#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
-msgid "Orphaned Items"
-msgstr "Itens órfãos (existem, mas não há link para eles)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:18
-#: MoinMoin/apps/admin/templates/admin/itemsize.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:7
-#: MoinMoin/apps/admin/templates/user/itemsize.html:4
-msgid "Item sizes (latest revision)"
-msgstr "Tamanho dos itens (última revisão)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:19
-#: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:8
-#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
-msgid "Known InterWiki names"
-msgstr "Nomes InterWiki conhecidos"
-
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
-msgid ""
-"You can upgrade your system items by uploading an xml file with new items"
-" below."
-msgstr ""
-"Você pode atualizar os itens de sistema fazendo o upload de um arquivo "
-"xml com os novos itens abaixo."
-
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:5
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
 msgid "User name"
 msgstr "Nome de usuário"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
 msgid "Member of Groups"
 msgstr "Membros de Grupos"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:9
 #: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Ações"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:12
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:13
 msgid "disabled"
 msgstr "desabilitado"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Enable user"
 msgstr "Habilitar usuário"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Disable user"
 msgstr "Desabilitar usuário"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:28
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:29
 msgid "Mail account data"
 msgstr "Dados de conta de email"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
-msgid "Wiki configuration"
-msgstr "Configuração do Wiki"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:5
 msgid ""
 "This table shows all settings in this wiki that do not have default "
@@ -364,18 +308,16 @@
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:14
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:12
-msgid "Variable name"
+#, fuzzy
+msgid "Variable Name"
 msgstr "Nome da variável"
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:15
 msgid "Setting"
 msgstr "Configuração"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
-msgid "WikiConfig Help"
-msgstr "Ajuda para o WikiConfig"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:13
+#: MoinMoin/items/__init__.py:657
 msgid "Default"
 msgstr "Padrão"
 
@@ -383,429 +325,398 @@
 msgid "Description"
 msgstr "Descrição"
 
-#: MoinMoin/apps/feed/views.py:85
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
+msgid "Documentation"
+msgstr "Documentação"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+msgid "Documentation (local)"
+msgstr "Documentação (local)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+msgid "User Menu"
+msgstr "Menu do usuário"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
+#: MoinMoin/apps/frontend/views.py:789 MoinMoin/apps/frontend/views.py:790
+msgid "My Changes"
+msgstr ""
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:10
+#: MoinMoin/apps/frontend/views.py:927 MoinMoin/apps/frontend/views.py:929
+msgid "Wanted Items"
+msgstr "Itens desejados (tem link para eles, mas não existem)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:11
+#: MoinMoin/apps/frontend/views.py:943 MoinMoin/apps/frontend/views.py:946
+msgid "Orphaned Items"
+msgstr "Itens órfãos (existem, mas não há link para eles)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:12
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
+#, fuzzy
+msgid "Item Sizes (last revision)"
+msgstr "Tamanho dos itens (última revisão)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:13
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
+#, fuzzy
+msgid "InterWiki Names"
+msgstr "Nome InterWiki"
+
+#: MoinMoin/apps/feed/views.py:84
 msgid "MoinMoin feels unhappy."
 msgstr "MoinMoin está triste."
 
-#: MoinMoin/apps/frontend/views.py:133
-#, fuzzy
-msgid "name"
-msgstr "Renomear"
-
-#: MoinMoin/apps/frontend/views.py:134
-msgid "name_exact"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:135
-msgid "itemid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:136
-msgid "revid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:137
-msgid "userid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:138
-msgid "language"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:139
-msgid "itemlinks"
-msgstr ""
-
 #: MoinMoin/apps/frontend/views.py:140
-msgid "itemtransclusions"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:141
-msgid "refs"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
 msgid "search also in non-current revisions"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/apps/frontend/views.py:141 MoinMoin/apps/frontend/views.py:165
 #: MoinMoin/templates/lookup.html:6
 msgid "Lookup"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
-msgid "Search"
-msgstr "Busca"
-
-#: MoinMoin/apps/frontend/views.py:470
+#: MoinMoin/apps/frontend/views.py:497
 msgid "Target"
 msgstr "Alvo"
 
-#: MoinMoin/apps/frontend/views.py:470
+#: MoinMoin/apps/frontend/views.py:497
 msgid "The name of the target item"
 msgstr "Nome do item alvo"
 
-#: MoinMoin/apps/frontend/views.py:486
-msgid "markup text"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:487
-msgid "other text"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:488
-msgid "image"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:489
-msgid "audio"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:490
-msgid "video"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:491
-#, fuzzy
-msgid "other"
-msgstr "mais antigas"
-
-#: MoinMoin/apps/frontend/views.py:492
-#, fuzzy
-msgid "unknown"
-msgstr "<desconhecido>"
-
-#: MoinMoin/apps/frontend/views.py:493
+#: MoinMoin/apps/frontend/views.py:740
 msgid "Filter"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
-#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
-msgid "Global Index"
-msgstr "Índice Global"
-
-#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
-msgid "My Changes"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:798
+#: MoinMoin/apps/frontend/views.py:821
 #, fuzzy, python-format
 msgid "Items which refer to '%(item_name)s'"
 msgstr "Renomear '%(item_name)s'"
 
-#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
+#: MoinMoin/apps/frontend/views.py:892 MoinMoin/config/default.py:364
 #: MoinMoin/templates/global_history.html:10
 msgid "Global History"
 msgstr "Histórico Global"
 
-#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
+#: MoinMoin/apps/frontend/views.py:956 MoinMoin/apps/frontend/views.py:975
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Você deve fazer o login para usar esta ação: %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:935
+#: MoinMoin/apps/frontend/views.py:959
 msgid "A quicklink to this page could not be added for you."
 msgstr "Um quicklink para esta página não pode ser adicionado."
 
-#: MoinMoin/apps/frontend/views.py:938
+#: MoinMoin/apps/frontend/views.py:962
 msgid "Your quicklink to this page could not be removed."
 msgstr "O quicklink para esta página não pode ser removido."
 
-#: MoinMoin/apps/frontend/views.py:953
+#: MoinMoin/apps/frontend/views.py:977
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Você não tem permissão para se inscrever em um item o qual não pode ler."
 
-#: MoinMoin/apps/frontend/views.py:957
+#: MoinMoin/apps/frontend/views.py:981
 msgid "Can't remove regular expression subscription!"
 msgstr "Impossível remover acompanhamento por expressão regular!"
 
-#: MoinMoin/apps/frontend/views.py:958
+#: MoinMoin/apps/frontend/views.py:982
 msgid "Edit the subscription regular expressions in your settings."
 msgstr "Edite seu acompanhamento por expressão regular nas suas configurações."
 
-#: MoinMoin/apps/frontend/views.py:962
+#: MoinMoin/apps/frontend/views.py:986
 msgid "You could not get subscribed to this item."
 msgstr "Você não pode se inscrever neste item."
 
-#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
-#: MoinMoin/apps/frontend/views.py:1297
+#: MoinMoin/apps/frontend/views.py:995 MoinMoin/apps/frontend/views.py:1191
+#: MoinMoin/apps/frontend/views.py:1332
 msgid "The passwords do not match."
 msgstr "As senhas não conferem."
 
-#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
-#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
-#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
-#: MoinMoin/templates/history.html:24
+#: MoinMoin/apps/frontend/views.py:1011 MoinMoin/apps/frontend/views.py:1148
+#: MoinMoin/apps/frontend/views.py:1211 MoinMoin/apps/frontend/views.py:1281
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Nome"
 
-#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
+#: MoinMoin/apps/frontend/views.py:1011
 msgid "The login name you want to use"
 msgstr "O nome de usuário que você quer usar para fazer login no sistema"
 
-#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
-#: MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1012 MoinMoin/apps/frontend/views.py:1215
+#: MoinMoin/apps/frontend/views.py:1361
 msgid "The login password you want to use"
 msgstr "A senha que você que usar para fazer login no sistema"
 
-#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
-#: MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1013 MoinMoin/apps/frontend/views.py:1217
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Repeat the same password"
 msgstr "Repita a mesma senha"
 
-#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
+#: MoinMoin/apps/frontend/views.py:1016 MoinMoin/apps/frontend/views.py:1056
 msgid "Register"
 msgstr "Cadastrar"
 
-#: MoinMoin/apps/frontend/views.py:1075
+#: MoinMoin/apps/frontend/views.py:1100
 msgid ""
 "Account verification required, please see the email we sent to your "
 "address."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1077
+#: MoinMoin/apps/frontend/views.py:1102
 #, python-format
 msgid ""
 "An error occurred while sending the verification email: \"%(message)s\" "
 "Please contact an administrator to activate your account."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1080
+#: MoinMoin/apps/frontend/views.py:1106
 msgid "Account created, please log in now."
 msgstr "Conta criada, você pode logar agora."
 
-#: MoinMoin/apps/frontend/views.py:1098
+#: MoinMoin/apps/frontend/views.py:1124
 #, fuzzy
 msgid "Your account has been activated, you can log in now."
 msgstr "Sua senha foi alterada. Você pode se conectar agora."
 
-#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
-msgid "Your token is invalid!"
+#: MoinMoin/apps/frontend/views.py:1126
+#, fuzzy
+msgid "Your username and/or token is invalid!"
 msgstr "Seu código de recuperação de senha é inválido!"
 
-#: MoinMoin/apps/frontend/views.py:1107
+#: MoinMoin/apps/frontend/views.py:1133
 msgid "Your user name or your email address is needed."
 msgstr "Seu nome de usuário ou endereço de email são necessários."
 
-#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
+#: MoinMoin/apps/frontend/views.py:1148 MoinMoin/apps/frontend/views.py:1211
 msgid "Your login name"
 msgstr "Seu nome de usuário"
 
-#: MoinMoin/apps/frontend/views.py:1124
+#: MoinMoin/apps/frontend/views.py:1150
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
-#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
+#: MoinMoin/apps/frontend/views.py:1158 MoinMoin/templates/lostpass.html:5
 msgid "Lost Password"
 msgstr "Perdi minha senha"
 
-#: MoinMoin/apps/frontend/views.py:1154
+#: MoinMoin/apps/frontend/views.py:1180
 msgid "If this account exists, you will be notified."
 msgstr "Se esta conta já existe, você será avisado"
 
-#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
-msgid "New password is unacceptable, encoding trouble."
+#: MoinMoin/apps/frontend/views.py:1192 MoinMoin/apps/frontend/views.py:1334
+#, fuzzy
+msgid "New password is unacceptable, could not get processed."
 msgstr "Esta senha é inválida, problema de codificação de caracteres."
 
-#: MoinMoin/apps/frontend/views.py:1183
+#: MoinMoin/apps/frontend/views.py:1212
 msgid "Recovery token"
 msgstr "Código para recuperação de senha"
 
-#: MoinMoin/apps/frontend/views.py:1183
+#: MoinMoin/apps/frontend/views.py:1213
 msgid "The recovery token that has been sent to you"
 msgstr "O código de recuperação de senha foi enviado para você"
 
-#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1214 MoinMoin/apps/frontend/views.py:1360
 msgid "New password"
 msgstr "Nova senha"
 
-#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1216 MoinMoin/apps/frontend/views.py:1362
 msgid "New password (repeat)"
 msgstr "Nova senha (repetir)"
 
-#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
-#: MoinMoin/templates/usersettings_forms.html:28
+#: MoinMoin/apps/frontend/views.py:1218 MoinMoin/apps/frontend/views.py:1364
 msgid "Change password"
 msgstr "Mudar a senha"
 
-#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
+#: MoinMoin/apps/frontend/views.py:1226 MoinMoin/templates/recoverpass.html:5
 msgid "Recover Password"
 msgstr "Recuperar senha"
 
-#: MoinMoin/apps/frontend/views.py:1207
+#: MoinMoin/apps/frontend/views.py:1239
 msgid "Your password has been changed, you can log in now."
 msgstr "Sua senha foi alterada. Você pode se conectar agora."
 
-#: MoinMoin/apps/frontend/views.py:1221
+#: MoinMoin/apps/frontend/views.py:1241
+msgid "Your token is invalid!"
+msgstr "Seu código de recuperação de senha é inválido!"
+
+#: MoinMoin/apps/frontend/views.py:1253
 msgid "Either your username or password was invalid."
 msgstr "Seu nome de usuário ou senha são invalidos."
 
-#: MoinMoin/apps/frontend/views.py:1222
+#: MoinMoin/apps/frontend/views.py:1254
 msgid "Failed to authenticate with this OpenID."
 msgstr "Falha ao autenticar com este OpenID"
 
-#: MoinMoin/apps/frontend/views.py:1252
+#: MoinMoin/apps/frontend/views.py:1287
 msgid "Log in"
 msgstr "Login"
 
-#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
+#: MoinMoin/apps/frontend/views.py:1295 MoinMoin/templates/layout.html:63
 msgid "Login"
 msgstr "Entrar"
 
-#: MoinMoin/apps/frontend/views.py:1289
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "You are now logged out."
 msgstr "Você está desconectado."
 
-#: MoinMoin/apps/frontend/views.py:1298
+#: MoinMoin/apps/frontend/views.py:1333
 msgid "The current password was wrong."
 msgstr "Sua senha atual está incorreta."
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1358
 msgid "Current Password"
 msgstr "Senha atual"
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1359
 msgid "Your current login password"
 msgstr "Sua senha atual"
 
-#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
-#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
-#: MoinMoin/apps/frontend/views.py:1384
-#: MoinMoin/templates/usersettings_forms.html:14
-#: MoinMoin/templates/usersettings_forms.html:42
-#: MoinMoin/templates/usersettings_forms.html:56
-#: MoinMoin/templates/usersettings_forms.html:67
-#: MoinMoin/templates/usersettings_forms.html:81
+#: MoinMoin/apps/frontend/views.py:1370 MoinMoin/apps/frontend/views.py:1378
+#: MoinMoin/apps/frontend/views.py:1388 MoinMoin/apps/frontend/views.py:1409
+#: MoinMoin/apps/frontend/views.py:1421
 msgid "Save"
 msgstr "Salvar"
 
-#: MoinMoin/apps/frontend/views.py:1347
+#: MoinMoin/apps/frontend/views.py:1383
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 "Publicar meu email (não minha página inicial wiki) nas informações de "
 "autor"
 
-#: MoinMoin/apps/frontend/views.py:1348
+#: MoinMoin/apps/frontend/views.py:1384
 msgid "Open editor on double click"
 msgstr "Abra o editor com um duplo clique"
 
-#: MoinMoin/apps/frontend/views.py:1349
+#: MoinMoin/apps/frontend/views.py:1385
+msgid "Scroll page after edit"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1386
 msgid "Show comment sections"
 msgstr "Mostrar comentários"
 
-#: MoinMoin/apps/frontend/views.py:1350
+#: MoinMoin/apps/frontend/views.py:1387
 msgid "Disable this account forever"
 msgstr "Desligar esta conta para sempre"
 
-#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
+#: MoinMoin/apps/frontend/views.py:1394 MoinMoin/templates/usersettings.html:5
 #, fuzzy
 msgid "User Settings"
 msgstr "Configurações"
 
-#: MoinMoin/apps/frontend/views.py:1363
-msgid "Alias-Name"
-msgstr "Apelido"
+#: MoinMoin/apps/frontend/views.py:1399
+#, fuzzy
+msgid "The login names you want to use"
+msgstr "O nome de usuário que você quer usar para fazer login no sistema"
 
-#: MoinMoin/apps/frontend/views.py:1363
-msgid "Your alias name (informational)"
+#: MoinMoin/apps/frontend/views.py:1400
+msgid "Display-Name"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1401
+#, fuzzy
+msgid "Your display name (informational)"
 msgstr "Seu apelido (informativo)"
 
-#: MoinMoin/apps/frontend/views.py:1367
+#: MoinMoin/apps/frontend/views.py:1405
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: MoinMoin/apps/frontend/views.py:1372
+#: MoinMoin/apps/frontend/views.py:1407
 msgid "Locale"
 msgstr "Local"
 
-#: MoinMoin/apps/frontend/views.py:1380
+#: MoinMoin/apps/frontend/views.py:1413
 msgid "Theme name"
 msgstr "Nome do tema"
 
-#: MoinMoin/apps/frontend/views.py:1381
+#: MoinMoin/apps/frontend/views.py:1415
 msgid "User CSS URL"
 msgstr "URL para CSS do usuário"
 
-#: MoinMoin/apps/frontend/views.py:1381
+#: MoinMoin/apps/frontend/views.py:1416
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "forneça um URL para seu CSS customizado (opcional)"
 
-#: MoinMoin/apps/frontend/views.py:1382
+#: MoinMoin/apps/frontend/views.py:1417
 msgid "Editor size"
 msgstr "Tamanho do editor"
 
-#: MoinMoin/apps/frontend/views.py:1382
+#: MoinMoin/apps/frontend/views.py:1418
 msgid "Editor textarea height (0=auto)"
 msgstr "Altura da textarea do editor (0=auto)"
 
-#: MoinMoin/apps/frontend/views.py:1383
+#: MoinMoin/apps/frontend/views.py:1419
 msgid "History results per page"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1383
+#: MoinMoin/apps/frontend/views.py:1420
 msgid "Number of results per page (0=no paging)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1426
+#: MoinMoin/apps/frontend/views.py:1463
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: MoinMoin/apps/frontend/views.py:1431
+#: MoinMoin/apps/frontend/views.py:1469
 msgid "This openid is already in use."
 msgstr "Este OpenID está em uso."
 
-#: MoinMoin/apps/frontend/views.py:1435
-msgid "This username is already in use."
+#: MoinMoin/apps/frontend/views.py:1476
+#, fuzzy, python-format
+msgid "The username %(name)r is already in use."
 msgstr "Este nome de usuário já está em uso."
 
-#: MoinMoin/apps/frontend/views.py:1441
+#: MoinMoin/apps/frontend/views.py:1483
 msgid "This email is already in use"
 msgstr "Este email já está em uso"
 
-#: MoinMoin/apps/frontend/views.py:1456
+#: MoinMoin/apps/frontend/views.py:1498
 msgid ""
 "Your account has been disabled because you changed your email address. "
 "Please see the email we sent to your address to reactivate it."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1463
+#: MoinMoin/apps/frontend/views.py:1507
 msgid ""
 "Your email address was not changed because sending the verification email"
 " failed. Please try again later."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1469
+#: MoinMoin/apps/frontend/views.py:1515
 msgid "Your changes have been saved."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1521
+#: MoinMoin/apps/frontend/views.py:1567
 msgid "You must log in to use bookmarks."
 msgstr "Você deve se conectar para usar os marcadores de histórico"
 
-#: MoinMoin/apps/frontend/views.py:1647
+#: MoinMoin/apps/frontend/views.py:1693
 #, fuzzy, python-format
 msgid "Items with similar names to '%(item_name)s'"
 msgstr "Itens com nomes similares"
 
-#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
+#: MoinMoin/apps/frontend/views.py:1876 MoinMoin/apps/frontend/views.py:1904
 msgid "All tags in this wiki"
 msgstr "Todas as tags deste wiki"
 
-#: MoinMoin/apps/frontend/views.py:1870
+#: MoinMoin/apps/frontend/views.py:1918
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Itens marcados com %(tag)s"
 
-#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
+#: MoinMoin/auth/__init__.py:254 MoinMoin/auth/ldap_login.py:131
 msgid "Missing password. Please enter user name and password."
 msgstr "Senha inválida. Por favor entre com seu nome de usuário e senha."
 
-#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
-#: MoinMoin/auth/ldap_login.py:248
+#: MoinMoin/auth/__init__.py:262 MoinMoin/auth/ldap_login.py:202
+#: MoinMoin/auth/ldap_login.py:254
 msgid "Invalid username or password."
 msgstr "Nome de usuário ou senha inválidos."
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:266
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
@@ -814,16 +725,16 @@
 "Se você ainda não tem uma conta, <a href=\"%(register_url)s\">crie uma "
 "agora</a>. "
 
-#: MoinMoin/auth/__init__.py:258
+#: MoinMoin/auth/__init__.py:268
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Esqueceu sua senha?</a>"
 
-#: MoinMoin/auth/http.py:59
+#: MoinMoin/auth/http.py:60
 msgid "Please log in first."
 msgstr "Por favor conecte-se primeiro."
 
-#: MoinMoin/auth/ldap_login.py:262
+#: MoinMoin/auth/ldap_login.py:268
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "O servidor LDAP  %(server)s falhou."
@@ -856,15 +767,15 @@
 msgid "No OpenID service at this URL."
 msgstr "Não existe um serviço de OpenID neste URL"
 
-#: MoinMoin/config/default.py:258
+#: MoinMoin/config/default.py:278
 msgid "Password is too short."
 msgstr "Senha muito curta."
 
-#: MoinMoin/config/default.py:260
+#: MoinMoin/config/default.py:280
 msgid "Password has not enough different characters."
 msgstr "A senha não tem caracteres diferentes o suficiente."
 
-#: MoinMoin/config/default.py:266
+#: MoinMoin/config/default.py:286
 msgid ""
 "Password is too easy to guess (password contains name or name contains "
 "password)."
@@ -872,162 +783,162 @@
 "Senha muito fácil de adivinhar (senha contém nome de usuário ou nome de "
 "usuário contém senha)."
 
-#: MoinMoin/config/default.py:275
+#: MoinMoin/config/default.py:295
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Senha muito fácil de adivinhar (sequencia de teclado)."
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home"
 msgstr "Início"
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home Page"
 msgstr "Página Inicial"
 
-#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:364 MoinMoin/config/default.py:392
 msgid "History"
 msgstr "Histórico"
 
-#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:365 MoinMoin/config/default.py:397
 msgid "Index"
 msgstr "Índice"
 
-#: MoinMoin/config/default.py:336
+#: MoinMoin/config/default.py:365 MoinMoin/templates/index.html:7
+#: MoinMoin/templates/index.html:118
+msgid "Global Index"
+msgstr "Índice Global"
+
+#: MoinMoin/config/default.py:366
 msgid "Global Tags Index"
 msgstr "Índice geral de Tags"
 
-#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
-#: MoinMoin/templates/index.html:132
-msgid "More"
-msgstr "Mais"
-
-#: MoinMoin/config/default.py:337
+#: MoinMoin/config/default.py:368
 msgid "Administration & Docs"
 msgstr "Administração e Documentos"
 
-#: MoinMoin/config/default.py:360
+#: MoinMoin/config/default.py:390
 msgid "Show"
 msgstr "Mostrar"
 
-#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
+#: MoinMoin/config/default.py:391 MoinMoin/templates/index.html:27
 msgid "Download"
 msgstr "Download"
 
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:392
 msgid "Revision History"
 msgstr "Histórico de revisões"
 
-#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:395 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Modificar"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:395
 msgid "Edit or Upload"
 msgstr "Editar ou fazer upload"
 
-#: MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:397
 msgid "List sub-items"
 msgstr "Listar sub itens"
 
-#: MoinMoin/config/default.py:368
+#: MoinMoin/config/default.py:398
 msgid "Comments"
 msgstr "Comentários"
 
-#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+#: MoinMoin/config/default.py:398 MoinMoin/templates/common.js:56
 #, fuzzy
 msgid "Hide comments"
 msgstr "Comentários"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:399
 msgid "Transclusions"
 msgstr ""
 
-#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+#: MoinMoin/config/default.py:399 MoinMoin/templates/common.js:90
 msgid "Show transclusions"
 msgstr ""
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:400
 msgid "Highlight"
 msgstr "Realçar"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:400
 msgid "Show with Syntax-Highlighting"
 msgstr "Mostrar com realçador de sintaxe"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:401
 msgid "Meta"
 msgstr "Meta"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:401
 msgid "Display Metadata"
 msgstr "Mostrar metadados"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:402
 msgid "Create or remove a navigation link to this item"
 msgstr "Criar ou remover um link de navegação para este item"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:403
 msgid "Switch notifications about item changes on or off"
 msgstr "Ligar/desligar notificações de modificações de item"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:404
 msgid "Rename"
 msgstr "Renomear"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:404
 msgid "Rename this item"
 msgstr "Renomear este item"
 
-#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
+#: MoinMoin/config/default.py:405 MoinMoin/templates/index.html:31
 msgid "Delete"
 msgstr "Apagar"
 
-#: MoinMoin/config/default.py:375
+#: MoinMoin/config/default.py:405
 #, fuzzy
 msgid "Delete this item"
 msgstr "Renomear este item"
 
-#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
+#: MoinMoin/config/default.py:406 MoinMoin/templates/index.html:36
 msgid "Destroy"
 msgstr "Destruir"
 
-#: MoinMoin/config/default.py:376
+#: MoinMoin/config/default.py:406
 msgid "Completely destroy this item"
 msgstr "Destruir completamente este item"
 
-#: MoinMoin/config/default.py:377
+#: MoinMoin/config/default.py:407
 msgid "Referrers"
 msgstr "Referências"
 
-#: MoinMoin/config/default.py:377
+#: MoinMoin/config/default.py:407
 msgid "What refers here?"
 msgstr "O que faz referência para cá?"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:408
 msgid "Site Map"
 msgstr "Mapa do site"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:408
 msgid "Local Site Map of this item"
 msgstr "Mapa do site local para este item"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:409
 msgid "Similar"
 msgstr "Similar"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:409
 msgid "Items with similar names"
 msgstr "Itens com nomes similares"
 
-#: MoinMoin/converter/archive_in.py:59
-msgid "Date"
-msgstr ""
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Hora e Data (timestamp)"
 
-#: MoinMoin/converter/html_out.py:539
+#: MoinMoin/converter/html_out.py:560
 msgid "Link to this heading"
 msgstr ""
 
-#: MoinMoin/converter/html_out.py:605
+#: MoinMoin/converter/html_out.py:624
 msgid "Contents"
 msgstr "Conteúdo"
 
@@ -1035,46 +946,114 @@
 msgid "Error: invalid macro name."
 msgstr ""
 
-#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
+#: MoinMoin/converter/macro.py:90 MoinMoin/converter/macro_Verbatim.py:66
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr "<<%(macro_name)s: execução falhou [%(error_msg)s] (veja também o log)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1034
+#: MoinMoin/converter/moinwiki_in.py:950
 msgid "Error:"
 msgstr "Erro:"
 
-#: MoinMoin/converter/moinwiki_in.py:1035
+#: MoinMoin/converter/moinwiki_in.py:951
 msgid "is invalid within"
 msgstr "é inválido em"
 
-#: MoinMoin/converter/nonexistent_in.py:31
+#: MoinMoin/converter/nonexistent_in.py:32
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "%(item_name)s não existe. Criar?"
 
-#: MoinMoin/items/__init__.py:624
-msgid "Invalid JSON."
-msgstr "JSON inválido"
-
-#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/items/__init__.py:174 MoinMoin/templates/atom.html:12
 #: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
 msgid "Comment"
 msgstr "Comentário"
 
-#: MoinMoin/items/__init__.py:635
+#: MoinMoin/items/__init__.py:174
 msgid "Comment about your change"
 msgstr "Comente suas mudanças"
 
-#: MoinMoin/items/__init__.py:669
-msgid "MetaData (JSON)"
-msgstr "Metadado (JSON)"
+#: MoinMoin/items/__init__.py:175
+msgid "OK"
+msgstr "OK"
 
-#: MoinMoin/items/__init__.py:670
+#: MoinMoin/items/__init__.py:179
+#, fuzzy
+msgid "Item type"
+msgstr "Mimetypes"
+
+#: MoinMoin/items/__init__.py:180
+#, fuzzy
+msgid "Content type"
+msgstr "Content-Type"
+
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
+msgid "Summary"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
+#, fuzzy
+msgid "One-line summary of the item"
+msgstr "Mapa do site local para este item"
+
+#: MoinMoin/items/__init__.py:406
+msgid "Extra MetaData (JSON)"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:658
+#, fuzzy
+msgid "Wiki item"
+msgstr "Criar novo item?"
+
+#: MoinMoin/items/__init__.py:749
+msgid "User profile"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:750
+msgid "User profile item (not implemented yet!)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:32
+msgid "Supertags (Categories)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:33
+msgid "Ordered comma separated list of tags"
+msgstr ""
+
+#: MoinMoin/items/blog.py:37
+msgid "Title"
+msgstr ""
+
+#: MoinMoin/items/blog.py:38
+msgid "One-line title of the blog entry"
+msgstr ""
+
+#: MoinMoin/items/blog.py:39
+msgid "Publication time (UTC)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:45
+msgid "Blog"
+msgstr ""
+
+#: MoinMoin/items/blog.py:46
+msgid "Blog item"
+msgstr ""
+
+#: MoinMoin/items/blog.py:98
+msgid "Blog entry"
+msgstr ""
+
+#: MoinMoin/items/blog.py:99
+msgid "Blog entry item"
+msgstr ""
+
+#: MoinMoin/items/content.py:319
 msgid "Upload file:"
 msgstr "Upload de arquivo:"
 
-#: MoinMoin/items/__init__.py:740
+#: MoinMoin/items/content.py:337
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
@@ -1082,59 +1061,145 @@
 "Itens tem o mesmo código hash (significa que provavelmente eles têm o "
 "mesmo conteúdo)"
 
-#: MoinMoin/items/__init__.py:742
+#: MoinMoin/items/content.py:339
 msgid "The items have different data."
 msgstr "Os itens tem conteúdos diferentes."
 
-#: MoinMoin/items/__init__.py:754
+#: MoinMoin/items/content.py:351
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr "Impossível converter o conteúdo do contenttype: %(contenttype)s"
 
-#: MoinMoin/items/__init__.py:1120
+#: MoinMoin/items/content.py:805
 msgid "Type your text here"
 msgstr "Digite seu texto aqui"
 
-#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
+#: MoinMoin/items/content.py:1060
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Editar desenho %(filename)s (abre em nova janela)"
 
-#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
+#: MoinMoin/items/content.py:1064
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Desenho clicável: %(filename)s"
 
-#: MoinMoin/mail/sendmail.py:94
+#: MoinMoin/items/ticket.py:43
+msgid "Effort"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:44
+msgid "Difficulty"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:45
+#, fuzzy
+msgid "Severity"
+msgstr "reverter"
+
+#: MoinMoin/items/ticket.py:46
+msgid "Priority"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:48
+msgid "Assigned To"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:49
+msgid "Superseded By"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:50
+msgid "Depends On"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:54
+msgid "Supersedes"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:55
+msgid "Required By"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:56
+#, fuzzy
+msgid "Subscribers"
+msgstr "Não acompanhar"
+
+#: MoinMoin/items/ticket.py:68
+#, fuzzy
+msgid "Message"
+msgstr "Página Inicial"
+
+#: MoinMoin/items/ticket.py:79
+msgid "Submit ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:98
+msgid "Update ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:100
+msgid "Update & reopen ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:101
+msgid "Update & close ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:139
+msgid "Ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:140
+#, fuzzy
+msgid "Ticket item"
+msgstr "Criar novo item?"
+
+#: MoinMoin/mail/sendmail.py:91
+msgid ""
+"Contact administrator: cannot send password recovery e-mail because mail "
+"configuration is incomplete."
+msgstr ""
+
+#: MoinMoin/mail/sendmail.py:99
 msgid "No recipients, nothing to do"
 msgstr "Sem destinatário, nada a fazer."
 
-#: MoinMoin/mail/sendmail.py:170
+#: MoinMoin/mail/sendmail.py:175
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Conexão com o servidor de email '%(server)s' falhou: %(reason)s"
 
-#: MoinMoin/mail/sendmail.py:184
+#: MoinMoin/mail/sendmail.py:189
 msgid "Mail not sent"
 msgstr "Email não enviado"
 
-#: MoinMoin/mail/sendmail.py:187
+#: MoinMoin/mail/sendmail.py:192
 msgid "Mail sent successfully"
 msgstr "Email enviado"
 
-#: MoinMoin/search/__init__.py:17
+#: MoinMoin/search/__init__.py:18
 msgid "Search query too short."
 msgstr "Expressão de busca muito curta."
 
-#: MoinMoin/security/textcha.py:158
+#: MoinMoin/search/__init__.py:31
+msgid "search all revisions"
+msgstr ""
+
+#: MoinMoin/search/__init__.py:32 MoinMoin/templates/search.html:8
+msgid "Search"
+msgstr "Busca"
+
+#: MoinMoin/security/textcha.py:162
 msgid "The entered TextCha was incorrect."
 msgstr "O TextCha inserido está incorreto."
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/security/textcha.py:163
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr "A questão do TextCha expirou ou está inválida. Tente novamente."
 
-#: MoinMoin/security/textcha.py:178
+#: MoinMoin/security/textcha.py:183
 msgid "TextCha"
 msgstr "TextCha"
 
@@ -1148,24 +1213,47 @@
 msgid "Revision"
 msgstr "Revisao"
 
-#: MoinMoin/templates/common.js:73
+#: MoinMoin/templates/common.js:59
 #, fuzzy
 msgid "Show comments"
 msgstr "Mostrar comentários"
 
-#: MoinMoin/templates/common.js:107
+#: MoinMoin/templates/common.js:93
 msgid "Hide transclusions"
 msgstr ""
 
+#: MoinMoin/templates/crash.html:1
+msgid "Oops!"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:3
+msgid "An error happened while processing your request."
+msgstr ""
+
+#: MoinMoin/templates/crash.html:6
+msgid ""
+"More details have been logged. The following data is helpful for locating"
+" the corresponding log entries:"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:9
+msgid "Error ID"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:11
+#, fuzzy
+msgid "Server time"
+msgstr "Nome de usuário"
+
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr "Apagar '%(item_name)s'"
 
 #: MoinMoin/templates/destroy.html:4
-#, python-format
-msgid "DESTROY COMPLETE item '%(item_name)s'"
-msgstr "DESTRUIR COMPLETAMENTE o item '%(item_name)s'"
+#, fuzzy, python-format
+msgid "DESTROY COMPLETE ITEM '%(item_name)s'"
+msgstr "Apagar '%(item_name)s'"
 
 #: MoinMoin/templates/destroy.html:20
 #, fuzzy, python-format
@@ -1189,29 +1277,29 @@
 msgid "Line"
 msgstr "Linha"
 
-#: MoinMoin/templates/forms.html:158
+#: MoinMoin/templates/forms.html:218
 msgid "Upload"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:159
+#: MoinMoin/templates/forms.html:219
 #, fuzzy
 msgid "Upload files"
 msgstr "Upload de arquivo:"
 
-#: MoinMoin/templates/forms.html:164
+#: MoinMoin/templates/forms.html:224
 msgid "Start All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:165
+#: MoinMoin/templates/forms.html:225
 msgid "Cancel All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:169
+#: MoinMoin/templates/forms.html:229
 msgid "Start"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
-#: MoinMoin/templates/index.html:170
+#: MoinMoin/templates/forms.html:230 MoinMoin/templates/index.html:184
+#: MoinMoin/templates/index.html:202
 msgid "Cancel"
 msgstr ""
 
@@ -1219,13 +1307,13 @@
 msgid "Set bookmark"
 msgstr ""
 
-#: MoinMoin/templates/global_history.html:49
+#: MoinMoin/templates/global_history.html:48
 msgid "Delete bookmark"
 msgstr ""
 
 #: MoinMoin/templates/highlight.html:3
-#, python-format
-msgid "Syntax highlighting for Item: %(name)s"
+#, fuzzy, python-format
+msgid "Syntax highlighting of '%(name)s'"
 msgstr "Realçe de sintaxe para o item: %(name)s"
 
 #: MoinMoin/templates/history.html:4
@@ -1246,10 +1334,6 @@
 msgid "Rev."
 msgstr "Revisão"
 
-#: MoinMoin/templates/history.html:26
-msgid "Timestamp"
-msgstr "Hora e Data (timestamp)"
-
 #: MoinMoin/templates/history.html:29
 msgid "Editor"
 msgstr "Editor"
@@ -1287,69 +1371,120 @@
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Índice dos subitens de '%(item_name)s'"
 
-#: MoinMoin/templates/index.html:22
+#: MoinMoin/templates/index.html:15
 msgid "Select All"
 msgstr ""
 
-#: MoinMoin/templates/index.html:32
+#: MoinMoin/templates/index.html:25
 #, fuzzy
 msgid "New item"
 msgstr "Criar novo item?"
 
-#: MoinMoin/templates/index.html:50
+#: MoinMoin/templates/index.html:44
 msgid "Filter by content type"
 msgstr ""
 
-#: MoinMoin/templates/index.html:51
+#: MoinMoin/templates/index.html:45
 msgid "items having unknown mime types"
 msgstr ""
 
-#: MoinMoin/templates/index.html:55
+#: MoinMoin/templates/index.html:49
 #, fuzzy
 msgid "Toggle"
 msgstr "marcado com tag"
 
-#: MoinMoin/templates/index.html:96
+#: MoinMoin/templates/index.html:50
+msgid "More"
+msgstr "Mais"
+
+#: MoinMoin/templates/index.html:84
+msgid "This item itself also matches your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:105
+msgid "This item also has subitems that match your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:133
 msgid "Recently uploaded items"
 msgstr ""
 
-#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
+#: MoinMoin/templates/index.html:142 MoinMoin/templates/index.html:144
 msgid "All"
 msgstr ""
 
-#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
+#: MoinMoin/templates/index.html:156
+msgid "These items have subitems that match your filter:"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
+msgid "X"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
 msgid "Close"
 msgstr ""
 
-#: MoinMoin/templates/index.html:145
+#: MoinMoin/templates/index.html:177
 msgid "Please provide comment for this action"
 msgstr ""
 
-#: MoinMoin/templates/index.html:148
+#: MoinMoin/templates/index.html:180
 msgid "Enter your comment"
 msgstr ""
 
-#: MoinMoin/templates/index.html:151
+#: MoinMoin/templates/index.html:183
 msgid "Submit"
 msgstr ""
 
-#: MoinMoin/templates/index.html:158
+#: MoinMoin/templates/index.html:190
 #, fuzzy
 msgid "Create new item"
 msgstr "Criar novo item?"
 
-#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
+#: MoinMoin/templates/index.html:196 MoinMoin/templates/index.html:198
 msgid "Enter item name here"
 msgstr ""
 
-#: MoinMoin/templates/index.html:169
+#: MoinMoin/templates/index.html:201
 msgid "Create"
 msgstr ""
 
-#: MoinMoin/templates/index.html:180
+#: MoinMoin/templates/index.html:212
 msgid "(Drag and drop multiple files to this white area to upload them.)"
 msgstr ""
 
+#: MoinMoin/templates/index_action.js:19
+msgid "Deleting.."
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:19
+#, fuzzy
+msgid "Destroying.."
+msgstr "destruir"
+
+#: MoinMoin/templates/index_action.js:20
+msgid "Items deleted: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:20
+#, fuzzy
+msgid "Items destroyed: "
+msgstr "destruir"
+
+#: MoinMoin/templates/index_action.js:21
+msgid ", Items not deleted: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:21
+msgid ", Items not destroyed: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:186
+#: MoinMoin/templates/index_action.js:207
+msgid "Nothing was selected."
+msgstr ""
+
 #: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr "Remover Link"
@@ -1366,11 +1501,11 @@
 msgid "Subscribe"
 msgstr "Acompanhar"
 
-#: MoinMoin/templates/layout.html:50
+#: MoinMoin/templates/layout.html:51
 msgid "Settings"
 msgstr "Configurações"
 
-#: MoinMoin/templates/layout.html:56
+#: MoinMoin/templates/layout.html:57
 msgid "Logout"
 msgstr "Sair"
 
@@ -1378,7 +1513,7 @@
 msgid "Moin login"
 msgstr "Login Moin"
 
-#: MoinMoin/templates/login.html:25
+#: MoinMoin/templates/login.html:26
 msgid "OpenID login"
 msgstr "Login OpenID"
 
@@ -1399,27 +1534,62 @@
 msgid "Metadata of '%(item_name)s'"
 msgstr "Metadados de '%(item_name)s'"
 
-#: MoinMoin/templates/modify_anywikidraw.html:18
-#: MoinMoin/templates/modify_twikidraw.html:13
+#: MoinMoin/templates/modify.html:13
+#, fuzzy, python-format
+msgid "Modifying '%(item_name)s'"
+msgstr "Modificando %(item_name)s"
+
+#: MoinMoin/templates/modify.html:27
+#, fuzzy
+msgid "Link to Subitem"
+msgstr "Listar sub itens"
+
+#: MoinMoin/templates/modify.html:27
+msgid "Link"
+msgstr ""
+
+#: MoinMoin/templates/modify.html:30
+msgid "Transclude Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify.html:30
+msgid "Transclude"
+msgstr ""
+
+#: MoinMoin/templates/modify_anywikidraw.html:17
+#: MoinMoin/templates/modify_twikidraw.html:12
 msgid "NOTE:"
 msgstr "NOTA:"
 
-#: MoinMoin/templates/modify_anywikidraw.html:18
-#: MoinMoin/templates/modify_twikidraw.html:13
+#: MoinMoin/templates/modify_anywikidraw.html:17
+#: MoinMoin/templates/modify_twikidraw.html:12
 msgid "You need a Java enabled browser to edit the drawing."
 msgstr "Você precisa de um navegador com Java para editar o desenho"
 
-#: MoinMoin/templates/modify_applet.html:4
-#, python-format
-msgid "Modifying %(item_name)s"
-msgstr "Modificando %(item_name)s"
-
-#: MoinMoin/templates/modify_show_template_selection.html:3
-#: MoinMoin/templates/modify_show_type_selection.html:3
+#: MoinMoin/templates/modify_select_contenttype.html:3
+#: MoinMoin/templates/modify_select_template.html:3
 msgid "Create new item?"
 msgstr "Criar novo item?"
 
-#: MoinMoin/templates/modify_show_template_selection.html:5
+#: MoinMoin/templates/modify_select_contenttype.html:6
+#, python-format
+msgid "Please select the contenttype of the new %(itemtype)s item."
+msgstr ""
+
+#: MoinMoin/templates/modify_select_itemtype.html:3
+msgid "Item not found, create it now?"
+msgstr ""
+
+#: MoinMoin/templates/modify_select_itemtype.html:5
+#, fuzzy, python-format
+msgid ""
+"Item '%(name)s' does not exist (yet), but you can try creating it now. "
+"Please select the type of the item you want to create."
+msgstr ""
+"Este item não existe (ainda), mas você pode tentar criá-lo agora. "
+"Selecione o tipo de item que você quer criar."
+
+#: MoinMoin/templates/modify_select_template.html:5
 #, python-format
 msgid ""
 "You can either <a href='%(modifyhref)s'>create the item from scratch</a> "
@@ -1428,35 +1598,10 @@
 "Você pode <a href='%(modifyhref)s'>começar 'do zero'</a> ou selecionar um"
 " modelo pré definido."
 
-#: MoinMoin/templates/modify_show_template_selection.html:8
+#: MoinMoin/templates/modify_select_template.html:8
 msgid "Available template items"
 msgstr "Modelos de item disponíveis"
 
-#: MoinMoin/templates/modify_show_type_selection.html:5
-msgid ""
-"This item does not exist (yet), but you can try creating it now. Please "
-"select the type of the item you want to create."
-msgstr ""
-"Este item não existe (ainda), mas você pode tentar criá-lo agora. "
-"Selecione o tipo de item que você quer criar."
-
-#: MoinMoin/templates/modify_text.html:9
-#, fuzzy
-msgid "Link to Subitem"
-msgstr "Listar sub itens"
-
-#: MoinMoin/templates/modify_text.html:9
-msgid "Link"
-msgstr ""
-
-#: MoinMoin/templates/modify_text.html:12
-msgid "Transclude Subitem"
-msgstr ""
-
-#: MoinMoin/templates/modify_text.html:12
-msgid "Transclude"
-msgstr ""
-
 #: MoinMoin/templates/openid_register.html:5 MoinMoin/templates/register.html:5
 msgid "Create Account"
 msgstr "Criar conta"
@@ -1471,37 +1616,37 @@
 msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
 msgstr "Reverter '%(item_name)s' (rev %(rev_no)d)"
 
-#: MoinMoin/templates/search.html:10
+#: MoinMoin/templates/search.html:16
 #, python-format
 msgid "%(result_len)d results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:15
+#: MoinMoin/templates/search.html:21
 #, python-format
 msgid "No results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:29
+#: MoinMoin/templates/search.html:37
 #, python-format
 msgid "name term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:30
+#: MoinMoin/templates/search.html:38
 #, python-format
 msgid "content term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#: MoinMoin/templates/search.html:53 MoinMoin/templates/show.html:54
 #, python-format
 msgid "Summary: %(summary)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:51
+#: MoinMoin/templates/search.html:59
 #, fuzzy, python-format
 msgid "Revision: %(revid)s Last Change: %(mtime)s"
 msgstr "Revisão %(revno)d em %(date_time)s"
 
-#: MoinMoin/templates/search.html:59
+#: MoinMoin/templates/search.html:67
 msgid "You don't have read permission for this item."
 msgstr ""
 
@@ -1525,7 +1670,7 @@
 msgid "modified"
 msgstr "modificado"
 
-#: MoinMoin/templates/show.html:78
+#: MoinMoin/templates/show.html:78 MoinMoin/templates/blog/utils.html:22
 msgid "by"
 msgstr "por"
 
@@ -1533,34 +1678,33 @@
 msgid "tagged"
 msgstr "marcado com tag"
 
+#: MoinMoin/templates/show_nonexistent.html:3
+msgid "Item not found"
+msgstr ""
+
+#: MoinMoin/templates/show_nonexistent.html:5
+#, fuzzy, python-format
+msgid "Item '%(name)s' does not exist."
+msgstr "%(item_name)s não existe. Criar?"
+
 #: MoinMoin/templates/sitemap.html:3
-#, python-format
-msgid "SiteMap of %(item_name)s"
+#, fuzzy, python-format
+msgid "SiteMap of '%(item_name)s'"
 msgstr "Mapa do site de %(item_name)s"
 
-#: MoinMoin/templates/usersettings.html:8
-msgid "Personal Settings"
-msgstr "Configurações Pessoais"
-
-#: MoinMoin/templates/usersettings.html:13
-msgid "Change Password"
-msgstr "Mudar senha"
+#: MoinMoin/templates/ticket.html:5
+#, fuzzy, python-format
+msgid "Creating new ticket: '%(item_name)s'"
+msgstr "Renomear '%(item_name)s'"
 
-#: MoinMoin/templates/usersettings.html:18
-msgid "Notification Settings"
-msgstr "Configurações de Notificações"
+#: MoinMoin/templates/ticket.html:7
+#, fuzzy, python-format
+msgid "Ticket: '%(item_name)s'"
+msgstr "Apagar '%(item_name)s'"
 
-#: MoinMoin/templates/usersettings.html:23
-msgid "Wiki Appearance Settings"
-msgstr "Configurações de Aparência do Wiki"
-
-#: MoinMoin/templates/usersettings.html:28
-msgid "Navigation Settings"
-msgstr "Configurações de Navegação"
-
-#: MoinMoin/templates/usersettings.html:33
-msgid "Options"
-msgstr "Opções"
+#: MoinMoin/templates/ticket.html:20
+msgid "(Closed)"
+msgstr ""
 
 #: MoinMoin/templates/usersettings_forms.html:35
 msgid ""
@@ -1568,149 +1712,273 @@
 "sent to you."
 msgstr ""
 
-#: MoinMoin/templates/utils.html:62
+#: MoinMoin/templates/usersettings_forms.html:90
+msgid "Personal Settings"
+msgstr "Configurações Pessoais"
+
+#: MoinMoin/templates/usersettings_forms.html:94
+msgid "Change Password"
+msgstr "Mudar senha"
+
+#: MoinMoin/templates/usersettings_forms.html:98
+msgid "Notification Settings"
+msgstr "Configurações de Notificações"
+
+#: MoinMoin/templates/usersettings_forms.html:102
+msgid "Wiki Appearance Settings"
+msgstr "Configurações de Aparência do Wiki"
+
+#: MoinMoin/templates/usersettings_forms.html:106
+msgid "Navigation Settings"
+msgstr "Configurações de Navegação"
+
+#: MoinMoin/templates/usersettings_forms.html:110
+msgid "Options"
+msgstr "Opções"
+
+#: MoinMoin/templates/utils.html:72
 msgid "Expand Subitem"
 msgstr ""
 
-#: MoinMoin/templates/utils.html:79
+#: MoinMoin/templates/utils.html:91
 #, fuzzy
 msgid "Subitems"
 msgstr "Listar sub itens"
 
-#: MoinMoin/themes/__init__.py:57
-msgid "Access denied"
+#: MoinMoin/templates/blog/main.html:4
+msgid "There are no entries in this blog."
+msgstr ""
+
+#: MoinMoin/templates/blog/main.html:6
+#, python-format
+msgid "There are no entries in the '%(tag)s' blog category."
+msgstr ""
+
+#: MoinMoin/templates/blog/main.html:13
+msgid "Category:"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:15
+#, fuzzy
+msgid "Modify entry"
+msgstr "modificado"
+
+#: MoinMoin/templates/blog/utils.html:21
+msgid "Published on"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:24
+msgid "Not published yet."
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:34
+#, fuzzy
+msgid "Tags:"
+msgstr "Tags"
+
+#: MoinMoin/templates/blog/utils.html:44
+msgid "Discussion page"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:51
+msgid "Categories"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:69
+msgid "only this blog"
+msgstr ""
+
+#: MoinMoin/themes/__init__.py:58
+#, fuzzy
+msgid "Access Denied"
 msgstr "Acesso negado"
 
-#: MoinMoin/themes/__init__.py:58
+#: MoinMoin/themes/__init__.py:59
 msgid "You are not allowed to access this resource."
 msgstr "Você não tem permissão para acessar este recurso."
 
-#: MoinMoin/themes/__init__.py:292
+#: MoinMoin/themes/__init__.py:286
 msgid "anonymous"
 msgstr "anônimo"
 
-#: MoinMoin/util/paramparser.py:316
+#: MoinMoin/util/paramparser.py:318
 #, python-format
 msgid "Argument \"%(name)s\" must be a boolean value, not \"%(value)s\""
 msgstr "O argumento \"%(name)s\" deve ser um valor booleano, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:319
+#: MoinMoin/util/paramparser.py:321
 #, python-format
 msgid "Argument must be a boolean value, not \"%(value)s\""
 msgstr "O argumento deve ser um valor booleano, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:345
+#: MoinMoin/util/paramparser.py:347
 #, python-format
 msgid "Argument \"%(name)s\" must be an integer value, not \"%(value)s\""
 msgstr "O argumento \"%(name)s\" deve ser um número inteiro, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:348
+#: MoinMoin/util/paramparser.py:350
 #, python-format
 msgid "Argument must be an integer value, not \"%(value)s\""
 msgstr "O argumento deve ser um número inteiro, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:373
+#: MoinMoin/util/paramparser.py:375
 #, python-format
 msgid "Argument \"%(name)s\" must be a floating point value, not \"%(value)s\""
 msgstr ""
 "O argumento \"%(name)s\" deve ser um número em ponto flutuante, e não "
 "\"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:376
+#: MoinMoin/util/paramparser.py:378
 #, python-format
 msgid "Argument must be a floating point value, not \"%(value)s\""
 msgstr "O argumento deve ser um número em ponto flutuante, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:403
+#: MoinMoin/util/paramparser.py:405
 #, python-format
 msgid "Argument \"%(name)s\" must be a complex value, not \"%(value)s\""
 msgstr "O argumento \"%(name)s\" deve ser um número complexo, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:406
+#: MoinMoin/util/paramparser.py:408
 #, python-format
 msgid "Argument must be a complex value, not \"%(value)s\""
 msgstr "O argumento deve ser um número complexo, e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:460
+#: MoinMoin/util/paramparser.py:462
 #, python-format
 msgid "Argument \"%(name)s\" must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr ""
 "O argumento \"%(name)s\" deve ser um dos \"%(choices)s\", e não "
 "\"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:465
+#: MoinMoin/util/paramparser.py:467
 #, python-format
 msgid "Argument must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr "O argumento deve ser um dos \"%(choices)s\", e não \"%(value)s\""
 
-#: MoinMoin/util/paramparser.py:690
+#: MoinMoin/util/paramparser.py:691
 msgid "Too many arguments"
 msgstr "Muitos argumentos"
 
-#: MoinMoin/util/paramparser.py:695
+#: MoinMoin/util/paramparser.py:696
 msgid "Cannot have arguments without name following named arguments"
 msgstr "Você não pode ter argumentos sem nome seguidos de argumentos com nome"
 
-#: MoinMoin/util/paramparser.py:711
+#: MoinMoin/util/paramparser.py:712
 #, python-format
 msgid "Argument \"%(name)s\" is required"
 msgstr "O argumento \"%(name)s\" é obrigatório"
 
-#: MoinMoin/util/paramparser.py:723
+#: MoinMoin/util/paramparser.py:724
 #, python-format
 msgid "No argument named \"%(name)s\""
 msgstr "Nenhum argumento de nome \"%(name)s\""
 
-#~ msgid "Refers Here"
-#~ msgstr "Faz referência aqui"
-
-#~ msgid "Switch showing comments on or off"
-#~ msgstr "Ligar/desligar comentários"
-
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
-#~ msgid "Create a copy of this item"
-#~ msgstr "Criar uma cópia deste item"
+#~ msgid "User Browser"
+#~ msgstr "Gerenciador de usuários"
 
-#~ msgid "Move this item to the trash"
-#~ msgstr "Mover este item para a lixeira"
-
-#~ msgid "Permission denied!"
-#~ msgstr "Permissão negada!"
+#~ msgid "System items upgrade"
+#~ msgstr "Atualização de itens de sistema"
 
-#~ msgid "You"
-#~ msgstr "Você"
+#~ msgid "System items upgrade failed due to the following error: %(error)s."
+#~ msgstr ""
+#~ "A atualização de itens de sistema "
+#~ "falhou devido aos seguintes erros: "
+#~ "%(error)s."
 
-#~ msgid "%(username)s may not %(priv)s '%(item)s'."
-#~ msgstr "%(username)s não pode %(priv)s '%(item)s'."
+#~ msgid "System items have been upgraded successfully!"
+#~ msgstr "Itens de sistema foram atualizados corretamente!"
 
-#~ msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
-#~ msgstr "DESTRUIR REVISÃO '%(item_name)s' (rev %(rev_no)d)"
+#~ msgid "Wiki Configuration"
+#~ msgstr "Configuração do Wiki"
+
+#~ msgid "Highlighter Help"
+#~ msgstr "realçe"
+
+#~ msgid "Interwiki Help"
+#~ msgstr "Nome InterWiki"
+
+#~ msgid "Available Highlighters"
+#~ msgstr "Realçadores disponíveis"
+
+#~ msgid "Upgrade system items"
+#~ msgstr "Atualizar itens de sistema"
+
+#~ msgid "Show Wiki Configuration Help"
+#~ msgstr "Mostrar ajuda para configuração do Wiki"
+
+#~ msgid "Known InterWiki names"
+#~ msgstr "Nomes InterWiki conhecidos"
 
 #~ msgid ""
-#~ "Item: %(item_name)s (Diff between revision "
-#~ "%(oldrevno)s and %(newrevno)s)"
-#~ msgstr "Item: %(item_name)s (Diff entre revisão %(oldrevno)s e %(newrevno)s)"
-
-#~ msgid "No older revision"
-#~ msgstr "Não há revisão mais antiga"
-
-#~ msgid "Use older revision"
-#~ msgstr "Usar revisão mais antiga"
+#~ "You can upgrade your system items "
+#~ "by uploading an xml file with new"
+#~ " items below."
+#~ msgstr ""
+#~ "Você pode atualizar os itens de "
+#~ "sistema fazendo o upload de um "
+#~ "arquivo xml com os novos itens "
+#~ "abaixo."
 
-#~ msgid "No newer revision"
-#~ msgstr "Não há revisão mais nova"
-
-#~ msgid "Use newer revision"
-#~ msgstr "Usar revisão mais nova"
+#~ msgid "Wiki configuration"
+#~ msgstr "Configuração do Wiki"
 
-#~ msgid "Action"
-#~ msgstr "Ação"
+#~ msgid "WikiConfig Help"
+#~ msgstr "Ajuda para o WikiConfig"
 
-#~ msgid "This item exists, but it has no revisions."
-#~ msgstr "Este item existe, mas não tem revisões"
+#~ msgid "name_exact"
+#~ msgstr ""
 
-#~ msgid "Total: %(total)s"
-#~ msgstr "Total: %(total)s"
+#~ msgid "itemid"
+#~ msgstr ""
 
+#~ msgid "revid"
+#~ msgstr ""
+
+#~ msgid "userid"
+#~ msgstr ""
+
+#~ msgid "language"
+#~ msgstr ""
+
+#~ msgid "itemlinks"
+#~ msgstr ""
+
+#~ msgid "itemtransclusions"
+#~ msgstr ""
+
+#~ msgid "refs"
+#~ msgstr ""
+
+#~ msgid "markup text"
+#~ msgstr ""
+
+#~ msgid "other text"
+#~ msgstr ""
+
+#~ msgid "image"
+#~ msgstr ""
+
+#~ msgid "audio"
+#~ msgstr ""
+
+#~ msgid "video"
+#~ msgstr ""
+
+#~ msgid "other"
+#~ msgstr "mais antigas"
+
+#~ msgid "unknown"
+#~ msgstr "<desconhecido>"
+
+#~ msgid "Alias-Name"
+#~ msgstr "Apelido"
+
+#~ msgid "Date"
+#~ msgstr ""
+
+#~ msgid "MetaData (JSON)"
+#~ msgstr "Metadado (JSON)"
+
+#~ msgid "DESTROY COMPLETE item '%(item_name)s'"
+#~ msgstr "DESTRUIR COMPLETAMENTE o item '%(item_name)s'"
+
--- a/MoinMoin/translations/ru/LC_MESSAGES/messages.po	Sun Mar 03 19:39:31 2013 +0100
+++ b/MoinMoin/translations/ru/LC_MESSAGES/messages.po	Sun Mar 03 19:52:02 2013 +0100
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: moin 2.0\n"
 "Report-Msgid-Bugs-To: Russian <moin-user@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2012-07-15 23:32+0200\n"
+"POT-Creation-Date: 2013-03-03 19:37+0100\n"
 "PO-Revision-Date: 2011-12-04 17:55+0400\n"
 "Last-Translator: S Kinder <skinder0@gmail.com>\n"
 "Language-Team: Russian <moin-devel@lists.sourceforge.net>\n"
@@ -14,49 +14,70 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: MoinMoin/forms.py:37
+#: MoinMoin/forms.py:73
+msgid "Invalid JSON."
+msgstr "Неправильный JSON."
+
+#: MoinMoin/forms.py:86
 msgid "OpenID"
 msgstr "OpenID"
 
-#: MoinMoin/forms.py:37
+#: MoinMoin/forms.py:86
 #, fuzzy
 msgid "OpenID address"
 msgstr "Ваш OpenID"
 
-#: MoinMoin/forms.py:39
+#: MoinMoin/forms.py:88
 msgid "Your OpenID address"
 msgstr "Ваш OpenID"
 
-#: MoinMoin/forms.py:41
+#: MoinMoin/forms.py:90
 msgid "E-Mail"
 msgstr "Адрес электронной почты"
 
-#: MoinMoin/forms.py:41
+#: MoinMoin/forms.py:91
 #, fuzzy
 msgid "E-Mail address"
 msgstr "Адрес электронной почты"
 
-#: MoinMoin/forms.py:43
+#: MoinMoin/forms.py:93
 msgid "Your E-Mail address"
 msgstr "Адрес Вашей электронной почты"
 
-#: MoinMoin/forms.py:45
+#: MoinMoin/forms.py:95
 msgid "Password"
 msgstr "Пароль"
 
-#: MoinMoin/forms.py:56 MoinMoin/config/default.py:336
+#: MoinMoin/forms.py:130 MoinMoin/config/default.py:366
 msgid "Tags"
 msgstr "Теги"
 
-#: MoinMoin/forms.py:58
+#: MoinMoin/forms.py:133 MoinMoin/apps/frontend/views.py:1399
+#, fuzzy
+msgid "Names"
+msgstr "Переименовать"
+
+#: MoinMoin/forms.py:135
 msgid "Search Query"
 msgstr "Поиск"
 
-#: MoinMoin/forms.py:70
-msgid "OK"
-msgstr "OK"
+#: MoinMoin/forms.py:182
+msgid "YYYY-MM-DD HH:MM:SS (example: 2013-12-31 23:59:59)"
+msgstr ""
 
-#: MoinMoin/user.py:54
+#: MoinMoin/forms.py:183
+msgid "Please use the following format: YYYY-MM-DD HH:MM:SS"
+msgstr ""
+
+#: MoinMoin/forms.py:201
+msgid "Invalid Reference."
+msgstr ""
+
+#: MoinMoin/forms.py:209
+msgid "(None)"
+msgstr ""
+
+#: MoinMoin/user.py:56
 #, python-format
 msgid ""
 "Invalid user name '%(name)s'.\n"
@@ -67,16 +88,16 @@
 "Имя может содержать буквы и цифры любого языка, между словами - не более "
 "одного пробела. Нельзя использовать имя группы."
 
-#: MoinMoin/user.py:60
+#: MoinMoin/user.py:62
 msgid "This user name already belongs to somebody else."
 msgstr "Это имя уже занято."
 
-#: MoinMoin/user.py:68
+#: MoinMoin/user.py:71
 #, python-format
 msgid "Password not acceptable: %(msg)s"
 msgstr "Пароль не принят: %(msg)s"
 
-#: MoinMoin/user.py:78
+#: MoinMoin/user.py:77
 msgid ""
 "Please provide your email address. If you lose your login information, "
 "you can get it by email."
@@ -84,15 +105,15 @@
 "Пожалуйста, укажите Ваш почтовый адрес. Если Вы потеряете данные для "
 "аутентификации (входа в вики), Вы сможете получить их по почте."
 
-#: MoinMoin/user.py:84
+#: MoinMoin/user.py:83
 msgid "This email already belongs to somebody else."
 msgstr "Этот почтовый адрес уже кем-то используется."
 
-#: MoinMoin/user.py:90
+#: MoinMoin/user.py:89
 msgid "This OpenID already belongs to somebody else."
 msgstr "Этот OpenID уже кем-то используется."
 
-#: MoinMoin/user.py:730
+#: MoinMoin/user.py:759
 #, python-format
 msgid ""
 "Somebody has requested to email you a password recovery link.\n"
@@ -113,12 +134,12 @@
 "Если Вы не забывали свой пароль, проигнорируйте это письмо.\n"
 "\n"
 
-#: MoinMoin/user.py:733
+#: MoinMoin/user.py:761
 #, python-format
 msgid "[%(sitename)s] Your wiki password recovery link"
 msgstr "[%(sitename)s] Ваша ссылка для восстановления пароля"
 
-#: MoinMoin/user.py:751
+#: MoinMoin/user.py:779
 #, fuzzy, python-format
 msgid ""
 "Somebody has created an account with this email address.\n"
@@ -139,206 +160,131 @@
 "Если Вы не забывали свой пароль, проигнорируйте это письмо.\n"
 "\n"
 
-#: MoinMoin/user.py:754
+#: MoinMoin/user.py:781
 #, python-format
 msgid "[%(sitename)s] Please verify your email address"
 msgstr ""
 
-#: MoinMoin/apps/admin/views.py:30
+#: MoinMoin/apps/admin/views.py:31 MoinMoin/config/default.py:368
 msgid "Admin"
 msgstr ""
 
-#: MoinMoin/apps/admin/views.py:48
-#: MoinMoin/apps/admin/templates/admin/index.html:9
-msgid "User Browser"
-msgstr "Просмотр пользователей"
+#: MoinMoin/apps/admin/views.py:36 MoinMoin/config/default.py:367
+msgid "User"
+msgstr ""
 
-#: MoinMoin/apps/admin/views.py:60
+#: MoinMoin/apps/admin/views.py:53
+#: MoinMoin/apps/admin/templates/admin/index.html:5
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:3
+msgid "Users"
+msgstr ""
+
+#: MoinMoin/apps/admin/views.py:65
 #, python-format
 msgid "User profile of %(username)s: %(email)r"
 msgstr "Профиль пользователя %(username)s: %(email)r"
 
-#: MoinMoin/apps/admin/views.py:104
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:3
-msgid "System items upgrade"
-msgstr "Обновление системных объектов"
-
-#: MoinMoin/apps/admin/views.py:110
-#, python-format
-msgid "System items upgrade failed due to the following error: %(error)s."
-msgstr "Обновление системных объектов не удалось из-за следущей ошибки: %(error)s."
+#: MoinMoin/apps/admin/views.py:144
+#: MoinMoin/apps/admin/templates/admin/index.html:6
+#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
+msgid "Show Wiki Configuration"
+msgstr "Показать конфигурацию вики"
 
-#: MoinMoin/apps/admin/views.py:112
-msgid "System items have been upgraded successfully!"
-msgstr "Системные объекты успешно обновились!"
-
-#: MoinMoin/apps/admin/views.py:159
-#, fuzzy
-msgid "Wiki Configuration"
-msgstr "Конфигурация вики"
-
-#: MoinMoin/apps/admin/views.py:188
+#: MoinMoin/apps/admin/views.py:173
+#: MoinMoin/apps/admin/templates/admin/index.html:7
+#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
 #, fuzzy
 msgid "Wiki Configuration Help"
 msgstr "Конфигурация вики"
 
-#: MoinMoin/apps/admin/views.py:196
+#: MoinMoin/apps/admin/views.py:182
 msgid "Lexer description"
 msgstr "Описание лексера"
 
-#: MoinMoin/apps/admin/views.py:197
+#: MoinMoin/apps/admin/views.py:183
 msgid "Lexer names"
 msgstr "Имя лексера"
 
-#: MoinMoin/apps/admin/views.py:198
+#: MoinMoin/apps/admin/views.py:184
 msgid "File patterns"
 msgstr "Типы файлов"
 
-#: MoinMoin/apps/admin/views.py:199
+#: MoinMoin/apps/admin/views.py:185
 msgid "Mimetypes"
 msgstr "MIME-типы"
 
-#: MoinMoin/apps/admin/views.py:205
+#: MoinMoin/apps/admin/views.py:191
+#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
+#: MoinMoin/apps/admin/templates/user/index_user.html:14
 #, fuzzy
-msgid "Highlighter Help"
+msgid "Highlighters"
 msgstr "подсветка"
 
-#: MoinMoin/apps/admin/views.py:213
+#: MoinMoin/apps/admin/views.py:200
 msgid "InterWiki name"
 msgstr "Имя ИнтерВики"
 
-#: MoinMoin/apps/admin/views.py:214
+#: MoinMoin/apps/admin/views.py:201 MoinMoin/templates/crash.html:13
 msgid "URL"
 msgstr "URL"
 
-#: MoinMoin/apps/admin/views.py:218
+#: MoinMoin/apps/admin/views.py:205
 #, fuzzy
-msgid "Interwiki Help"
+msgid "Interwiki Names"
 msgstr "Имя ИнтерВики"
 
-#: MoinMoin/apps/admin/views.py:226 MoinMoin/converter/archive_in.py:59
+#: MoinMoin/apps/admin/views.py:214 MoinMoin/converter/archive_in.py:62
 #: MoinMoin/templates/atom.html:8 MoinMoin/templates/diff_text_atom.html:9
 #: MoinMoin/templates/history.html:27
 msgid "Size"
 msgstr "Размер"
 
-#: MoinMoin/apps/admin/views.py:227 MoinMoin/templates/index.html:162
+#: MoinMoin/apps/admin/views.py:215 MoinMoin/templates/index.html:194
 msgid "Item name"
 msgstr "Имя объекта"
 
-#: MoinMoin/apps/admin/views.py:233
+#: MoinMoin/apps/admin/views.py:221
 #, fuzzy
-msgid "Item Size"
+msgid "Item Sizes"
 msgstr "Размер окна редактирования"
 
-#: MoinMoin/apps/admin/templates/admin/highlighterhelp.html:4
-#: MoinMoin/apps/admin/templates/admin/index.html:20
-#: MoinMoin/apps/admin/templates/user/highlighterhelp.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:9
-msgid "Available Highlighters"
-msgstr "Доступные варианты подстветки синтаксиса"
-
 #: MoinMoin/apps/admin/templates/admin/index.html:3
-msgid "Documentation"
-msgstr "Документация"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:5
-msgid "Documentation (local)"
-msgstr "Документация (локальная)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:7
 msgid "Admin Menu"
 msgstr "Меню администрирования"
 
-#: MoinMoin/apps/admin/templates/admin/index.html:10
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:10
-msgid "Upgrade system items"
-msgstr "Обновить системные объекты"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:11
-msgid "Show Wiki Configuration"
-msgstr "Показать конфигурацию вики"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:12
-msgid "Show Wiki Configuration Help"
-msgstr "Показать помощь по конфигурации вики"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:14
-#: MoinMoin/apps/admin/templates/user/index_user.html:3
-msgid "User Menu"
-msgstr "Пользовательское меню"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:16
-#: MoinMoin/apps/admin/templates/user/index_user.html:5
-#: MoinMoin/apps/frontend/views.py:903 MoinMoin/apps/frontend/views.py:905
-msgid "Wanted Items"
-msgstr "Требуемые объекты"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:17
-#: MoinMoin/apps/admin/templates/user/index_user.html:6
-#: MoinMoin/apps/frontend/views.py:919 MoinMoin/apps/frontend/views.py:922
-msgid "Orphaned Items"
-msgstr "Объекты-сироты"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:18
-#: MoinMoin/apps/admin/templates/admin/itemsize.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:7
-#: MoinMoin/apps/admin/templates/user/itemsize.html:4
-msgid "Item sizes (latest revision)"
-msgstr "Размеры объектов (последних версий)"
-
-#: MoinMoin/apps/admin/templates/admin/index.html:19
-#: MoinMoin/apps/admin/templates/admin/interwikihelp.html:4
-#: MoinMoin/apps/admin/templates/user/index_user.html:8
-#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
-msgid "Known InterWiki names"
-msgstr "Известные имена ИнтерВики"
-
-#: MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html:5
-msgid ""
-"You can upgrade your system items by uploading an xml file with new items"
-" below."
-msgstr ""
-"Вы можете обновить системные элементы, загрузив XML-файл с новыми "
-"объектами ниже."
-
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:5
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:6
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
 msgid "Member of Groups"
 msgstr "Член групп"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:7
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:8
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:9
 #: MoinMoin/templates/history.html:32
 msgid "Actions"
 msgstr "Действия"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:12
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:13
 msgid "disabled"
 msgstr "запрещен"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Enable user"
 msgstr "Разрешить использование учетной записи"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:23
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:24
 msgid "Disable user"
 msgstr "Запретить использование учетной записи"
 
-#: MoinMoin/apps/admin/templates/admin/userbrowser.html:28
+#: MoinMoin/apps/admin/templates/admin/userbrowser.html:29
 msgid "Mail account data"
 msgstr "Отправить мне почтой информацию по учетной записи"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfig.html:3
-msgid "Wiki configuration"
-msgstr "Конфигурация вики"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:5
 msgid ""
 "This table shows all settings in this wiki that do not have default "
@@ -353,18 +299,16 @@
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:14
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:12
-msgid "Variable name"
+#, fuzzy
+msgid "Variable Name"
 msgstr "Имя переменной"
 
 #: MoinMoin/apps/admin/templates/admin/wikiconfig.html:15
 msgid "Setting"
 msgstr "Настройка"
 
-#: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:3
-msgid "WikiConfig Help"
-msgstr "Помощь по WikiConfig"
-
 #: MoinMoin/apps/admin/templates/admin/wikiconfighelp.html:13
+#: MoinMoin/items/__init__.py:657
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -372,431 +316,400 @@
 msgid "Description"
 msgstr "Описание"
 
-#: MoinMoin/apps/feed/views.py:85
+#: MoinMoin/apps/admin/templates/user/index_user.html:3
+msgid "Documentation"
+msgstr "Документация"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:5
+msgid "Documentation (local)"
+msgstr "Документация (локальная)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:7
+msgid "User Menu"
+msgstr "Пользовательское меню"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:9
+#: MoinMoin/apps/frontend/views.py:789 MoinMoin/apps/frontend/views.py:790
+msgid "My Changes"
+msgstr ""
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:10
+#: MoinMoin/apps/frontend/views.py:927 MoinMoin/apps/frontend/views.py:929
+msgid "Wanted Items"
+msgstr "Требуемые объекты"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:11
+#: MoinMoin/apps/frontend/views.py:943 MoinMoin/apps/frontend/views.py:946
+msgid "Orphaned Items"
+msgstr "Объекты-сироты"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:12
+#: MoinMoin/apps/admin/templates/user/itemsize.html:4
+#, fuzzy
+msgid "Item Sizes (last revision)"
+msgstr "Размеры объектов (последних версий)"
+
+#: MoinMoin/apps/admin/templates/user/index_user.html:13
+#: MoinMoin/apps/admin/templates/user/interwikihelp.html:4
+#, fuzzy
+msgid "InterWiki Names"
+msgstr "Имя ИнтерВики"
+
+#: MoinMoin/apps/feed/views.py:84
 msgid "MoinMoin feels unhappy."
 msgstr "МойнМойн плохо себя чувствует."
 
-#: MoinMoin/apps/frontend/views.py:133
-#, fuzzy
-msgid "name"
-msgstr "Переименовать"
-
-#: MoinMoin/apps/frontend/views.py:134
-msgid "name_exact"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:135
-msgid "itemid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:136
-msgid "revid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:137
-msgid "userid"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:138
-msgid "language"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:139
-msgid "itemlinks"
-msgstr ""
-
 #: MoinMoin/apps/frontend/views.py:140
-msgid "itemtransclusions"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:141
-msgid "refs"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:143 MoinMoin/search/__init__.py:29
 msgid "search also in non-current revisions"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:144 MoinMoin/apps/frontend/views.py:168
+#: MoinMoin/apps/frontend/views.py:141 MoinMoin/apps/frontend/views.py:165
 #: MoinMoin/templates/lookup.html:6
 msgid "Lookup"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:227 MoinMoin/search/__init__.py:30
-msgid "Search"
-msgstr "Искать"
-
-#: MoinMoin/apps/frontend/views.py:470
+#: MoinMoin/apps/frontend/views.py:497
 msgid "Target"
 msgstr "Цель"
 
-#: MoinMoin/apps/frontend/views.py:470
+#: MoinMoin/apps/frontend/views.py:497
 msgid "The name of the target item"
 msgstr "Имя объекта"
 
-#: MoinMoin/apps/frontend/views.py:486
-msgid "markup text"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:487
-msgid "other text"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:488
-msgid "image"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:489
-msgid "audio"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:490
-msgid "video"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:491
-#, fuzzy
-msgid "other"
-msgstr "предыдущая версия"
-
-#: MoinMoin/apps/frontend/views.py:492
-#, fuzzy
-msgid "unknown"
-msgstr "<неизвестно>"
-
-#: MoinMoin/apps/frontend/views.py:493
+#: MoinMoin/apps/frontend/views.py:740
 msgid "Filter"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:746 MoinMoin/config/default.py:335
-#: MoinMoin/templates/index.html:7 MoinMoin/templates/index.html:81
-msgid "Global Index"
-msgstr "Глобальный указатель"
-
-#: MoinMoin/apps/frontend/views.py:766 MoinMoin/apps/frontend/views.py:767
-msgid "My Changes"
-msgstr ""
-
-#: MoinMoin/apps/frontend/views.py:798
+#: MoinMoin/apps/frontend/views.py:821
 #, fuzzy, python-format
 msgid "Items which refer to '%(item_name)s'"
 msgstr "Переименовать «%(item_name)s»"
 
-#: MoinMoin/apps/frontend/views.py:869 MoinMoin/config/default.py:334
+#: MoinMoin/apps/frontend/views.py:892 MoinMoin/config/default.py:364
 #: MoinMoin/templates/global_history.html:10
 msgid "Global History"
 msgstr "Глобальная история"
 
-#: MoinMoin/apps/frontend/views.py:932 MoinMoin/apps/frontend/views.py:951
+#: MoinMoin/apps/frontend/views.py:956 MoinMoin/apps/frontend/views.py:975
 #, python-format
 msgid "You must login to use this action: %(action)s."
 msgstr "Вам необходимо войти, чтобы использовать действие %(action)s."
 
-#: MoinMoin/apps/frontend/views.py:935
+#: MoinMoin/apps/frontend/views.py:959
 msgid "A quicklink to this page could not be added for you."
 msgstr "Закладка на эту страницу не может быть добавлена для Вас."
 
-#: MoinMoin/apps/frontend/views.py:938
+#: MoinMoin/apps/frontend/views.py:962
 msgid "Your quicklink to this page could not be removed."
 msgstr "Ваша закладка на эту страницу не может быть удалена."
 
-#: MoinMoin/apps/frontend/views.py:953
+#: MoinMoin/apps/frontend/views.py:977
 msgid "You are not allowed to subscribe to an item you may not read."
 msgstr "Вы не можете подписаться на объект, который Вам нельзя читать."
 
-#: MoinMoin/apps/frontend/views.py:957
+#: MoinMoin/apps/frontend/views.py:981
 msgid "Can't remove regular expression subscription!"
 msgstr "Невозможно удалить подписку по регулярному выражению."
 
-#: MoinMoin/apps/frontend/views.py:958
+#: MoinMoin/apps/frontend/views.py:982
 msgid "Edit the subscription regular expressions in your settings."
 msgstr "Отредактируйте регулярные выражения подписки в ваших настройках."
 
-#: MoinMoin/apps/frontend/views.py:962
+#: MoinMoin/apps/frontend/views.py:986
 msgid "You could not get subscribed to this item."
 msgstr "Не удалось подписаться на этот объект."
 
-#: MoinMoin/apps/frontend/views.py:971 MoinMoin/apps/frontend/views.py:1164
-#: MoinMoin/apps/frontend/views.py:1297
+#: MoinMoin/apps/frontend/views.py:995 MoinMoin/apps/frontend/views.py:1191
+#: MoinMoin/apps/frontend/views.py:1332
 msgid "The passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1122
-#: MoinMoin/apps/frontend/views.py:1182 MoinMoin/apps/frontend/views.py:1249
-#: MoinMoin/apps/frontend/views.py:1362 MoinMoin/converter/archive_in.py:59
-#: MoinMoin/templates/history.html:24
+#: MoinMoin/apps/frontend/views.py:1011 MoinMoin/apps/frontend/views.py:1148
+#: MoinMoin/apps/frontend/views.py:1211 MoinMoin/apps/frontend/views.py:1281
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:24
 msgid "Name"
 msgstr "Имя"
 
-#: MoinMoin/apps/frontend/views.py:987 MoinMoin/apps/frontend/views.py:1362
+#: MoinMoin/apps/frontend/views.py:1011
 msgid "The login name you want to use"
 msgstr "Имя, которое Вы хотите использовать при входе"
 
-#: MoinMoin/apps/frontend/views.py:988 MoinMoin/apps/frontend/views.py:1184
-#: MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1012 MoinMoin/apps/frontend/views.py:1215
+#: MoinMoin/apps/frontend/views.py:1361
 msgid "The login password you want to use"
 msgstr "Пароль, который Вы хотите использовать при входе"
 
-#: MoinMoin/apps/frontend/views.py:989 MoinMoin/apps/frontend/views.py:1185
-#: MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1013 MoinMoin/apps/frontend/views.py:1217
+#: MoinMoin/apps/frontend/views.py:1363
 msgid "Repeat the same password"
 msgstr "Повторите тот же пароль"
 
-#: MoinMoin/apps/frontend/views.py:992 MoinMoin/apps/frontend/views.py:1031
+#: MoinMoin/apps/frontend/views.py:1016 MoinMoin/apps/frontend/views.py:1056
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: MoinMoin/apps/frontend/views.py:1075
+#: MoinMoin/apps/frontend/views.py:1100
 msgid ""
 "Account verification required, please see the email we sent to your "
 "address."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1077
+#: MoinMoin/apps/frontend/views.py:1102
 #, python-format
 msgid ""
 "An error occurred while sending the verification email: \"%(message)s\" "
 "Please contact an administrator to activate your account."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1080
+#: MoinMoin/apps/frontend/views.py:1106
 msgid "Account created, please log in now."
 msgstr "Учетная запись создана, теперь Вы можете войти в систему."
 
-#: MoinMoin/apps/frontend/views.py:1098
+#: MoinMoin/apps/frontend/views.py:1124
 #, fuzzy
 msgid "Your account has been activated, you can log in now."
 msgstr "Ваш пароль был изменен, теперь Вы можете войти в систему."
 
-#: MoinMoin/apps/frontend/views.py:1100 MoinMoin/apps/frontend/views.py:1209
-msgid "Your token is invalid!"
+#: MoinMoin/apps/frontend/views.py:1126
+#, fuzzy
+msgid "Your username and/or token is invalid!"
 msgstr "Строка сброса неверна."
 
-#: MoinMoin/apps/frontend/views.py:1107
+#: MoinMoin/apps/frontend/views.py:1133
 msgid "Your user name or your email address is needed."
 msgstr "Необходимо Ваше имя пользователя или адрес электронной почты."
 
-#: MoinMoin/apps/frontend/views.py:1122 MoinMoin/apps/frontend/views.py:1182
+#: MoinMoin/apps/frontend/views.py:1148 MoinMoin/apps/frontend/views.py:1211
 msgid "Your login name"
 msgstr "Ваше имя пользователя"
 
-#: MoinMoin/apps/frontend/views.py:1124
+#: MoinMoin/apps/frontend/views.py:1150
 msgid "Recover password"
 msgstr "Восстановить пароль"
 
-#: MoinMoin/apps/frontend/views.py:1132 MoinMoin/templates/lostpass.html:5
+#: MoinMoin/apps/frontend/views.py:1158 MoinMoin/templates/lostpass.html:5
 msgid "Lost Password"
 msgstr "Забытый пароль"
 
-#: MoinMoin/apps/frontend/views.py:1154
+#: MoinMoin/apps/frontend/views.py:1180
 msgid "If this account exists, you will be notified."
 msgstr ""
 "Если данная учетная запись существует, то по связанному с ней почтовому "
 "адресу будет выслано оповещение."
 
-#: MoinMoin/apps/frontend/views.py:1165 MoinMoin/apps/frontend/views.py:1299
-msgid "New password is unacceptable, encoding trouble."
+#: MoinMoin/apps/frontend/views.py:1192 MoinMoin/apps/frontend/views.py:1334
+#, fuzzy
+msgid "New password is unacceptable, could not get processed."
 msgstr "Новый пароль не может быть принят, проблема с преобразованием кодировок."
 
-#: MoinMoin/apps/frontend/views.py:1183
+#: MoinMoin/apps/frontend/views.py:1212
 msgid "Recovery token"
 msgstr "Строка сброса пароля"
 
-#: MoinMoin/apps/frontend/views.py:1183
+#: MoinMoin/apps/frontend/views.py:1213
 msgid "The recovery token that has been sent to you"
 msgstr "Строка сброса пароля, которая была отправлена Вам"
 
-#: MoinMoin/apps/frontend/views.py:1184 MoinMoin/apps/frontend/views.py:1323
+#: MoinMoin/apps/frontend/views.py:1214 MoinMoin/apps/frontend/views.py:1360
 msgid "New password"
 msgstr "Новый пароль"
 
-#: MoinMoin/apps/frontend/views.py:1185 MoinMoin/apps/frontend/views.py:1324
+#: MoinMoin/apps/frontend/views.py:1216 MoinMoin/apps/frontend/views.py:1362
 msgid "New password (repeat)"
 msgstr "Повторите новый пароль"
 
-#: MoinMoin/apps/frontend/views.py:1186 MoinMoin/apps/frontend/views.py:1325
-#: MoinMoin/templates/usersettings_forms.html:28
+#: MoinMoin/apps/frontend/views.py:1218 MoinMoin/apps/frontend/views.py:1364
 msgid "Change password"
 msgstr "Поменять пароль"
 
-#: MoinMoin/apps/frontend/views.py:1194 MoinMoin/templates/recoverpass.html:5
+#: MoinMoin/apps/frontend/views.py:1226 MoinMoin/templates/recoverpass.html:5
 msgid "Recover Password"
 msgstr "Восстановить пароль"
 
-#: MoinMoin/apps/frontend/views.py:1207
+#: MoinMoin/apps/frontend/views.py:1239
 msgid "Your password has been changed, you can log in now."
 msgstr "Ваш пароль был изменен, теперь Вы можете войти в систему."
 
-#: MoinMoin/apps/frontend/views.py:1221
+#: MoinMoin/apps/frontend/views.py:1241
+msgid "Your token is invalid!"
+msgstr "Строка сброса неверна."
+
+#: MoinMoin/apps/frontend/views.py:1253
 msgid "Either your username or password was invalid."
 msgstr "Неверное имя пользователя или пароль."
 
-#: MoinMoin/apps/frontend/views.py:1222
+#: MoinMoin/apps/frontend/views.py:1254
 msgid "Failed to authenticate with this OpenID."
 msgstr "Ошибка при аутентификации с этим OpenID."
 
-#: MoinMoin/apps/frontend/views.py:1252
+#: MoinMoin/apps/frontend/views.py:1287
 msgid "Log in"
 msgstr "Войти"
 
-#: MoinMoin/apps/frontend/views.py:1260 MoinMoin/templates/layout.html:62
+#: MoinMoin/apps/frontend/views.py:1295 MoinMoin/templates/layout.html:63
 msgid "Login"
 msgstr "Войти"
 
-#: MoinMoin/apps/frontend/views.py:1289
+#: MoinMoin/apps/frontend/views.py:1324
 msgid "You are now logged out."
 msgstr "Вы вышли."
 
-#: MoinMoin/apps/frontend/views.py:1298
+#: MoinMoin/apps/frontend/views.py:1333
 msgid "The current password was wrong."
 msgstr "Текущий пароль указан неверно."
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1358
 msgid "Current Password"
 msgstr "Текущий пароль"
 
-#: MoinMoin/apps/frontend/views.py:1322
+#: MoinMoin/apps/frontend/views.py:1359
 msgid "Your current login password"
 msgstr "Ваш текущий пароль"
 
-#: MoinMoin/apps/frontend/views.py:1330 MoinMoin/apps/frontend/views.py:1336
-#: MoinMoin/apps/frontend/views.py:1351 MoinMoin/apps/frontend/views.py:1373
-#: MoinMoin/apps/frontend/views.py:1384
-#: MoinMoin/templates/usersettings_forms.html:14
-#: MoinMoin/templates/usersettings_forms.html:42
-#: MoinMoin/templates/usersettings_forms.html:56
-#: MoinMoin/templates/usersettings_forms.html:67
-#: MoinMoin/templates/usersettings_forms.html:81
+#: MoinMoin/apps/frontend/views.py:1370 MoinMoin/apps/frontend/views.py:1378
+#: MoinMoin/apps/frontend/views.py:1388 MoinMoin/apps/frontend/views.py:1409
+#: MoinMoin/apps/frontend/views.py:1421
 msgid "Save"
 msgstr "Сохранить"
 
-#: MoinMoin/apps/frontend/views.py:1347
+#: MoinMoin/apps/frontend/views.py:1383
 msgid "Publish my email (not my wiki homepage) in author info"
 msgstr ""
 "Показывать мой почтовый адрес (вместо домашней страницы) в информации об "
 "авторе"
 
-#: MoinMoin/apps/frontend/views.py:1348
+#: MoinMoin/apps/frontend/views.py:1384
 msgid "Open editor on double click"
 msgstr "Открывать редактор по двойному щелчку"
 
-#: MoinMoin/apps/frontend/views.py:1349
+#: MoinMoin/apps/frontend/views.py:1385
+msgid "Scroll page after edit"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1386
 msgid "Show comment sections"
 msgstr "Показывать комментарии по умолчанию при загрузке страницы"
 
-#: MoinMoin/apps/frontend/views.py:1350
+#: MoinMoin/apps/frontend/views.py:1387
 msgid "Disable this account forever"
 msgstr "Заблокировать эту учетную запись навсегда"
 
-#: MoinMoin/apps/frontend/views.py:1357 MoinMoin/templates/usersettings.html:5
+#: MoinMoin/apps/frontend/views.py:1394 MoinMoin/templates/usersettings.html:5
 #, fuzzy
 msgid "User Settings"
 msgstr "Настройки"
 
-#: MoinMoin/apps/frontend/views.py:1363
-msgid "Alias-Name"
-msgstr "Псевдоним"
+#: MoinMoin/apps/frontend/views.py:1399
+#, fuzzy
+msgid "The login names you want to use"
+msgstr "Имя, которое Вы хотите использовать при входе"
 
-#: MoinMoin/apps/frontend/views.py:1363
-msgid "Your alias name (informational)"
+#: MoinMoin/apps/frontend/views.py:1400
+msgid "Display-Name"
+msgstr ""
+
+#: MoinMoin/apps/frontend/views.py:1401
+#, fuzzy
+msgid "Your display name (informational)"
 msgstr "Ваш псевдоним"
 
-#: MoinMoin/apps/frontend/views.py:1367
+#: MoinMoin/apps/frontend/views.py:1405
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: MoinMoin/apps/frontend/views.py:1372
+#: MoinMoin/apps/frontend/views.py:1407
 msgid "Locale"
 msgstr "Язык"
 
-#: MoinMoin/apps/frontend/views.py:1380
+#: MoinMoin/apps/frontend/views.py:1413
 msgid "Theme name"
 msgstr "Тема оформления"
 
-#: MoinMoin/apps/frontend/views.py:1381
+#: MoinMoin/apps/frontend/views.py:1415
 msgid "User CSS URL"
 msgstr "URL пользовательского CSS"
 
-#: MoinMoin/apps/frontend/views.py:1381
+#: MoinMoin/apps/frontend/views.py:1416
 msgid "Give the URL of your custom CSS (optional)"
 msgstr "Ссылка на URL пользовательского CSS (опционально)"
 
-#: MoinMoin/apps/frontend/views.py:1382
+#: MoinMoin/apps/frontend/views.py:1417
 msgid "Editor size"
 msgstr "Размер окна редактирования"
 
-#: MoinMoin/apps/frontend/views.py:1382
+#: MoinMoin/apps/frontend/views.py:1418
 msgid "Editor textarea height (0=auto)"
 msgstr "Высота текстового поля (0=по умолчанию)"
 
-#: MoinMoin/apps/frontend/views.py:1383
+#: MoinMoin/apps/frontend/views.py:1419
 msgid "History results per page"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1383
+#: MoinMoin/apps/frontend/views.py:1420
 msgid "Number of results per page (0=no paging)"
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1426
+#: MoinMoin/apps/frontend/views.py:1463
 msgid "Your password has been changed."
 msgstr "Ваш пароль был изменен."
 
-#: MoinMoin/apps/frontend/views.py:1431
+#: MoinMoin/apps/frontend/views.py:1469
 msgid "This openid is already in use."
 msgstr "Этот OpenID уже кем-то используется."
 
-#: MoinMoin/apps/frontend/views.py:1435
-msgid "This username is already in use."
+#: MoinMoin/apps/frontend/views.py:1476
+#, fuzzy, python-format
+msgid "The username %(name)r is already in use."
 msgstr "Это имя пользователя уже кем-то используется"
 
-#: MoinMoin/apps/frontend/views.py:1441
+#: MoinMoin/apps/frontend/views.py:1483
 msgid "This email is already in use"
 msgstr "Этот адрес электронной почты уже кем-то используется"
 
-#: MoinMoin/apps/frontend/views.py:1456
+#: MoinMoin/apps/frontend/views.py:1498
 msgid ""
 "Your account has been disabled because you changed your email address. "
 "Please see the email we sent to your address to reactivate it."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1463
+#: MoinMoin/apps/frontend/views.py:1507
 msgid ""
 "Your email address was not changed because sending the verification email"
 " failed. Please try again later."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1469
+#: MoinMoin/apps/frontend/views.py:1515
 msgid "Your changes have been saved."
 msgstr ""
 
-#: MoinMoin/apps/frontend/views.py:1521
+#: MoinMoin/apps/frontend/views.py:1567
 msgid "You must log in to use bookmarks."
 msgstr "Вы должны войти, чтобы пользоваться закладками."
 
-#: MoinMoin/apps/frontend/views.py:1647
+#: MoinMoin/apps/frontend/views.py:1693
 #, fuzzy, python-format
 msgid "Items with similar names to '%(item_name)s'"
 msgstr "Объекты с похожими именами"
 
-#: MoinMoin/apps/frontend/views.py:1829 MoinMoin/apps/frontend/views.py:1856
+#: MoinMoin/apps/frontend/views.py:1876 MoinMoin/apps/frontend/views.py:1904
 msgid "All tags in this wiki"
 msgstr "Все теги в этой вики"
 
-#: MoinMoin/apps/frontend/views.py:1870
+#: MoinMoin/apps/frontend/views.py:1918
 #, python-format
 msgid "Items tagged with %(tag)s"
 msgstr "Объекты с тегом %(tag)s"
 
-#: MoinMoin/auth/__init__.py:244 MoinMoin/auth/ldap_login.py:130
+#: MoinMoin/auth/__init__.py:254 MoinMoin/auth/ldap_login.py:131
 msgid "Missing password. Please enter user name and password."
 msgstr "Отсутствует пароль. Пожалуйста, введите имя пользователя и пароль."
 
-#: MoinMoin/auth/__init__.py:252 MoinMoin/auth/ldap_login.py:200
-#: MoinMoin/auth/ldap_login.py:248
+#: MoinMoin/auth/__init__.py:262 MoinMoin/auth/ldap_login.py:202
+#: MoinMoin/auth/ldap_login.py:254
 msgid "Invalid username or password."
 msgstr "Неправильное имя пользователя или пароль."
 
-#: MoinMoin/auth/__init__.py:256
+#: MoinMoin/auth/__init__.py:266
 #, python-format
 msgid ""
 "If you do not have an account, <a href=\"%(register_url)s\">you can "
@@ -805,16 +718,16 @@
 "Если у Вас нет учетной записи, <a href=\"%(register_url)s\">Вы можете "
 "создать ее сейчас</a>. "
 
-#: MoinMoin/auth/__init__.py:258
+#: MoinMoin/auth/__init__.py:268
 #, python-format
 msgid "<a href=\"%(recover_url)s\">Forgot your password?</a>"
 msgstr "<a href=\"%(recover_url)s\">Забыли пароль?</a>"
 
-#: MoinMoin/auth/http.py:59
+#: MoinMoin/auth/http.py:60
 msgid "Please log in first."
 msgstr "Пожалуйста, предварительно аутентифицируйтесь на вики."
 
-#: MoinMoin/auth/ldap_login.py:262
+#: MoinMoin/auth/ldap_login.py:268
 #, python-format
 msgid "LDAP server %(server)s failed."
 msgstr "LDAP-сервер %(server)s недоступен."
@@ -847,17 +760,17 @@
 msgid "No OpenID service at this URL."
 msgstr "По заданному адресу не найдено сервиса OpenID."
 
-#: MoinMoin/config/default.py:258
+#: MoinMoin/config/default.py:278
 msgid "Password is too short."
 msgstr "Пароль слишком короткий."
 
-#: MoinMoin/config/default.py:260
+#: MoinMoin/config/default.py:280
 msgid "Password has not enough different characters."
 msgstr ""
 "Слишком простой пароль — в пароле должно присутствовать больше разных "
 "символов."
 
-#: MoinMoin/config/default.py:266
+#: MoinMoin/config/default.py:286
 msgid ""
 "Password is too easy to guess (password contains name or name contains "
 "password)."
@@ -865,162 +778,162 @@
 "Слишком простой пароль — в пароле присутствует имя пользователя, либо "
 "пароль содержится в имени."
 
-#: MoinMoin/config/default.py:275
+#: MoinMoin/config/default.py:295
 msgid "Password is too easy to guess (keyboard sequence)."
 msgstr "Слишком простой пароль — клавиатурная последовательность."
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home"
 msgstr "Домой"
 
-#: MoinMoin/config/default.py:333
+#: MoinMoin/config/default.py:363
 msgid "Home Page"
 msgstr "Домашняя страница"
 
-#: MoinMoin/config/default.py:334 MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:364 MoinMoin/config/default.py:392
 msgid "History"
 msgstr "История"
 
-#: MoinMoin/config/default.py:335 MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:365 MoinMoin/config/default.py:397
 msgid "Index"
 msgstr "Указатель"
 
-#: MoinMoin/config/default.py:336
+#: MoinMoin/config/default.py:365 MoinMoin/templates/index.html:7
+#: MoinMoin/templates/index.html:118
+msgid "Global Index"
+msgstr "Глобальный указатель"
+
+#: MoinMoin/config/default.py:366
 msgid "Global Tags Index"
 msgstr "Указатель глобальных тегов"
 
-#: MoinMoin/config/default.py:337 MoinMoin/templates/index.html:56
-#: MoinMoin/templates/index.html:132
-msgid "More"
-msgstr "Прочее"
-
-#: MoinMoin/config/default.py:337
+#: MoinMoin/config/default.py:368
 msgid "Administration & Docs"
 msgstr "Администрирование и документация"
 
-#: MoinMoin/config/default.py:360
+#: MoinMoin/config/default.py:390
 msgid "Show"
 msgstr "Показать"
 
-#: MoinMoin/config/default.py:361 MoinMoin/templates/index.html:33
+#: MoinMoin/config/default.py:391 MoinMoin/templates/index.html:27
 msgid "Download"
 msgstr "Загрузить"
 
-#: MoinMoin/config/default.py:362
+#: MoinMoin/config/default.py:392
 msgid "Revision History"
 msgstr "История изменений"
 
-#: MoinMoin/config/default.py:365 MoinMoin/templates/show.html:9
+#: MoinMoin/config/default.py:395 MoinMoin/templates/show.html:9
 msgid "Modify"
 msgstr "Изменить"
 
-#: MoinMoin/config/default.py:365
+#: MoinMoin/config/default.py:395
 msgid "Edit or Upload"
 msgstr "Править или загрузить"
 
-#: MoinMoin/config/default.py:367
+#: MoinMoin/config/default.py:397
 msgid "List sub-items"
 msgstr "Список дочерних объектов"
 
-#: MoinMoin/config/default.py:368
+#: MoinMoin/config/default.py:398
 msgid "Comments"
 msgstr "Комментарии"
 
-#: MoinMoin/config/default.py:368 MoinMoin/templates/common.js:70
+#: MoinMoin/config/default.py:398 MoinMoin/templates/common.js:56
 #, fuzzy
 msgid "Hide comments"
 msgstr "Комментарии"
 
-#: MoinMoin/config/default.py:369
+#: MoinMoin/config/default.py:399
 msgid "Transclusions"
 msgstr ""
 
-#: MoinMoin/config/default.py:369 MoinMoin/templates/common.js:104
+#: MoinMoin/config/default.py:399 MoinMoin/templates/common.js:90
 msgid "Show transclusions"
 msgstr ""
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:400
 msgid "Highlight"
 msgstr "Подсветка"
 
-#: MoinMoin/config/default.py:370
+#: MoinMoin/config/default.py:400
 msgid "Show with Syntax-Highlighting"
 msgstr "Показать с подстветкой синтаксиса"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:401
 msgid "Meta"
 msgstr "Мета"
 
-#: MoinMoin/config/default.py:371
+#: MoinMoin/config/default.py:401
 msgid "Display Metadata"
 msgstr "Показать метаданные"
 
-#: MoinMoin/config/default.py:372
+#: MoinMoin/config/default.py:402
 msgid "Create or remove a navigation link to this item"
 msgstr "Добавить или удалить ссылку на объект в панель навигации"
 
-#: MoinMoin/config/default.py:373
+#: MoinMoin/config/default.py:403
 msgid "Switch notifications about item changes on or off"
 msgstr "Выключить или включить уведомления об изменениях объекта"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:404
 msgid "Rename"
 msgstr "Переименовать"
 
-#: MoinMoin/config/default.py:374
+#: MoinMoin/config/default.py:404
 msgid "Rename this item"
 msgstr "Переименовать этот объект"
 
-#: MoinMoin/config/default.py:375 MoinMoin/templates/index.html:37
+#: MoinMoin/config/default.py:405 MoinMoin/templates/index.html:31
 msgid "Delete"
 msgstr "Удалить"
 
-#: MoinMoin/config/default.py:375
+#: MoinMoin/config/default.py:405
 #, fuzzy
 msgid "Delete this item"
 msgstr "Переименовать этот объект"
 
-#: MoinMoin/config/default.py:376 MoinMoin/templates/index.html:42
+#: MoinMoin/config/default.py:406 MoinMoin/templates/index.html:36
 msgid "Destroy"
 msgstr "Уничтожить"
 
-#: MoinMoin/config/default.py:376
+#: MoinMoin/config/default.py:406
 msgid "Completely destroy this item"
 msgstr "Полностью уничтожить этот объект"
 
-#: MoinMoin/config/default.py:377
+#: MoinMoin/config/default.py:407
 msgid "Referrers"
 msgstr "Ссылки"
 
-#: MoinMoin/config/default.py:377
+#: MoinMoin/config/default.py:407
 msgid "What refers here?"
 msgstr "Ссылки сюда"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:408
 msgid "Site Map"
 msgstr "Карта сайта"
 
-#: MoinMoin/config/default.py:378
+#: MoinMoin/config/default.py:408
 msgid "Local Site Map of this item"
 msgstr "Карта окрестностей этого объекта"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:409
 msgid "Similar"
 msgstr "Похожее"
 
-#: MoinMoin/config/default.py:379
+#: MoinMoin/config/default.py:409
 msgid "Items with similar names"
 msgstr "Объекты с похожими именами"
 
-#: MoinMoin/converter/archive_in.py:59
-msgid "Date"
-msgstr ""
+#: MoinMoin/converter/archive_in.py:62 MoinMoin/templates/history.html:26
+msgid "Timestamp"
+msgstr "Дата"
 
-#: MoinMoin/converter/html_out.py:539
+#: MoinMoin/converter/html_out.py:560
 msgid "Link to this heading"
 msgstr ""
 
-#: MoinMoin/converter/html_out.py:605
+#: MoinMoin/converter/html_out.py:624
 msgid "Contents"
 msgstr "Содержимое"
 
@@ -1028,48 +941,116 @@
 msgid "Error: invalid macro name."
 msgstr ""
 
-#: MoinMoin/converter/macro.py:91 MoinMoin/converter/macro_Verbatim.py:68
+#: MoinMoin/converter/macro.py:90 MoinMoin/converter/macro_Verbatim.py:66
 #, python-format
 msgid "<<%(macro_name)s: execution failed [%(error_msg)s] (see also the log)>>"
 msgstr ""
 "<<%(macro_name)s: выполнение завершилось с ошибкой «%(error_msg)s» (см. "
 "диагностику на сервере)>>"
 
-#: MoinMoin/converter/moinwiki_in.py:1034
+#: MoinMoin/converter/moinwiki_in.py:950
 msgid "Error:"
 msgstr "Ошибка"
 
-#: MoinMoin/converter/moinwiki_in.py:1035
+#: MoinMoin/converter/moinwiki_in.py:951
 msgid "is invalid within"
 msgstr "неверно в пределах"
 
-#: MoinMoin/converter/nonexistent_in.py:31
+#: MoinMoin/converter/nonexistent_in.py:32
 #, python-format
 msgid "%(item_name)s does not exist. Create it?"
 msgstr "Объект %(item_name)s не существет. Создать его?"
 
-#: MoinMoin/items/__init__.py:624
-msgid "Invalid JSON."
-msgstr "Неправильный JSON."
-
-#: MoinMoin/items/__init__.py:635 MoinMoin/templates/atom.html:12
+#: MoinMoin/items/__init__.py:174 MoinMoin/templates/atom.html:12
 #: MoinMoin/templates/diff_text_atom.html:13 MoinMoin/templates/history.html:31
 msgid "Comment"
 msgstr "Комментарий"
 
-#: MoinMoin/items/__init__.py:635
+#: MoinMoin/items/__init__.py:174
 msgid "Comment about your change"
 msgstr "Описание правки"
 
-#: MoinMoin/items/__init__.py:669
-msgid "MetaData (JSON)"
-msgstr "Метаданные (JSON)"
+#: MoinMoin/items/__init__.py:175
+msgid "OK"
+msgstr "OK"
 
-#: MoinMoin/items/__init__.py:670
+#: MoinMoin/items/__init__.py:179
+#, fuzzy
+msgid "Item type"
+msgstr "MIME-типы"
+
+#: MoinMoin/items/__init__.py:180
+#, fuzzy
+msgid "Content type"
+msgstr "Content-Type"
+
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
+msgid "Summary"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:184 MoinMoin/items/ticket.py:42
+#, fuzzy
+msgid "One-line summary of the item"
+msgstr "Карта окрестностей этого объекта"
+
+#: MoinMoin/items/__init__.py:406
+msgid "Extra MetaData (JSON)"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:658
+#, fuzzy
+msgid "Wiki item"
+msgstr "Создать новый объект?"
+
+#: MoinMoin/items/__init__.py:749
+msgid "User profile"
+msgstr ""
+
+#: MoinMoin/items/__init__.py:750
+msgid "User profile item (not implemented yet!)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:32
+msgid "Supertags (Categories)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:33
+msgid "Ordered comma separated list of tags"
+msgstr ""
+
+#: MoinMoin/items/blog.py:37
+msgid "Title"
+msgstr ""
+
+#: MoinMoin/items/blog.py:38
+msgid "One-line title of the blog entry"
+msgstr ""
+
+#: MoinMoin/items/blog.py:39
+msgid "Publication time (UTC)"
+msgstr ""
+
+#: MoinMoin/items/blog.py:45
+msgid "Blog"
+msgstr ""
+
+#: MoinMoin/items/blog.py:46
+msgid "Blog item"
+msgstr ""
+
+#: MoinMoin/items/blog.py:98
+msgid "Blog entry"
+msgstr ""
+
+#: MoinMoin/items/blog.py:99
+msgid "Blog entry item"
+msgstr ""
+
+#: MoinMoin/items/content.py:319
 msgid "Upload file:"
 msgstr "Загрузить файл:"
 
-#: MoinMoin/items/__init__.py:740
+#: MoinMoin/items/content.py:337
 msgid ""
 "The items have the same data hash code (that means they very likely have "
 "the same data)."
@@ -1077,59 +1058,145 @@
 "У объектов одинаковый хеш (скорее всего, в них содержится одинаковая "
 "информация)."
 
-#: MoinMoin/items/__init__.py:742
+#: MoinMoin/items/content.py:339
 msgid "The items have different data."
 msgstr "В объектах разные данные."
 
-#: MoinMoin/items/__init__.py:754
+#: MoinMoin/items/content.py:351
 #, python-format
 msgid "Impossible to convert the data to the contenttype: %(contenttype)s"
 msgstr "Невозможно перевести данные в тип %(contenttype)s"
 
-#: MoinMoin/items/__init__.py:1120
+#: MoinMoin/items/content.py:805
 msgid "Type your text here"
 msgstr "Введите Ваш текст сюда"
 
-#: MoinMoin/items/__init__.py:1359 MoinMoin/items/__init__.py:1427
+#: MoinMoin/items/content.py:1060
 #, python-format
 msgid "Edit drawing %(filename)s (opens in new window)"
 msgstr "Изменить рисунок «%(filename)s» (откроется в новом окне)"
 
-#: MoinMoin/items/__init__.py:1374 MoinMoin/items/__init__.py:1444
+#: MoinMoin/items/content.py:1064
 #, python-format
 msgid "Clickable drawing: %(filename)s"
 msgstr "Рисунок, содержащий активные зоны: «%(filename)s»"
 
-#: MoinMoin/mail/sendmail.py:94
+#: MoinMoin/items/ticket.py:43
+msgid "Effort"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:44
+msgid "Difficulty"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:45
+#, fuzzy
+msgid "Severity"
+msgstr "возвратить"
+
+#: MoinMoin/items/ticket.py:46
+msgid "Priority"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:48
+msgid "Assigned To"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:49
+msgid "Superseded By"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:50
+msgid "Depends On"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:54
+msgid "Supersedes"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:55
+msgid "Required By"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:56
+#, fuzzy
+msgid "Subscribers"
+msgstr "Отписаться"
+
+#: MoinMoin/items/ticket.py:68
+#, fuzzy
+msgid "Message"
+msgstr "Домашняя страница"
+
+#: MoinMoin/items/ticket.py:79
+msgid "Submit ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:98
+msgid "Update ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:100
+msgid "Update & reopen ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:101
+msgid "Update & close ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:139
+msgid "Ticket"
+msgstr ""
+
+#: MoinMoin/items/ticket.py:140
+#, fuzzy
+msgid "Ticket item"
+msgstr "Создать новый объект?"
+
+#: MoinMoin/mail/sendmail.py:91
+msgid ""
+"Contact administrator: cannot send password recovery e-mail because mail "
+"configuration is incomplete."
+msgstr ""
+
+#: MoinMoin/mail/sendmail.py:99
 msgid "No recipients, nothing to do"
 msgstr "Получатели не указаны, никаких действий не требуется."
 
-#: MoinMoin/mail/sendmail.py:170
+#: MoinMoin/mail/sendmail.py:175
 #, python-format
 msgid "Connection to mailserver '%(server)s' failed: %(reason)s"
 msgstr "Соединиться с почтовым сервером «%(server)s» не удалось: «%(reason)s»"
 
-#: MoinMoin/mail/sendmail.py:184
+#: MoinMoin/mail/sendmail.py:189
 msgid "Mail not sent"
 msgstr "Почта не отправлена."
 
-#: MoinMoin/mail/sendmail.py:187
+#: MoinMoin/mail/sendmail.py:192
 msgid "Mail sent successfully"
 msgstr "Почта отправлена."
 
-#: MoinMoin/search/__init__.py:17
+#: MoinMoin/search/__init__.py:18
 msgid "Search query too short."
 msgstr "Слишком короткий поисковой запрос."
 
-#: MoinMoin/security/textcha.py:158
+#: MoinMoin/search/__init__.py:31
+msgid "search all revisions"
+msgstr ""
+
+#: MoinMoin/search/__init__.py:32 MoinMoin/templates/search.html:8
+msgid "Search"
+msgstr "Искать"
+
+#: MoinMoin/security/textcha.py:162
 msgid "The entered TextCha was incorrect."
 msgstr "Введенная текстовая капча была неверной."
 
-#: MoinMoin/security/textcha.py:159
+#: MoinMoin/security/textcha.py:163
 msgid "The TextCha question is invalid or has expired. Please try again."
 msgstr "Текстовая капча неверна или просрочена. Попробуйте снова."
 
-#: MoinMoin/security/textcha.py:178
+#: MoinMoin/security/textcha.py:183
 msgid "TextCha"
 msgstr "Текстовая капча"
 
@@ -1143,24 +1210,47 @@
 msgid "Revision"
 msgstr "Версия"
 
-#: MoinMoin/templates/common.js:73
+#: MoinMoin/templates/common.js:59
 #, fuzzy
 msgid "Show comments"
 msgstr "Показывать комментарии по умолчанию при загрузке страницы"
 
-#: MoinMoin/templates/common.js:107
+#: MoinMoin/templates/common.js:93
 msgid "Hide transclusions"
 msgstr ""
 
+#: MoinMoin/templates/crash.html:1
+msgid "Oops!"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:3
+msgid "An error happened while processing your request."
+msgstr ""
+
+#: MoinMoin/templates/crash.html:6
+msgid ""
+"More details have been logged. The following data is helpful for locating"
+" the corresponding log entries:"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:9
+msgid "Error ID"
+msgstr ""
+
+#: MoinMoin/templates/crash.html:11
+#, fuzzy
+msgid "Server time"
+msgstr "Имя пользователя"
+
 #: MoinMoin/templates/delete.html:4
 #, python-format
 msgid "Delete '%(item_name)s'"
 msgstr "Удалить «%(item_name)s»"
 
 #: MoinMoin/templates/destroy.html:4
-#, python-format
-msgid "DESTROY COMPLETE item '%(item_name)s'"
-msgstr "УНИЧТОЖИТЬ ВЕСЬ объект «%(item_name)s»"
+#, fuzzy, python-format
+msgid "DESTROY COMPLETE ITEM '%(item_name)s'"
+msgstr "Удалить «%(item_name)s»"
 
 #: MoinMoin/templates/destroy.html:20
 #, fuzzy, python-format
@@ -1184,29 +1274,29 @@
 msgid "Line"
 msgstr "Строка"
 
-#: MoinMoin/templates/forms.html:158
+#: MoinMoin/templates/forms.html:218
 msgid "Upload"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:159
+#: MoinMoin/templates/forms.html:219
 #, fuzzy
 msgid "Upload files"
 msgstr "Загрузить файл:"
 
-#: MoinMoin/templates/forms.html:164
+#: MoinMoin/templates/forms.html:224
 msgid "Start All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:165
+#: MoinMoin/templates/forms.html:225
 msgid "Cancel All"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:169
+#: MoinMoin/templates/forms.html:229
 msgid "Start"
 msgstr ""
 
-#: MoinMoin/templates/forms.html:170 MoinMoin/templates/index.html:152
-#: MoinMoin/templates/index.html:170
+#: MoinMoin/templates/forms.html:230 MoinMoin/templates/index.html:184
+#: MoinMoin/templates/index.html:202
 msgid "Cancel"
 msgstr ""
 
@@ -1214,13 +1304,13 @@
 msgid "Set bookmark"
 msgstr ""
 
-#: MoinMoin/templates/global_history.html:49
+#: MoinMoin/templates/global_history.html:48
 msgid "Delete bookmark"
 msgstr ""
 
 #: MoinMoin/templates/highlight.html:3
-#, python-format
-msgid "Syntax highlighting for Item: %(name)s"
+#, fuzzy, python-format
+msgid "Syntax highlighting of '%(name)s'"
 msgstr "Подсветка синтаксиса для объекта %(name)s"
 
 #: MoinMoin/templates/history.html:4
@@ -1241,10 +1331,6 @@
 msgid "Rev."
 msgstr "Вер."
 
-#: MoinMoin/templates/history.html:26
-msgid "Timestamp"
-msgstr "Дата"
-
 #: MoinMoin/templates/history.html:29
 msgid "Editor"
 msgstr "Редактор"
@@ -1282,69 +1368,120 @@
 msgid "Index of subitems of '%(item_name)s'"
 msgstr "Подобъекты объекта «%(item_name)s»"
 
-#: MoinMoin/templates/index.html:22
+#: MoinMoin/templates/index.html:15
 msgid "Select All"
 msgstr ""
 
-#: MoinMoin/templates/index.html:32
+#: MoinMoin/templates/index.html:25
 #, fuzzy
 msgid "New item"
 msgstr "Создать новый объект?"
 
-#: MoinMoin/templates/index.html:50
+#: MoinMoin/templates/index.html:44
 msgid "Filter by content type"
 msgstr ""
 
-#: MoinMoin/templates/index.html:51
+#: MoinMoin/templates/index.html:45
 msgid "items having unknown mime types"
 msgstr ""
 
-#: MoinMoin/templates/index.html:55
+#: MoinMoin/templates/index.html:49
 #, fuzzy
 msgid "Toggle"
 msgstr "теги:"
 
-#: MoinMoin/templates/index.html:96
+#: MoinMoin/templates/index.html:50
+msgid "More"
+msgstr "Прочее"
+
+#: MoinMoin/templates/index.html:84
+msgid "This item itself also matches your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:105
+msgid "This item also has subitems that match your filter."
+msgstr ""
+
+#: MoinMoin/templates/index.html:133
 msgid "Recently uploaded items"
 msgstr ""
 
-#: MoinMoin/templates/index.html:105 MoinMoin/templates/index.html:107
+#: MoinMoin/templates/index.html:142 MoinMoin/templates/index.html:144
 msgid "All"
 msgstr ""
 
-#: MoinMoin/templates/index.html:144 MoinMoin/templates/index.html:157
+#: MoinMoin/templates/index.html:156
+msgid "These items have subitems that match your filter:"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
+msgid "X"
+msgstr ""
+
+#: MoinMoin/templates/index.html:176 MoinMoin/templates/index.html:189
 msgid "Close"
 msgstr ""
 
-#: MoinMoin/templates/index.html:145
+#: MoinMoin/templates/index.html:177
 msgid "Please provide comment for this action"
 msgstr ""
 
-#: MoinMoin/templates/index.html:148
+#: MoinMoin/templates/index.html:180
 msgid "Enter your comment"
 msgstr ""
 
-#: MoinMoin/templates/index.html:151
+#: MoinMoin/templates/index.html:183
 msgid "Submit"
 msgstr ""
 
-#: MoinMoin/templates/index.html:158
+#: MoinMoin/templates/index.html:190
 #, fuzzy
 msgid "Create new item"
 msgstr "Создать новый объект?"
 
-#: MoinMoin/templates/index.html:164 MoinMoin/templates/index.html:166
+#: MoinMoin/templates/index.html:196 MoinMoin/templates/index.html:198
 msgid "Enter item name here"
 msgstr ""
 
-#: MoinMoin/templates/index.html:169
+#: MoinMoin/templates/index.html:201
 msgid "Create"
 msgstr ""
 
-#: MoinMoin/templates/index.html:180
+#: MoinMoin/templates/index.html:212
 msgid "(Drag and drop multiple files to this white area to upload them.)"
 msgstr ""
 
+#: MoinMoin/templates/index_action.js:19
+msgid "Deleting.."
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:19
+#, fuzzy
+msgid "Destroying.."
+msgstr "уничтожить"
+
+#: MoinMoin/templates/index_action.js:20
+msgid "Items deleted: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:20
+#, fuzzy
+msgid "Items destroyed: "
+msgstr "уничтожить"
+
+#: MoinMoin/templates/index_action.js:21
+msgid ", Items not deleted: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:21
+msgid ", Items not destroyed: "
+msgstr ""
+
+#: MoinMoin/templates/index_action.js:186
+#: MoinMoin/templates/index_action.js:207
+msgid "Nothing was selected."
+msgstr ""
+
 #: MoinMoin/templates/itemviews.html:49
 msgid "Remove Link"
 msgstr "Убрать из закладок"
@@ -1361,11 +1498,11 @@
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: MoinMoin/templates/layout.html:50
+#: MoinMoin/templates/layout.html:51
 msgid "Settings"
 msgstr "Настройки"
 
-#: MoinMoin/templates/layout.html:56
+#: MoinMoin/templates/layout.html:57
 msgid "Logout"
 msgstr "Выйти"
 
@@ -1373,7 +1510,7 @@
 msgid "Moin login"
 msgstr "Аутентификация на вики"
 
-#: MoinMoin/templates/login.html:25
+#: MoinMoin/templates/login.html:26
 msgid "OpenID login"
 msgstr "Вход по OpenID"
 
@@ -1394,29 +1531,64 @@
 msgid "Metadata of '%(item_name)s'"
 msgstr "Метаданные «%(item_name)s»"
 
-#: MoinMoin/templates/modify_anywikidraw.html:18
-#: MoinMoin/templates/modify_twikidraw.html:13
+#: MoinMoin/templates/modify.html:13
+#, fuzzy, python-format
+msgid "Modifying '%(item_name)s'"
+msgstr "Изменение %(item_name)s"
+
+#: MoinMoin/templates/modify.html:27
+#, fuzzy
+msgid "Link to Subitem"
+msgstr "Список дочерних объектов"
+
+#: MoinMoin/templates/modify.html:27
+msgid "Link"
+msgstr ""
+
+#: MoinMoin/templates/modify.html:30
+msgid "Transclude Subitem"
+msgstr ""
+
+#: MoinMoin/templates/modify.html:30
+msgid "Transclude"
+msgstr ""
+
+#: MoinMoin/templates/modify_anywikidraw.html:17
+#: MoinMoin/templates/modify_twikidraw.html:12
 msgid "NOTE:"
 msgstr "Обратите внимание:"
 
-#: MoinMoin/templates/modify_anywikidraw.html:18
-#: MoinMoin/templates/modify_twikidraw.html:13
+#: MoinMoin/templates/modify_anywikidraw.html:17
+#: MoinMoin/templates/modify_twikidraw.html:12
 msgid "You need a Java enabled browser to edit the drawing."
 msgstr ""
 "Для изменения изображения в Вашем браузере должна быть включена поддержка"
 " Java."
 
-#: MoinMoin/templates/modify_applet.html:4
-#, python-format
-msgid "Modifying %(item_name)s"
-msgstr "Изменение %(item_name)s"
-
-#: MoinMoin/templates/modify_show_template_selection.html:3
-#: MoinMoin/templates/modify_show_type_selection.html:3
+#: MoinMoin/templates/modify_select_contenttype.html:3
+#: MoinMoin/templates/modify_select_template.html:3
 msgid "Create new item?"
 msgstr "Создать новый объект?"
 
-#: MoinMoin/templates/modify_show_template_selection.html:5
+#: MoinMoin/templates/modify_select_contenttype.html:6
+#, python-format
+msgid "Please select the contenttype of the new %(itemtype)s item."
+msgstr ""
+
+#: MoinMoin/templates/modify_select_itemtype.html:3
+msgid "Item not found, create it now?"
+msgstr ""
+
+#: MoinMoin/templates/modify_select_itemtype.html:5
+#, fuzzy, python-format
+msgid ""
+"Item '%(name)s' does not exist (yet), but you can try creating it now. "
+"Please select the type of the item you want to create."
+msgstr ""
+"Этот объект (еще) не существует, но Вы можете создать его. Пожалуйста, "
+"выберите тип желаемого объекта."
+
+#: MoinMoin/templates/modify_select_template.html:5
 #, python-format
 msgid ""
 "You can either <a href='%(modifyhref)s'>create the item from scratch</a> "
@@ -1425,35 +1597,10 @@
 "Вы можете либо  <a href='%(modifyhref)s'>создать объект с нуля</a>, либо "
 "выбрать шаблон."
 
-#: MoinMoin/templates/modify_show_template_selection.html:8
+#: MoinMoin/templates/modify_select_template.html:8
 msgid "Available template items"
 msgstr "Доступные шаблоны"
 
-#: MoinMoin/templates/modify_show_type_selection.html:5
-msgid ""
-"This item does not exist (yet), but you can try creating it now. Please "
-"select the type of the item you want to create."
-msgstr ""
-"Этот объект (еще) не существует, но Вы можете создать его. Пожалуйста, "
-"выберите тип желаемого объекта."
-
-#: MoinMoin/templates/modify_text.html:9
-#, fuzzy
-msgid "Link to Subitem"
-msgstr "Список дочерних объектов"
-
-#: MoinMoin/templates/modify_text.html:9
-msgid "Link"
-msgstr ""
-
-#: MoinMoin/templates/modify_text.html:12
-msgid "Transclude Subitem"
-msgstr ""
-
-#: MoinMoin/templates/modify_text.html:12
-msgid "Transclude"
-msgstr ""
-
 #: MoinMoin/templates/openid_register.html:5 MoinMoin/templates/register.html:5
 msgid "Create Account"
 msgstr "Создать уетную запись"
@@ -1468,37 +1615,37 @@
 msgid "Revert '%(item_name)s' (rev %(rev_id)s)"
 msgstr "Вернуть «%(item_name)s» (вер. %(rev_no)d)"
 
-#: MoinMoin/templates/search.html:10
+#: MoinMoin/templates/search.html:16
 #, python-format
 msgid "%(result_len)d results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:15
+#: MoinMoin/templates/search.html:21
 #, python-format
 msgid "No results found (%(runtime).3f secs)."
 msgstr ""
 
-#: MoinMoin/templates/search.html:29
+#: MoinMoin/templates/search.html:37
 #, python-format
 msgid "name term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:30
+#: MoinMoin/templates/search.html:38
 #, python-format
 msgid "content term suggestions: %(termlist)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:45 MoinMoin/templates/show.html:54
+#: MoinMoin/templates/search.html:53 MoinMoin/templates/show.html:54
 #, python-format
 msgid "Summary: %(summary)s"
 msgstr ""
 
-#: MoinMoin/templates/search.html:51
+#: MoinMoin/templates/search.html:59
 #, fuzzy, python-format
 msgid "Revision: %(revid)s Last Change: %(mtime)s"
 msgstr "Версия: %(revno)d на момент %(date_time)s"
 
-#: MoinMoin/templates/search.html:59
+#: MoinMoin/templates/search.html:67
 msgid "You don't have read permission for this item."
 msgstr ""
 
@@ -1522,7 +1669,7 @@
 msgid "modified"
 msgstr "изменен"
 
-#: MoinMoin/templates/show.html:78
+#: MoinMoin/templates/show.html:78 MoinMoin/templates/blog/utils.html:22
 msgid "by"
 msgstr "пользователем"
 
@@ -1530,34 +1677,33 @@
 msgid "tagged"
 msgstr "теги:"
 
+#: MoinMoin/templates/show_nonexistent.html:3
+msgid "Item not found"
+msgstr ""
+
+#: MoinMoin/templates/show_nonexistent.html:5
+#, fuzzy, python-format
+msgid "Item '%(name)s' does not exist."
+msgstr "Объект %(item_name)s не существет. Создать его?"
+
 #: MoinMoin/templates/sitemap.html:3
-#, python-format
-msgid "SiteMap of %(item_name)s"
+#, fuzzy, python-format
+msgid "SiteMap of '%(item_name)s'"
 msgstr "КартаОкрестностей для %(item_name)s"
 
-#: MoinMoin/templates/usersettings.html:8
-msgid "Personal Settings"
-msgstr "Личные настройки"
-
-#: MoinMoin/templates/usersettings.html:13
-msgid "Change Password"
-msgstr "Сменить пароль"
+#: MoinMoin/templates/ticket.html:5
+#, fuzzy, python-format
+msgid "Creating new ticket: '%(item_name)s'"
+msgstr "Переименовать «%(item_name)s»"
 
-#: MoinMoin/templates/usersettings.html:18
-msgid "Notification Settings"
-msgstr "Настройки уведомлений"
+#: MoinMoin/templates/ticket.html:7
+#, fuzzy, python-format
+msgid "Ticket: '%(item_name)s'"
+msgstr "Удалить «%(item_name)s»"
 
-#: MoinMoin/templates/usersettings.html:23
-msgid "Wiki Appearance Settings"
-msgstr "Настройки внешнего вида вики"
-
-#: MoinMoin/templates/usersettings.html:28
-msgid "Navigation Settings"
-msgstr "Настройки навигации"
-
-#: MoinMoin/templates/usersettings.html:33
-msgid "Options"
-msgstr "Параметры"
+#: MoinMoin/templates/ticket.html:20
+msgid "(Closed)"
+msgstr ""
 
 #: MoinMoin/templates/usersettings_forms.html:35
 msgid ""
@@ -1565,153 +1711,273 @@
 "sent to you."
 msgstr ""
 
-#: MoinMoin/templates/utils.html:62
+#: MoinMoin/templates/usersettings_forms.html:90
+msgid "Personal Settings"
+msgstr "Личные настройки"
+
+#: MoinMoin/templates/usersettings_forms.html:94
+msgid "Change Password"
+msgstr "Сменить пароль"
+
+#: MoinMoin/templates/usersettings_forms.html:98
+msgid "Notification Settings"
+msgstr "Настройки уведомлений"
+
+#: MoinMoin/templates/usersettings_forms.html:102
+msgid "Wiki Appearance Settings"
+msgstr "Настройки внешнего вида вики"
+
+#: MoinMoin/templates/usersettings_forms.html:106
+msgid "Navigation Settings"
+msgstr "Настройки навигации"
+
+#: MoinMoin/templates/usersettings_forms.html:110
+msgid "Options"
+msgstr "Параметры"
+
+#: MoinMoin/templates/utils.html:72
 msgid "Expand Subitem"
 msgstr ""
 
-#: MoinMoin/templates/utils.html:79
+#: MoinMoin/templates/utils.html:91
 #, fuzzy
 msgid "Subitems"
 msgstr "Список дочерних объектов"
 
-#: MoinMoin/themes/__init__.py:57
-msgid "Access denied"
+#: MoinMoin/templates/blog/main.html:4
+msgid "There are no entries in this blog."
+msgstr ""
+
+#: MoinMoin/templates/blog/main.html:6
+#, python-format
+msgid "There are no entries in the '%(tag)s' blog category."
+msgstr ""
+
+#: MoinMoin/templates/blog/main.html:13
+msgid "Category:"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:15
+#, fuzzy
+msgid "Modify entry"
+msgstr "изменен"
+
+#: MoinMoin/templates/blog/utils.html:21
+msgid "Published on"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:24
+msgid "Not published yet."
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:34
+#, fuzzy
+msgid "Tags:"
+msgstr "Теги"
+
+#: MoinMoin/templates/blog/utils.html:44
+msgid "Discussion page"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:51
+msgid "Categories"
+msgstr ""
+
+#: MoinMoin/templates/blog/utils.html:69
+msgid "only this blog"
+msgstr ""
+
+#: MoinMoin/themes/__init__.py:58
+#, fuzzy
+msgid "Access Denied"
 msgstr "Доступ запрещен"
 
-#: MoinMoin/themes/__init__.py:58
+#: MoinMoin/themes/__init__.py:59
 msgid "You are not allowed to access this resource."
 msgstr "Вам запрещен доступ к этому ресурсу"
 
-#: MoinMoin/themes/__init__.py:292
+#: MoinMoin/themes/__init__.py:286
 msgid "anonymous"
 msgstr "анонимно"
 
-#: MoinMoin/util/paramparser.py:316
+#: MoinMoin/util/paramparser.py:318
 #, python-format
 msgid "Argument \"%(name)s\" must be a boolean value, not \"%(value)s\""
 msgstr "Аргумент «%(name)s» должен быть булевым значением, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:319
+#: MoinMoin/util/paramparser.py:321
 #, python-format
 msgid "Argument must be a boolean value, not \"%(value)s\""
 msgstr "Аргумент должен быть булевым значением, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:345
+#: MoinMoin/util/paramparser.py:347
 #, python-format
 msgid "Argument \"%(name)s\" must be an integer value, not \"%(value)s\""
 msgstr "Аргумент «%(name)s» должен быть целым числом, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:348
+#: MoinMoin/util/paramparser.py:350
 #, python-format
 msgid "Argument must be an integer value, not \"%(value)s\""
 msgstr "Аргумент должен быть числовым значением, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:373
+#: MoinMoin/util/paramparser.py:375
 #, python-format
 msgid "Argument \"%(name)s\" must be a floating point value, not \"%(value)s\""
 msgstr ""
 "Аргумент «%(name)s» должен быть числовым значением с плавающей точкой, а "
 "не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:376
+#: MoinMoin/util/paramparser.py:378
 #, python-format
 msgid "Argument must be a floating point value, not \"%(value)s\""
 msgstr ""
 "Аргумент должен быть числовым значением с плавающей точкой, а не \"\n"
 "\"«%(value)s»"
 
-#: MoinMoin/util/paramparser.py:403
+#: MoinMoin/util/paramparser.py:405
 #, python-format
 msgid "Argument \"%(name)s\" must be a complex value, not \"%(value)s\""
 msgstr "Аргумент «%(name)s» должен быть комплексным значением, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:406
+#: MoinMoin/util/paramparser.py:408
 #, python-format
 msgid "Argument must be a complex value, not \"%(value)s\""
 msgstr "Аргумент должен быть комплексным значением, а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:460
+#: MoinMoin/util/paramparser.py:462
 #, python-format
 msgid "Argument \"%(name)s\" must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr "Аргумент «%(name)s» должен быть один из «%(choices)s», а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:465
+#: MoinMoin/util/paramparser.py:467
 #, python-format
 msgid "Argument must be one of \"%(choices)s\", not \"%(value)s\""
 msgstr "Аргумент должен быть один из «%(choices)s», а не «%(value)s»"
 
-#: MoinMoin/util/paramparser.py:690
+#: MoinMoin/util/paramparser.py:691
 msgid "Too many arguments"
 msgstr "Слишком много аргументов"
 
-#: MoinMoin/util/paramparser.py:695
+#: MoinMoin/util/paramparser.py:696
 msgid "Cannot have arguments without name following named arguments"
 msgstr ""
 "Нельзя использовать аргументы без имени, которые следуют за именованными "
 "аргументами"
 
-#: MoinMoin/util/paramparser.py:711
+#: MoinMoin/util/paramparser.py:712
 #, python-format
 msgid "Argument \"%(name)s\" is required"
 msgstr "Требуется аргумент «%(name)s»"
 
-#: MoinMoin/util/paramparser.py:723
+#: MoinMoin/util/paramparser.py:724
 #, python-format
 msgid "No argument named \"%(name)s\""
 msgstr "Нет параметров с именем «%(name)s»"
 
-#~ msgid "Refers Here"
-#~ msgstr "Ссылки сюда"
-
-#~ msgid "Switch showing comments on or off"
-#~ msgstr "Показать или скрыть комментарии"
-
-#~ msgid "Copy"
-#~ msgstr "Копировать"
-
-#~ msgid "Create a copy of this item"
-#~ msgstr "Создать копию этого объекта"
+#~ msgid "User Browser"
+#~ msgstr "Просмотр пользователей"
 
-#~ msgid "Move this item to the trash"
-#~ msgstr "Переместить объект в корзину"
-
-#~ msgid "Permission denied!"
-#~ msgstr "Доступ запрещен!"
+#~ msgid "System items upgrade"
+#~ msgstr "Обновление системных объектов"
 
-#~ msgid "You"
-#~ msgstr "Вы"
+#~ msgid "System items upgrade failed due to the following error: %(error)s."
+#~ msgstr ""
+#~ "Обновление системных объектов не удалось "
+#~ "из-за следущей ошибки: %(error)s."
 
-#~ msgid "%(username)s may not %(priv)s '%(item)s'."
-#~ msgstr "%(username)s не может %(priv)s «%(item)s»."
+#~ msgid "System items have been upgraded successfully!"
+#~ msgstr "Системные объекты успешно обновились!"
 
-#~ msgid "DESTROY REVISION '%(item_name)s' (rev %(rev_no)d)"
-#~ msgstr "УНИЧТОЖИТЬ ВЕРСИЮ «%(item_name)s» (вер. %(rev_no)d)"
+#~ msgid "Wiki Configuration"
+#~ msgstr "Конфигурация вики"
+
+#~ msgid "Highlighter Help"
+#~ msgstr "подсветка"
+
+#~ msgid "Interwiki Help"
+#~ msgstr "Имя ИнтерВики"
+
+#~ msgid "Available Highlighters"
+#~ msgstr "Доступные варианты подстветки синтаксиса"
+
+#~ msgid "Upgrade system items"
+#~ msgstr "Обновить системные объекты"
+
+#~ msgid "Show Wiki Configuration Help"
+#~ msgstr "Показать помощь по конфигурации вики"
+
+#~ msgid "Known InterWiki names"
+#~ msgstr "Известные имена ИнтерВики"
 
 #~ msgid ""
-#~ "Item: %(item_name)s (Diff between revision "
-#~ "%(oldrevno)s and %(newrevno)s)"
+#~ "You can upgrade your system items "
+#~ "by uploading an xml file with new"
+#~ " items below."
 #~ msgstr ""
-#~ "Объект: %(item_name)s (Разница между версиями"
-#~ " %(oldrevno)s и %(newrevno)s)"
-
-#~ msgid "No older revision"
-#~ msgstr "Нет более старых версий"
-
-#~ msgid "Use older revision"
-#~ msgstr "Использовать более старую версию"
+#~ "Вы можете обновить системные элементы, "
+#~ "загрузив XML-файл с новыми объектами "
+#~ "ниже."
 
-#~ msgid "No newer revision"
-#~ msgstr "Нет более новых версий"
-
-#~ msgid "Use newer revision"
-#~ msgstr "Использовать более новую версию"
+#~ msgid "Wiki configuration"
+#~ msgstr "Конфигурация вики"
 
-#~ msgid "Action"
-#~ msgstr "Действие"
+#~ msgid "WikiConfig Help"
+#~ msgstr "Помощь по WikiConfig"
 
-#~ msgid "This item exists, but it has no revisions."
-#~ msgstr "Этот объект существует, но не имеет версий."
+#~ msgid "name_exact"
+#~ msgstr ""
 
-#~ msgid "Total: %(total)s"
-#~ msgstr "Всего: %(total)s"
+#~ msgid "itemid"
+#~ msgstr ""
 
+#~ msgid "revid"
+#~ msgstr ""
+
+#~ msgid "userid"
+#~ msgstr ""
+
+#~ msgid "language"
+#~ msgstr ""
+
+#~ msgid "itemlinks"
+#~ msgstr ""
+
+#~ msgid "itemtransclusions"
+#~ msgstr ""
+
+#~ msgid "refs"
+#~ msgstr ""
+
+#~ msgid "markup text"
+#~ msgstr ""
+
+#~ msgid "other text"
+#~ msgstr ""
+
+#~ msgid "image"
+#~ msgstr ""
+
+#~ msgid "audio"
+#~ msgstr ""
+
+#~ msgid "video"
+#~ msgstr ""
+
+#~ msgid "other"
+#~ msgstr "предыдущая версия"
+
+#~ msgid "unknown"
+#~ msgstr "<неизвестно>"
+
+#~ msgid "Alias-Name"
+#~ msgstr "Псевдоним"
+
+#~ msgid "Date"
+#~ msgstr ""
+
+#~ msgid "MetaData (JSON)"
+#~ msgstr "Метаданные (JSON)"
+
+#~ msgid "DESTROY COMPLETE item '%(item_name)s'"
+#~ msgstr "УНИЧТОЖИТЬ ВЕСЬ объект «%(item_name)s»"
+