Skip to content

Commit

Permalink
Merge 5604aaa into f389439
Browse files Browse the repository at this point in the history
  • Loading branch information
FinalAngel committed Nov 26, 2019
2 parents f389439 + 5604aaa commit f1f7575
Show file tree
Hide file tree
Showing 221 changed files with 842 additions and 333 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.rst
Expand Up @@ -3,7 +3,7 @@ Changelog
=========


3.7.1 (unreleased) - in development
3.7.1 (2019-11-26)
==================

* Added code of conduct reference file to the root directory
Expand All @@ -21,8 +21,8 @@ Changelog
permissions requests edit mode.
* Fixed the 'urls.W001' warning with custom apphook urls
* Prevent non-staff users to login with the django CMS toolbar
* Added missing ``{% trans %}?? to toolbar shortcuts.
* Updated branch and release policy.
* Added missing ``{% trans %}`` to toolbar shortcuts.
* Fixed branch and release policy.
* Improved and simplified permissions documentation.
* Improved apphooks documentation.
* Improved CMSPluginBase documentation.
Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

__version__ = '3.7.0'
__version__ = '3.7.1'

default_app_config = 'cms.apps.CMSConfig'
Binary file modified cms/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
32 changes: 20 additions & 12 deletions cms/locale/ar/LC_MESSAGES/django.po
Expand Up @@ -5,6 +5,7 @@
# Translators:
# Translators:
# Ahmed H <info@draco-003.com>, 2013
# Ali Khalel <ali.khalel@gmail.com>, 2019
# Bashar Al-Abdulhadi, 2013-2015,2017,2019
# Bashar Al-Abdulhadi, 2013-2014
# Bashar Ghadanfar <10.tens@gmail.com>, 2017
Expand All @@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2019-02-07 11:07+0000\n"
"Last-Translator: Bashar Al-Abdulhadi\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -575,7 +576,7 @@ msgstr "لعنوان تفرع تلقائي يُترك فارغاً ، أو تع

#| msgid "You do not have permission to add a plugin"
msgid "You don't have the permissions required to add a page."
msgstr ""
msgstr "ليس لديك الصلاحية لإضافة صفحة."

msgid "ID"
msgstr "المعرّف"
Expand Down Expand Up @@ -915,7 +916,7 @@ msgstr "كلمة المرور:"

#| msgid "Add Page"
msgid "Add a page"
msgstr ""
msgstr "إضافة صفحة"

msgid "Change a page"
msgstr "غير صفحة"
Expand Down Expand Up @@ -1003,7 +1004,7 @@ msgstr "لصق"

#| msgid "Save as new"
msgid "Set as home"
msgstr ""
msgstr "ضبط كصفحة رئيسية"

msgid "is restricted"
msgstr "مقيّدة"
Expand Down Expand Up @@ -1215,18 +1216,18 @@ msgid "This plugin cannot have nested plugins."
msgstr "لا يمكن لهذا الملحق أن يكون له ملحقات متداخلة."

msgid "Highlight"
msgstr ""
msgstr "تحديد"

msgid "Available plugins"
msgstr "الملحقات المتوفرة"

#| msgid "Structure"
msgid "Toggle structure"
msgstr ""
msgstr "تبديل البُنية"

#| msgid "View published"
msgid "View published"
msgstr ""
msgstr "عرض المنشور"

msgid "Login"
msgstr "تسجيل الدخول"
Expand All @@ -1252,7 +1253,7 @@ msgstr "حدث الخطأ التالي:"

#| msgid "Action successfull... reloading."
msgid "Action successful."
msgstr ""
msgstr "إجراء ناجح"

msgid "Are you sure you want to delete this plugin?"
msgstr "هل أنت متأكد من رغبتك بحذف هذا الملحق؟"
Expand All @@ -1269,7 +1270,7 @@ msgstr "لديك بعض التغييرات غير المحفوظة."

#| msgid "Loading..."
msgid "Loading"
msgstr ""
msgstr "جارِ التحميل..."

#| msgid "Are you sure you want to § this page?"
msgid "Are you sure you want to abandon these changes?"
Expand All @@ -1282,14 +1283,17 @@ msgstr "لم يُتمكن من تحميل النموذج. يرجى التأكد

