Merge branch 'release/2.9.4.rc1' into develop

django-cms · May 17, 2016 · 45d071d · 45d071d
2 parents 6eebe69 + 6906de9
commit 45d071d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+2.9.4.rc1 (2016-05-16)
+----------------------
+
+* Adds support for the django CMS's ability to better handle plugin creation
+
+
 2.9.3 (2016-04-27)
 ------------------
 

diff --git a/djangocms_text_ckeditor/__init__.py b/djangocms_text_ckeditor/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = "2.9.3.post1"
+__version__ = "2.9.4.rc1"
 default_app_config = 'djangocms_text_ckeditor.apps.TextCkeditorConfig'
diff --git a/djangocms_text_ckeditor/locale/en/LC_MESSAGES/django.mo b/djangocms_text_ckeditor/locale/en/LC_MESSAGES/django.mo
diff --git a/djangocms_text_ckeditor/locale/en/LC_MESSAGES/django.po b/djangocms_text_ckeditor/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-26 21:38-0400\n"
+"POT-Creation-Date: 2016-05-16 21:47-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: cms_plugins.py:116 cms_plugins.py:122
+msgid "You do not have permission to add a plugin"
+msgstr ""
+
+#: cms_plugins.py:168 cms_plugins.py:214
+msgid ""
+"Unable to process your request. You don't have the required permissions."
+msgstr ""
+
+#: cms_plugins.py:201
+msgid "Unable to process your request."
+msgstr ""
+
+#: cms_plugins.py:224
+msgid "Unable to process your request. Invalid token."
+msgstr ""
+
+#: forms.py:33
+msgid "Can't delete a saved plugin."
+msgstr ""
+
 #: models.py:47
 msgid "body"
 msgstr ""
@@ -29,23 +50,23 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: templates/cms/plugins/widgets/ckeditor.html:31
-#: templates/cms/plugins/widgets/ckeditor.html:34
+#: templates/cms/plugins/widgets/ckeditor.html:36
+#: templates/cms/plugins/widgets/ckeditor.html:39
 msgid "CMS Plugins"
 msgstr ""
 
-#: templates/cms/plugins/widgets/ckeditor.html:32
+#: templates/cms/plugins/widgets/ckeditor.html:37
 msgid "Add CMS Plugin"
 msgstr ""
 
-#: templates/cms/plugins/widgets/ckeditor.html:33
+#: templates/cms/plugins/widgets/ckeditor.html:38
 msgid "Edit CMS Plugin"
 msgstr ""
 
-#: templates/cms/plugins/widgets/ckeditor.html:35
+#: templates/cms/plugins/widgets/ckeditor.html:40
 msgid "Link"
 msgstr ""
 
-#: templates/cms/plugins/widgets/ckeditor.html:40
+#: templates/cms/plugins/widgets/ckeditor.html:45
 msgid "Standard Plugins"
 msgstr ""