- Push/pull translations, including new Russian translation from @einsfr

- Add credit to @einstr in CHANGELOG.md and CONTRIBUTORS.md

CHANGELOG.md

@@ -36,6 +36,7 @@ Changelog
 * Updated AbstractMenuItem.clean() to only ever return field-specific
   validation errors, because Wagtail doesn't render non-field errors for
   related models added to the editor interface using `InlinePanel`.
+* Added Russian translations (submitted by Alex einsfr).
 
 
 2.2.2 (27.03.2017)

CONTRIBUTORS.md

@@ -17,4 +17,5 @@
 * Pierre Geier (bloodywing)
 * Max Kurama (MaxKurama)
 * Matas Dailyda (treavis)
+* Alex (einsfr)
 

wagtailmenus/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-20 23:30+0000\n"
+"POT-Creation-Date: 2017-06-21 21:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Andy Babic <[email protected]>, 2017\n"
 "Language-Team: German (https://www.transifex.com/rkhleics/teams/73023/de/)\n"
@@ -50,29 +50,36 @@ msgstr "3: Erlaube 2 Untermenüs"
 msgid "4: Allow 3 levels of sub-navigation"
 msgstr "4: Erlaube 3 Untermenüs"
 
-#: wagtailmenus/models/menuitems.py:37
+#: wagtailmenus/forms.py:23
+msgid ""
+"By default, this will be used as the link text when appearing in menus."
+msgstr ""
+
+#: wagtailmenus/models/menuitems.py:36 wagtailmenus/models/pages.py:129
 msgid "link to an internal page"
 msgstr "Link zu internen Seite"
 
-#: wagtailmenus/models/menuitems.py:43
+#: wagtailmenus/models/menuitems.py:42 wagtailmenus/models/pages.py:136
 msgid "link to a custom URL"
 msgstr "Link zu einer eigenen URL"
 
-#: wagtailmenus/models/menuitems.py:49
-msgid "link text"
-msgstr "Link Text"
+#: wagtailmenus/models/menuitems.py:48 wagtailmenus/models/pages.py:142
+msgid "append to URL"
+msgstr "an URL anheften"
 
-#: wagtailmenus/models/menuitems.py:53
+#: wagtailmenus/models/menuitems.py:52
 msgid ""
-"Provide the text to use for a custom URL, or set on an internal page link to"
-" use instead of the page's title."
+"Use this to optionally append a #hash or querystring to the above page's "
+"URL."
 msgstr ""
+"Benutzte um einen optionalen #hash oder Query an die obige Seiten URL "
+"anzuheften."
 
-#: wagtailmenus/models/menuitems.py:58 wagtailmenus/models/menus.py:291
+#: wagtailmenus/models/menuitems.py:57 wagtailmenus/models/menus.py:315
 msgid "handle"
 msgstr ""
 
-#: wagtailmenus/models/menuitems.py:62
+#: wagtailmenus/models/menuitems.py:61
 msgid ""
 "Use this field to optionally specify an additional value for each menu item,"
 " which you can then reference in custom menu templates."
@@ -81,49 +88,42 @@ msgstr ""
 " festzulegen, welcher dann in eigenen Menütemplates referenziert werden "
 "kann."
 
-#: wagtailmenus/models/menuitems.py:68
-msgid "append to URL"
-msgstr "an URL anheften"
+#: wagtailmenus/models/menuitems.py:67
+msgid "link text"
+msgstr "Link Text"
 
-#: wagtailmenus/models/menuitems.py:72
+#: wagtailmenus/models/menuitems.py:71
 msgid ""
-"Use this to optionally append a #hash or querystring to the above page's "
-"URL."
+"Provide the text to use for a custom URL, or set on an internal page link to"
+" use instead of the page's title."
 msgstr ""
-"Benutzte um einen optionalen #hash oder Query an die obige Seiten URL "
-"anzuheften."
 
-#: wagtailmenus/models/menuitems.py:81
+#: wagtailmenus/models/menuitems.py:80
 msgid "menu item"
 msgstr "Menüeintrag"
 
-#: wagtailmenus/models/menuitems.py:82 wagtailmenus/models/menus.py:266
-#: wagtailmenus/models/menus.py:457
+#: wagtailmenus/models/menuitems.py:81 wagtailmenus/models/menus.py:290
+#: wagtailmenus/models/menus.py:481
 msgid "menu items"
 msgstr "Menüeinträge"
 
-#: wagtailmenus/models/menuitems.py:106
-msgid "This must be set if you're linking to a custom URL."
-msgstr "Das muss gesetzt werden wenn sie eine eigene URL verlinken."
+#: wagtailmenus/models/menuitems.py:101 wagtailmenus/models/pages.py:190
+msgid "Please choose an internal page or provide a custom URL"
+msgstr ""
 