#| msgid "Notify user"
msgid "Most used"
msgstr ""
msgstr "الأكثر استخداما"

msgid "Shortcuts"
msgstr "اختصارات"

msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr "أحضر مربع حوار المساعدة هذا إلى الأعلى"

Expand All @@ -1309,6 +1313,10 @@ msgstr "فتح صندوق \"الإنشاء\""
msgid "Focus on Toolbar"
msgstr "تركيز على شريط الأدوات"

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr "تركيز على المواضع"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/ar/LC_MESSAGES/djangojs.po
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
Expand Down
Binary file modified cms/locale/bg/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 10 additions & 3 deletions cms/locale/bg/LC_MESSAGES/django.po
Expand Up @@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Bulgarian (http://www.transifex.com/divio/django-cms/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1282,6 +1282,9 @@ msgstr ""
msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr ""

Expand All @@ -1301,6 +1304,10 @@ msgstr ""
msgid "Focus on Toolbar"
msgstr ""

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/bg/LC_MESSAGES/djangojs.po
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Bulgarian (http://www.transifex.com/divio/django-cms/language/bg/)\n"
Expand Down
Binary file modified cms/locale/bn/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 10 additions & 3 deletions cms/locale/bn/LC_MESSAGES/django.po
Expand Up @@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Bengali (http://www.transifex.com/divio/django-cms/language/bn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1278,6 +1278,9 @@ msgstr ""
msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr ""

Expand All @@ -1297,6 +1300,10 @@ msgstr ""
msgid "Focus on Toolbar"
msgstr ""

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/bn/LC_MESSAGES/djangojs.po
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Bengali (http://www.transifex.com/divio/django-cms/language/bn/)\n"
Expand Down
Binary file modified cms/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 10 additions & 3 deletions cms/locale/ca/LC_MESSAGES/django.po
Expand Up @@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1281,6 +1281,9 @@ msgstr ""
msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr ""

Expand All @@ -1300,6 +1303,10 @@ msgstr ""
msgid "Focus on Toolbar"
msgstr ""

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/ca/LC_MESSAGES/djangojs.po
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
Expand Down
Binary file modified cms/locale/cs/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 10 additions & 3 deletions cms/locale/cs/LC_MESSAGES/django.po
Expand Up @@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1292,6 +1292,9 @@ msgstr "Zkratky"
msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr "Zobrazit dialog nápovědy"

Expand All @@ -1311,6 +1314,10 @@ msgstr "Otevřít dialog pro Vytvoření"
msgid "Focus on Toolbar"
msgstr ""

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/cs/LC_MESSAGES/djangojs.po
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
Expand Down
Binary file modified cms/locale/da/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 10 additions & 3 deletions cms/locale/da/LC_MESSAGES/django.po
Expand Up @@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"PO-Revision-Date: 2018-11-09 12:08+0000\n"
"Last-Translator: Bartosz Płóciennik <thaian@outlook.com>\n"
"POT-Creation-Date: 2019-11-19 11:09+0100\n"
"PO-Revision-Date: 2019-11-13 08:54+0000\n"
"Last-Translator: Angelo Dini <angelo.dini@divio.ch>\n"
"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1286,6 +1286,9 @@ msgstr ""
msgid "The page was changed in the meantime, reloading..."
msgstr ""

msgid "CMS-wide Shortcuts"
msgstr ""

msgid "Bring up this help dialog"
msgstr ""

Expand All @@ -1305,6 +1308,10 @@ msgstr ""
msgid "Focus on Toolbar"
msgstr ""

#| msgid "Structure"
msgid "Structureboard"
msgstr ""

#| msgid "static placeholders"
msgid "Focus on placeholders"
msgstr ""
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/da/LC_MESSAGES/djangojs.po
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-25 09:43+0200\n"
"POT-Creation-Date: 2019-11-19 11:10+0100\n"
"PO-Revision-Date: 2018-01-11 16:38+0000\n"
"Last-Translator: Paulo Alvarado <paulo.alvarado@divio.ch>\n"
"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
Expand Down
Binary file modified cms/locale/de/LC_MESSAGES/django.mo
Binary file not shown.

0 comments on commit f1f7575

Please sign in to comment.