8000 ci: Update develop with 3.11.1 release by fsbraun · Pull Request #7469 · django-cms/django-cms · GitHub
[go: up one dir, main page]

Skip to content

ci: Update develop with 3.11.1 release #7469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 68 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
5f4814b
Release 3.10.0 RC1 (#7215)
Feb 1, 2022
c7d4e15
Update release/3.10 from develop (#7219)
marksweb Feb 8, 2022
2f8cb35
Add toolbar fix for broken CMS in the release 3.10.x (#7233)
vinitkumar Feb 10, 2022
3e5227d
fix: using .nvmrc to target teh right nvm version
Mar 5, 2022
822fbab
Release/3.10.x (#7260) Releasing 3.10.0RC2
Mar 5, 2022
d415b84
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
9e93ac9
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
7a363eb
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
0aa37dc
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
afd8def
Release/3.10.x (#7275)
Mar 26, 2022
5714a8f
Fixes #7288 by also catching AttributeError, when the current toolbar…
mbi Mar 31, 2022
40a818c
Merge branch 'django-cms:develop' into develop
marksweb Apr 2, 2022
e707f6a
Fix for django 2.2 in middleware [#7290] (#7293)
marksweb Apr 4, 2022
373579f
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
3531372
Update release script to make it compatible with BSD (macos) compatib…
marksweb Apr 4, 2022
5d33733
Merge branch 'django-cms:develop' into develop
marksweb Apr 4, 2022
3ba9bb3
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Apr 4, 2022
862a0f6
Fix version number in bump commit
marksweb Apr 4, 2022
1cb3dc5
Fix release script version commit. (#7295)
marksweb Apr 4, 2022
5e2d7a7
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Apr 4, 2022
20cd347
Merge branch 'django-cms:develop' into develop
marksweb Apr 20, 2022
8914915
Merge branch 'django-cms:develop' into develop
marksweb May 22, 2022
00ab32c
Merge branch 'develop' of github.com:django-cms/django-cms into develop
marksweb May 23, 2022
f892d6e
build: Release 3.11.0rc1 (#7326)
creyD May 24, 2022
ce8b47e
Merge branch 'release/3.10.x' into develop
marksweb May 24, 2022
ea18ce1
fix: typos in CHANGELOG.rst
marksweb May 24, 2022
322c6da
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Jun 1, 2022
51ab0c5
build: release 3.10.1rc1 (#7330)
creyD Jun 1, 2022
da05c2e
Merge branch 'django-cms:develop' into develop
marksweb Jun 1, 2022
3db198c
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 1, 2022
a91ac91
fix: Use http rather than https in toolbar sites menu (#7331)
marksweb Jun 1, 2022
caddfe7
fix: Revert change to the toolbar sites menu to use ``http`` protocol…
marksweb Jun 1, 2022
fbfe723
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Jun 15, 2022
1c87eae
Merge branch 'django-cms:develop' into develop
marksweb Jun 23, 2022
abd384c
Merge branch 'release/3.10.x' of github.com:django-cms/django-cms int…
marksweb Jun 27, 2022
e54dc30
fix: Rename changelog title to fix release script
marksweb Jun 27, 2022
966a90f
fix: Changelog title for 3.10.1rc1 (#7345)
marksweb Jun 27, 2022
993b3c9
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
eff54b0
fix: Request missing from test rendering (#7346)
marksweb Jun 27, 2022
32afa2f
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
31f3995
fix: Changelog titles for 3.10.x (#7347)
marksweb Jun 27, 2022
e84de57
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
446e39d
build: Release 3.10.1 (#7348)
creyD Jun 27, 2022
58ad645
Merge branch 'django-cms:release/3.10.x' into release/3.10.x
marksweb Jun 27, 2022
cda666b
ci: Merging 3.10.1
marksweb Jun 27, 2022
e8d96c1
Merge branch 'develop' into release/3.11.x
marksweb Jun 28, 2022
0c9c9aa
ci: Merge develop into release/3.11 (#7350)
marksweb Jun 28, 2022
32a1342
Update CHANGELOG.rst
marksweb Jun 28, 2022
041e47b
Update CHANGELOG.rst
marksweb Jun 28, 2022
fc3952e
Update CHANGELOG.rst
marksweb Jun 28, 2022
76ca579
Update CHANGELOG.rst
marksweb Jun 28, 2022
95d8b7b
Update docs/upgrade/3.10.1.rst
marksweb Jun 28, 2022
70119a5
Merge branch 'django-cms:develop' into develop
marksweb Jun 28, 2022
20be9b1
Merge branch 'django-cms:release/3.11.x' into release/3.11.x
marksweb Jun 28, 2022
1fbf7b8
Merge branch 'develop' into release/3.11.x
marksweb Jun 28, 2022
faf4bf1
ci: Flake8 fixes (#7372)
marksweb Aug 1, 2022
34de125
Add release candidate to changelog version
marksweb Aug 2, 2022
2744777
Change 3.11.0rc1 release date to fix `make-changelog`
marksweb Aug 2, 2022
af7b38d
build: Release 3.11.0 (#7373)
creyD Aug 2, 2022
a492386
fix: Added language to page cache key (#7354)
marksweb Jul 3, 2022
a52fc70
Update install.rst (#7368)
dapoadedire Jul 24, 2022
c9f134c
Updated changelog for 3.11.0
marksweb Aug 2, 2022
f99ba69
feat: Release/3.11.1 (#7431)
fsbraun Nov 8, 2022
7c9fe65
feat: Add github actions for publishing on pyi (#7438)
fsbraun Nov 14, 2022
6105262
build: Release v3.11.1 (#7455)
fsbraun Dec 12, 2022
979d42c
build: bump minimatch from 3.0.4 to 3.1.2 (#7453)
dependabot[bot] Dec 24, 2022
2ea05d4
build: bump decode-uri-component from 0.2.0 to 0.2.2 (#7451)
dependabot[bot] Dec 27, 2022
0edd6a2
Merge branch 'develop' into update-develop
fsbraun Jan 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/workflows/publish-to-live-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish Python 🐍 distributions 📦 to pypi

on:
release:
types:
- published

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to pypi
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'

- name: Install pypa/build
run: >-
python -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
.

- name: Publish distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
41 changes: 41 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Publish Python 🐍 distributions 📦 to TestPyPI

on:
push:
branches:
- 'develop'
- 'release/**'

jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'

- name: Install pypa/build
run: >-
python -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
.

- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
skip_existing: true
82 changes: 80 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,86 @@
Changelog
=========

unreleased
==========
3.11.1 (2022-12-12)
===================

Features:
---------
* add Python 3.11 support for Django CMS (#7422) (3fe1449e6) -- Vinit Kumar
* Support for Django 4.1 (#7404) (777864af3) -- Fabian Braun
* Add support for tel: and mailto: URIs in Advanced Page Settings redirect field (#7370) (0fd058ed3) -- Mark Walker
* Improved dutch translations -- Stefan van den Eertwegh

Bug Fixes:
----------
* Prefer titles matching request language (#7144) (06c9a85df) -- Micah Denbraver
* Adds a deprecation warning for SEND_BROKEN_LINK_EMAILS (#7420) (d38f4a1cc) -- Fabian Braun
* Added deprecation warning to `get_current_language()` (#7410) (2788f75e6) -- Mark Walker
* CMS check management command fixed [#7412] (#7413) (dcf394bd5) -- ton77v
* Changing color scheme resets session settings to defaults (#7407) (fcfe77f63) -- Fabian Braun
* Clear page permission cache on page create (#6866) (e59c179dd) -- G3RB3N
* Unlocalize page and node ids when rendering the page tree in the admin (#7188) (9e3c57946) -- Marco Bonetti
* Allow partially overriding CMS_CACHE_DURATIONS (#7339) (162ff8dd8) -- Qijia Liu
* CMS check management command fixed [#7386] (cdcf260aa) -- Marco Bonetti
* default light mode (#7381) (abc6e6c5b) -- viliammihalik
* Added language to page cache key (#7354) (d5a9f49e6) -- Mark Walker

Refactoring and Cleanups:
-------------------------
* Move js API functions to CMS.Helpers to make them available also to the admin site (#7384) (a7f8cd44f) -- Fabian Braun

Statistics:
-----------

This release was created with the help of the following contributors (in alphabetical order):

* Fabian Braun
* G3RB3N
* Marco Benetti
* Mark Walker
* Micah Denbraver
* Qijia Liu
* Stefan van den Eertwegh
* villiammihalik
* Vinit Kumar


With the review help of the following contributors:

* Cage Johnson
* Christian Clauss
* Conrad
* Dapo Adedire
* Fabian Braun
* Florian Delizy
* G3RB3N
* Hussein Srour
* Marco Bonetti
* Mark Walker
* Micah Denbraver
* Pankrat
* Patrick Mazulo
* Qijia Liu
* Shivan Sivakumaran
* Simon Krull
* Vinit Kumar
* code-review-doctor
* dependabot[bot]
* fsbraun
* jefe
* ton77v
* viliammihalik
* wesleysima

Thanks to all contributors for their efforts!

3.11.0 (2022-08-02)
===================

Highlights:
-----------
* Support for django 4
* Dark mode support

* Support for Python 3.11
* Support for django 4.1
Expand Down
7 changes: 3 additions & 4 deletions cms/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
__version__ = '3.11.0'
__version__ = '3.11.1'

try:
import django

if django.VERSION < (3, 2):
default_app_config = 'cms.apps.CMSConfig'

except ModuleNotFoundError:
# dependencies not installed yet
except (ImportError, ModuleNotFoundError):
# Allow setup.py to import __version__ before dependencies are installed
pass
Binary file modified cms/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
7 changes: 4 additions & 3 deletions cms/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# Bashar Al-Abdulhadi, 2013-2015,2017,2019-2020
# Bashar Al-Abdulhadi, 2013-2014
# Bashar Ghadanfar <10.tens@gmail.com>, 2017
# Fabian Braun <fsbraun@gmx.de>, 2022
# Jonas Obrist <me@ojii.ch>, 2011
# SHENKAR <sheeennn@gmail.com>, 2014
# SHENKAR <sheeennn@gmail.com>, 2014
Expand All @@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Bashar Al-Abdulhadi, 2013-2015,2017,2019-2020\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\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 @@ -1225,7 +1226,7 @@ msgstr "نسخة تطوير باستخدام ن.إ.م. جانقو %(cms_version)
msgid "Cancel"
msgstr "إلغاء"

msgid "The following error occured:"
msgid "The following error occurred:"
msgstr "حدث الخطأ التالي:"

msgid "Action successful."
Expand Down
Binary file modified cms/locale/ar/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/ar/LC_MESSAGES/djangojs.po
< C2EE td class="blob-code blob-code-addition js-file-line"> "POT-Creation-Date: 2022-11-05 19:07+0100\n"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Bashar Ghadanfar <10.tens@gmail.com>, 2017\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
Expand Down
Binary file modified cms/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
7 changes: 4 additions & 3 deletions cms/locale/ca/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
#
# Translators:
# Daniel Bassa Perez <danbasper@gmail.com>, 2013
# Fabian Braun <fsbraun@gmx.de>, 2022
# Roger Pons <rogerpons@gmail.com>, 2012-2016
# whoami <whoami@live.de>, 2013
# whoami <whoami@live.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Roger Pons <rogerpons@gmail.com>, 2012-2016\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\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 @@ -1215,7 +1216,7 @@ msgstr "Versió de desenvolupament utilitzant django CMS %(cms_version)s, Django
msgid "Cancel"
msgstr "Cancel·lar"

msgid "The following error occured:"
msgid "The following error occurred:"
msgstr "S´ha produït el següent error:"

msgid "Action successful."
Expand Down
Binary file modified cms/locale/ca/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/ca/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Roger Pons <rogerpons@gmail.com>, 2012,2015\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.
7 changes: 4 additions & 3 deletions cms/locale/cs/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# Translators:
# Jiří Vírava <appukonrad@gmail.com>, 2012-2013
# Fabian Braun <fsbraun@gmx.de>, 2022
# Martin S. <marhac@seznam.cz>, 2018
# koren <honza@kekorenum.com>, 2015
# Jakub Dorňák <jakub.dornak@misli.cz>, 2020
Expand All @@ -24,9 +25,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: yedpodtrzitko <yed@vanyli.net>, 2017\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\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 @@ -1230,7 +1231,7 @@ msgstr "Vývojová verze používající django CMS %(cms_version)s, Django %(dj
msgid "Cancel"
msgstr "Storno"

msgid "The following error occured:"
msgid "The following error occurred:"
msgstr "Došlo k následující chybě:"

msgid "Action successful."
Expand Down
Binary file modified cms/locale/cs/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/cs/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: xlu <xlu@seznam.cz>, 2013\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.
9 changes: 5 additions & 4 deletions cms/locale/da/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Fabian Braun <fsbraun@gmx.de>, 2022
# Jonas Hyatt <jonas@hyatt.space>, 2018
# Kristian Øllegaard <kristian@oellegaard.com>, 2011
# Kristian Øllegaard <kristian@oellegaard.com>, 2011
Expand All @@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Jonas Hyatt <jonas@hyatt.space>, 2018\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\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 @@ -1046,7 +1047,7 @@ msgid "Changes within the tree might require a refresh."
msgstr "Ændringer i træet kan kræve en genindlæsning."

msgid "Error:"
msgstr ""
msgstr "Fejl:"

msgid ""
"This page cannot be copied because an application is attached to it. See the"
Expand Down Expand Up @@ -1220,7 +1221,7 @@ msgstr ""
msgid "Cancel"
msgstr "Annullér"

msgid "The following error occured:"
msgid "The following error occurred:"
msgstr "Den følgende fejl opstod:"

msgid "Action successful."
Expand Down
Binary file modified cms/locale/da/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/da/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Kristian Øllegaard <kristian@oellegaard.com>, 2011\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.
9 changes: 5 additions & 4 deletions cms/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
#
# Translators:
# death_ashaman <admiral_proton@yahoo.de>, 2014
# Alexander Elvers <alexanderelvers@online.de>, 2017
# Alexander Elvers <transifex@alex.kandru.de>, 2017
# Angelo Dini <angelo.dini@divio.ch>, 2015-2017
# Arne Schauf <transifex2@asmaps.de>, 2014
# Michael P. Jung <michael.jung@terreon.de>, 2013
# Kim Thoenen <kim@smuzey.ch>, 2015
# death_ashaman <admiral_proton@yahoo.de>, 2014
# Diana Dünki <diana.duenki@divio.ch>, 2015
# Fabian Braun <fsbraun@gmx.de>, 2022
# giammi <gian-maria.daffre@giammi.org>, 2017
# Hendrik Richter <hendrikr@gnome.org>, 2014
# Jannik Vieten <me@exploide.net>, 2016
Expand All @@ -34,9 +35,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-26 17:28+0800\n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Peter Wischer <peter.wischer@lwl.org>, 2017-2022\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: German (http://www.transifex.com/divio/django-cms/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1238,7 +1239,7 @@ msgstr "Development version nutzt django CMS %(cms_version)s, Django %(django_ve
msgid "Cancel"
msgstr "Abbrechen"

msgid "The following error occured:"
msgid "The following error occurred:"
msgstr "Der folgende Fehler ist aufgetreten:"

msgid "Action successful."
Expand Down
Binary file modified cms/locale/de/LC_MESSAGES/djangojs.mo
Binary file not shown.
Loading
0