-#: wagtailmenus/models/menuitems.py:113
-msgid "This must be set if you're not linking to a page."
+#: wagtailmenus/models/menuitems.py:104 wagtailmenus/models/pages.py:193
+msgid "Linking to both a page and custom URL is not permitted"
 msgstr ""
-"Das muss gesetzt werden wenn sie nicht zu einer eigenen Seite verlinken."
 
-#: wagtailmenus/models/menuitems.py:119
-msgid ""
-"You cannot link to both a page and URL. Please review your link and clear "
-"any unwanted values."
+#: wagtailmenus/models/menuitems.py:107
+msgid "This field is required when linking to a custom URL"
 msgstr ""
-"Sie können keine Seite und URL gleichzeitig angeben. Bitte überprüfen sie "
-"ihren Link und entfernen sie ungewollte Werte."
 
-#: wagtailmenus/models/menuitems.py:140 wagtailmenus/models/menuitems.py:157
+#: wagtailmenus/models/menuitems.py:128 wagtailmenus/models/menuitems.py:145
 msgid "allow sub-menu for this item"
 msgstr "Untermenü für diesen Eintrag erlauben"
 
-#: wagtailmenus/models/menuitems.py:143 wagtailmenus/models/menuitems.py:160
+#: wagtailmenus/models/menuitems.py:131 wagtailmenus/models/menuitems.py:148
 msgid ""
 "NOTE: The sub-menu might not be displayed, even if checked. It depends on "
 "how the menu is used in this project's templates."
@@ -132,15 +132,15 @@ msgstr ""
 "ausgewählt wurde. Das hängt ab davon wie das Menü im Projekttemplate "
 "verwendet wird."
 
-#: wagtailmenus/models/menus.py:204 wagtailmenus/models/menus.py:280
+#: wagtailmenus/models/menus.py:228 wagtailmenus/models/menus.py:304
 msgid "site"
 msgstr "Seite"
 
-#: wagtailmenus/models/menus.py:211 wagtailmenus/models/menus.py:305
+#: wagtailmenus/models/menus.py:235 wagtailmenus/models/menus.py:329
 msgid "maximum levels"
 msgstr "Maximaltiefe"
 
-#: wagtailmenus/models/menus.py:215
+#: wagtailmenus/models/menus.py:239
 msgid ""
 "The maximum number of levels to display when rendering this menu. The value "
 "can be overidden by supplying a different <code>max_levels</code> value to "
@@ -150,11 +150,11 @@ msgstr ""
 "werden indem man <code>max_levels</code> im <code>{% main_menu %}</code> tag"
 " in den Templates mit angibt."
 
-#: wagtailmenus/models/menus.py:222 wagtailmenus/models/menus.py:316
+#: wagtailmenus/models/menus.py:246 wagtailmenus/models/menus.py:340
 msgid "specific page usage"
 msgstr ""
 
-#: wagtailmenus/models/menus.py:226
+#: wagtailmenus/models/menus.py:250
 msgid ""
 "Controls how 'specific' pages objects are fetched and used when rendering "
 "this menu. This value can be overidden by supplying a different "
@@ -166,45 +166,45 @@ msgstr ""
 "<code>use_specific</code> im <code>{% main_menu %}</code> tag in den "
 "Templates mit angibt."
 
-#: wagtailmenus/models/menus.py:235 wagtailmenus/models/menus.py:236
+#: wagtailmenus/models/menus.py:259 wagtailmenus/models/menus.py:260
 msgid "main menu"
 msgstr "Haupmenü"
 
-#: wagtailmenus/models/menus.py:245
+#: wagtailmenus/models/menus.py:269
 #, python-format
 msgid "Main menu for %(site_name)s"
 msgstr "Hauptmenü für %(site_name)s"
 
-#: wagtailmenus/models/menus.py:269 wagtailmenus/models/menus.py:460
+#: wagtailmenus/models/menus.py:293 wagtailmenus/models/menus.py:484
 msgid "Advanced settings"
 msgstr "Fortgeschrittene Einstellungen"
 
-#: wagtailmenus/models/menus.py:286
+#: wagtailmenus/models/menus.py:310
 msgid "title"
 msgstr "Titel"
 
-#: wagtailmenus/models/menus.py:288
+#: wagtailmenus/models/menus.py:312
 msgid "For internal reference only."
 msgstr "Nur für interne Verwendung."
 
