Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:divio/django-cms into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	cms/locale/de/LC_MESSAGES/django.po
  • Loading branch information
Jonas Obrist committed Feb 23, 2011
2 parents f1ece58 + 4110f5a commit 03a3322
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion cms/locale/bn/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:33+0000\n"
"PO-Revision-Date: 2011-02-23 14:46+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/bn/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/cy/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:32+0000\n"
"PO-Revision-Date: 2011-02-23 14:45+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/cy/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/da/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:32+0000\n"
"PO-Revision-Date: 2011-02-23 14:45+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/da/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/es_AR/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/et/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/eu/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:33+0000\n"
"PO-Revision-Date: 2011-02-23 14:45+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/eu/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/he/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:32+0000\n"
"PO-Revision-Date: 2011-02-23 14:45+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/he/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/hu/LC_MESSAGES/django.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:20-0600\n"
"PO-Revision-Date: 2011-02-23 12:32+0000\n"
"PO-Revision-Date: 2011-02-23 14:45+0000\n"
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
Expand Down
2 changes: 1 addition & 1 deletion cms/locale/hu/LC_MESSAGES/djangojs.po
View file
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
"POT-Creation-Date: 2011-02-07 07:22-0600\n"
"PO-Revision-Date: 2011-02-23 12:31+0000\n"
"PO-Revision-Date: 2011-02-23 14:44+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
Expand Down

0 comments on commit 03a3322

Please sign in to comment.