-#: wagtailmenus/models/menus.py:294
+#: wagtailmenus/models/menus.py:318
 msgid ""
 "Used to reference this menu in templates etc. Must be unique for the "
 "selected site."
 msgstr ""
 "Verwendet um dieses Menü in Templates zu referenzieren. Muss einzigartig für"
 " die ausgewählte Seite sein."
 
-#: wagtailmenus/models/menus.py:299
+#: wagtailmenus/models/menus.py:323
 msgid "heading"
 msgstr "Überschrift"
 
-#: wagtailmenus/models/menus.py:302
+#: wagtailmenus/models/menus.py:326
 msgid "If supplied, appears above the menu when rendered."
 msgstr ""
 "Wenn angegeben erscheint dies oberhalb des Menüs, wen es gerendert wird."
 
-#: wagtailmenus/models/menus.py:309
+#: wagtailmenus/models/menus.py:333
 msgid ""
 "The maximum number of levels to display when rendering this menu. The value "
 "can be overidden by supplying a different <code>max_levels</code> value to "
@@ -214,7 +214,7 @@ msgstr ""
 "werden indem man <code>max_levels</code> im <code>{% flat_menu %}</code> tag"
 " in den Templates mit angibt."
 
-#: wagtailmenus/models/menus.py:320
+#: wagtailmenus/models/menus.py:344
 msgid ""
 "Controls how 'specific' pages objects are fetched and used when rendering "
 "this menu. This value can be overidden by supplying a different "
@@ -226,53 +226,77 @@ msgstr ""
 "<code>use_specific</code> im <code>{% flat_menu %}</code> tag in den "
 "Templates mit angibt."
 
-#: wagtailmenus/models/menus.py:332
+#: wagtailmenus/models/menus.py:356
 msgid "flat menu"
 msgstr "Flaches Menü"
 
-#: wagtailmenus/models/menus.py:333
+#: wagtailmenus/models/menus.py:357
 msgid "flat menus"
 msgstr "Flache Menüs"
 
-#: wagtailmenus/models/menus.py:438
+#: wagtailmenus/models/menus.py:462
 msgid ""
 "Site and handle must create a unique combination. A menu already exists with"
 " these same two values."
 msgstr ""
 "Seite und Alias müssen eine einzigartige Kombination bilden. Es existiert "
 "schon ein Eintrag mit diesen zwei Werten."
 
-#: wagtailmenus/models/menus.py:448 wagtailmenus/panels.py:41
+#: wagtailmenus/models/menus.py:472 wagtailmenus/panels.py:52
+#: wagtailmenus/panels.py:56
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: wagtailmenus/models/pages.py:16
+#: wagtailmenus/models/pages.py:23
 msgid "repeat in sub-navigation"
 msgstr "In Untermenüs wiederholen"
 
-#: wagtailmenus/models/pages.py:19
+#: wagtailmenus/models/pages.py:26
 msgid ""
 "If checked, a link to this page will be repeated alongside it's direct "
 "children when displaying a sub-navigation for this page."
 msgstr ""
 
-#: wagtailmenus/models/pages.py:24
+#: wagtailmenus/models/pages.py:31
 msgid "repeated item link text"
 msgstr "Link text wiederholen"
 
-#: wagtailmenus/models/pages.py:28
+#: wagtailmenus/models/pages.py:35
 msgid ""
 "e.g. 'Section home' or 'Overview'. If left blank, the page title will be "
 "used."
 msgstr ""
 "z.B. 'Sektion Start' oder 'Übersicht'. Wenn leer gelassen, dann wird der "
 "Seitentitel benutzt."
 
-#: wagtailmenus/panels.py:9
+#: wagtailmenus/models/pages.py:146
+msgid "Use this to optionally append a #hash or querystring to the URL."
+msgstr ""
+
+#: wagtailmenus/models/pages.py:150
+msgid "menu item css classes"
+msgstr ""
+
+#: wagtailmenus/models/pages.py:154
+msgid ""
+"Optionally specify css classes to be added to this page when it appears in "
+"menus."
+msgstr ""
+
+#: wagtailmenus/models/pages.py:187
+msgid "A link page cannot link to another link page"
+msgstr ""
+
+#: wagtailmenus/models/pages.py:277
+#, python-format
+msgid "This page redirects to: %(url)s"
+msgstr ""
+
+#: wagtailmenus/panels.py:10
 msgid "Advanced menu behaviour"
 msgstr "Fortgeschrittenes Menüverhalten"
 
-#: wagtailmenus/panels.py:24
+#: wagtailmenus/panels.py:25
 msgid "Scheduled publishing"
 msgstr "Geplante Veröffentlichung"