Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/2.1.2' into develop

Conflicts:
	AUTHORS
	cms/locale/ar/LC_MESSAGES/django.mo
	cms/locale/ar/LC_MESSAGES/django.po
	cms/locale/ar/LC_MESSAGES/djangojs.mo
	cms/locale/ar/LC_MESSAGES/djangojs.po
	cms/locale/bg/LC_MESSAGES/django.mo
	cms/locale/bg/LC_MESSAGES/django.po
	cms/locale/bg/LC_MESSAGES/djangojs.mo
	cms/locale/bg/LC_MESSAGES/djangojs.po
	cms/locale/bn/LC_MESSAGES/django.mo
	cms/locale/bn/LC_MESSAGES/django.po
	cms/locale/bn/LC_MESSAGES/djangojs.mo
	cms/locale/bn/LC_MESSAGES/djangojs.po
	cms/locale/ca/LC_MESSAGES/django.mo
	cms/locale/ca/LC_MESSAGES/django.po
	cms/locale/ca/LC_MESSAGES/djangojs.mo
	cms/locale/ca/LC_MESSAGES/djangojs.po
	cms/locale/cs/LC_MESSAGES/django.mo
	cms/locale/cs/LC_MESSAGES/django.po
	cms/locale/cs/LC_MESSAGES/djangojs.mo
	cms/locale/cs/LC_MESSAGES/djangojs.po
	cms/locale/cy/LC_MESSAGES/django.mo
	cms/locale/cy/LC_MESSAGES/django.po
	cms/locale/cy/LC_MESSAGES/djangojs.mo
	cms/locale/cy/LC_MESSAGES/djangojs.po
	cms/locale/da/LC_MESSAGES/django.mo
	cms/locale/da/LC_MESSAGES/django.po
	cms/locale/da/LC_MESSAGES/djangojs.mo
	cms/locale/da/LC_MESSAGES/djangojs.po
	cms/locale/de/LC_MESSAGES/django.mo
	cms/locale/de/LC_MESSAGES/django.po
	cms/locale/de/LC_MESSAGES/djangojs.mo
	cms/locale/de/LC_MESSAGES/djangojs.po
	cms/locale/el/LC_MESSAGES/django.mo
	cms/locale/el/LC_MESSAGES/django.po
	cms/locale/el/LC_MESSAGES/djangojs.mo
	cms/locale/el/LC_MESSAGES/djangojs.po
	cms/locale/en/LC_MESSAGES/django.mo
	cms/locale/en/LC_MESSAGES/djangojs.mo
	cms/locale/es/LC_MESSAGES/django.mo
	cms/locale/es/LC_MESSAGES/django.po
	cms/locale/es/LC_MESSAGES/djangojs.mo
	cms/locale/es/LC_MESSAGES/djangojs.po
	cms/locale/es_AR/LC_MESSAGES/django.mo
	cms/locale/es_AR/LC_MESSAGES/django.po
	cms/locale/es_AR/LC_MESSAGES/djangojs.mo
	cms/locale/es_AR/LC_MESSAGES/djangojs.po
	cms/locale/et/LC_MESSAGES/django.mo
	cms/locale/et/LC_MESSAGES/django.po
	cms/locale/et/LC_MESSAGES/djangojs.mo
	cms/locale/et/LC_MESSAGES/djangojs.po
	cms/locale/eu/LC_MESSAGES/django.mo
	cms/locale/eu/LC_MESSAGES/django.po
	cms/locale/eu/LC_MESSAGES/djangojs.mo
	cms/locale/eu/LC_MESSAGES/djangojs.po
	cms/locale/fa/LC_MESSAGES/django.mo
	cms/locale/fa/LC_MESSAGES/django.po
	cms/locale/fa/LC_MESSAGES/djangojs.mo
	cms/locale/fa/LC_MESSAGES/djangojs.po
	cms/locale/fi/LC_MESSAGES/django.mo
	cms/locale/fi/LC_MESSAGES/django.po
	cms/locale/fi/LC_MESSAGES/djangojs.mo
	cms/locale/fi/LC_MESSAGES/djangojs.po
	cms/locale/fr/LC_MESSAGES/django.mo
	cms/locale/fr/LC_MESSAGES/django.po
	cms/locale/fr/LC_MESSAGES/djangojs.mo
	cms/locale/fr/LC_MESSAGES/djangojs.po
	cms/locale/gu/LC_MESSAGES/django.mo
	cms/locale/gu/LC_MESSAGES/django.po
	cms/locale/gu/LC_MESSAGES/djangojs.mo
	cms/locale/gu/LC_MESSAGES/djangojs.po
	cms/locale/he/LC_MESSAGES/django.mo
	cms/locale/he/LC_MESSAGES/django.po
	cms/locale/he/LC_MESSAGES/djangojs.mo
	cms/locale/he/LC_MESSAGES/djangojs.po
	cms/locale/hi/LC_MESSAGES/django.mo
	cms/locale/hi/LC_MESSAGES/django.po
	cms/locale/hi/LC_MESSAGES/djangojs.mo
	cms/locale/hi/LC_MESSAGES/djangojs.po
	cms/locale/hu/LC_MESSAGES/django.mo
	cms/locale/hu/LC_MESSAGES/django.po
	cms/locale/hu/LC_MESSAGES/djangojs.mo
	cms/locale/hu/LC_MESSAGES/djangojs.po
	cms/locale/it/LC_MESSAGES/django.mo
	cms/locale/it/LC_MESSAGES/django.po
	cms/locale/it/LC_MESSAGES/djangojs.mo
	cms/locale/it/LC_MESSAGES/djangojs.po
	cms/locale/ja/LC_MESSAGES/django.mo
	cms/locale/ja/LC_MESSAGES/django.po
	cms/locale/ja/LC_MESSAGES/djangojs.mo
	cms/locale/ja/LC_MESSAGES/djangojs.po
	cms/locale/nl/LC_MESSAGES/django.mo
	cms/locale/nl/LC_MESSAGES/django.po
	cms/locale/nl/LC_MESSAGES/djangojs.mo
	cms/locale/nl/LC_MESSAGES/djangojs.po
	cms/locale/no/LC_MESSAGES/django.mo
	cms/locale/no/LC_MESSAGES/django.po
	cms/locale/no/LC_MESSAGES/djangojs.mo
	cms/locale/no/LC_MESSAGES/djangojs.po
	cms/locale/pl/LC_MESSAGES/django.mo
	cms/locale/pl/LC_MESSAGES/django.po
	cms/locale/pl/LC_MESSAGES/djangojs.mo
	cms/locale/pl/LC_MESSAGES/djangojs.po
	cms/locale/pt/LC_MESSAGES/django.mo
	cms/locale/pt/LC_MESSAGES/django.po
	cms/locale/pt/LC_MESSAGES/djangojs.mo
	cms/locale/pt/LC_MESSAGES/djangojs.po
	cms/locale/pt_BR/LC_MESSAGES/django.mo
	cms/locale/pt_BR/LC_MESSAGES/django.po
	cms/locale/pt_BR/LC_MESSAGES/djangojs.mo
	cms/locale/pt_BR/LC_MESSAGES/djangojs.po
	cms/locale/ru/LC_MESSAGES/django.mo
	cms/locale/ru/LC_MESSAGES/django.po
	cms/locale/ru/LC_MESSAGES/djangojs.mo
	cms/locale/ru/LC_MESSAGES/djangojs.po
	cms/locale/sk/LC_MESSAGES/django.mo
	cms/locale/sk/LC_MESSAGES/django.po
	cms/locale/sk/LC_MESSAGES/djangojs.mo
	cms/locale/sk/LC_MESSAGES/djangojs.po
	cms/locale/sv/LC_MESSAGES/django.mo
	cms/locale/sv/LC_MESSAGES/django.po
	cms/locale/sv/LC_MESSAGES/djangojs.mo
	cms/locale/sv/LC_MESSAGES/djangojs.po
	cms/locale/tr/LC_MESSAGES/django.mo
	cms/locale/tr/LC_MESSAGES/django.po
	cms/locale/tr/LC_MESSAGES/djangojs.mo
	cms/locale/tr/LC_MESSAGES/djangojs.po
	cms/locale/zh_CN/LC_MESSAGES/django.mo
	cms/locale/zh_CN/LC_MESSAGES/django.po
	cms/locale/zh_CN/LC_MESSAGES/djangojs.mo
	cms/locale/zh_CN/LC_MESSAGES/djangojs.po
	cms/locale/zh_TW/LC_MESSAGES/django.mo
	cms/locale/zh_TW/LC_MESSAGES/django.po
	cms/locale/zh_TW/LC_MESSAGES/djangojs.mo
	cms/locale/zh_TW/LC_MESSAGES/djangojs.po
  • Loading branch information...
commit 2b80bf59539d359d85cb6081350ca75c5db0126c 2 parents c6cac17 + 5dddfa2
@ojii ojii authored
Showing with 5,431 additions and 236 deletions.
  1. +142 −138 AUTHORS
  2. +10 −1 CHANGELOG.txt
  3. +1 −1  cms/__init__.py
  4. +130 −0 cms/locale/ar/LC_MESSAGES/django.po
  5. +10 −0 cms/locale/ar/LC_MESSAGES/djangojs.po
  6. +208 −0 cms/locale/bg/LC_MESSAGES/django.po
  7. +19 −0 cms/locale/bg/LC_MESSAGES/djangojs.po
  8. +82 −0 cms/locale/bn/LC_MESSAGES/django.po
  9. +10 −0 cms/locale/bn/LC_MESSAGES/djangojs.po
  10. +158 −0 cms/locale/ca/LC_MESSAGES/django.po
  11. +13 −3 cms/locale/ca/LC_MESSAGES/djangojs.po
  12. +115 −0 cms/locale/cs/LC_MESSAGES/django.po
  13. +7 −1 cms/locale/cs/LC_MESSAGES/djangojs.po
  14. +82 −0 cms/locale/cy/LC_MESSAGES/django.po
  15. +10 −0 cms/locale/cy/LC_MESSAGES/djangojs.po
  16. +82 −0 cms/locale/da/LC_MESSAGES/django.po
  17. +10 −0 cms/locale/da/LC_MESSAGES/djangojs.po
  18. +208 −2 cms/locale/de/LC_MESSAGES/django.po
  19. +25 −0 cms/locale/de/LC_MESSAGES/djangojs.po
  20. +111 −0 cms/locale/el/LC_MESSAGES/django.po
  21. +19 −0 cms/locale/el/LC_MESSAGES/djangojs.po
  22. +242 −0 cms/locale/es/LC_MESSAGES/django.po
  23. +19 −0 cms/locale/es/LC_MESSAGES/djangojs.po
  24. +121 −0 cms/locale/es_AR/LC_MESSAGES/django.po
  25. +10 −0 cms/locale/es_AR/LC_MESSAGES/djangojs.po
  26. +94 −0 cms/locale/et/LC_MESSAGES/django.po
  27. +10 −0 cms/locale/et/LC_MESSAGES/djangojs.po
  28. +82 −0 cms/locale/eu/LC_MESSAGES/django.po
  29. +10 −0 cms/locale/eu/LC_MESSAGES/djangojs.po
  30. +159 −18 cms/locale/fa/LC_MESSAGES/django.po
  31. +7 −1 cms/locale/fa/LC_MESSAGES/djangojs.po
  32. +142 −0 cms/locale/fi/LC_MESSAGES/django.po
  33. +13 −0 cms/locale/fi/LC_MESSAGES/djangojs.po
  34. +193 −0 cms/locale/fr/LC_MESSAGES/django.po
  35. +13 −0 cms/locale/fr/LC_MESSAGES/djangojs.po
  36. +82 −0 cms/locale/gu/LC_MESSAGES/django.po
  37. +10 −0 cms/locale/gu/LC_MESSAGES/djangojs.po
  38. +82 −0 cms/locale/he/LC_MESSAGES/django.po
  39. +10 −0 cms/locale/he/LC_MESSAGES/djangojs.po
  40. +136 −2 cms/locale/hi/LC_MESSAGES/django.po
  41. +13 −3 cms/locale/hi/LC_MESSAGES/djangojs.po
  42. +82 −0 cms/locale/hu/LC_MESSAGES/django.po
  43. +10 −0 cms/locale/hu/LC_MESSAGES/djangojs.po
  44. +248 −26 cms/locale/it/LC_MESSAGES/django.po
  45. +19 −0 cms/locale/it/LC_MESSAGES/djangojs.po
  46. +99 −0 cms/locale/ja/LC_MESSAGES/django.po
  47. +7 −1 cms/locale/ja/LC_MESSAGES/djangojs.po
  48. +191 −0 cms/locale/nl/LC_MESSAGES/django.po
  49. +19 −0 cms/locale/nl/LC_MESSAGES/djangojs.po
  50. +144 −0 cms/locale/no/LC_MESSAGES/django.po
  51. +10 −2 cms/locale/no/LC_MESSAGES/djangojs.po
  52. +189 −22 cms/locale/pl/LC_MESSAGES/django.po
  53. +13 −0 cms/locale/pl/LC_MESSAGES/djangojs.po
  54. +166 −0 cms/locale/pt/LC_MESSAGES/django.po
  55. +19 −0 cms/locale/pt/LC_MESSAGES/djangojs.po
  56. +175 −0 cms/locale/pt_BR/LC_MESSAGES/django.po
  57. +13 −3 cms/locale/pt_BR/LC_MESSAGES/djangojs.po
  58. +278 −5 cms/locale/ru/LC_MESSAGES/django.po
  59. +13 −0 cms/locale/ru/LC_MESSAGES/djangojs.po
  60. +150 −0 cms/locale/sk/LC_MESSAGES/django.po
  61. +19 −0 cms/locale/sk/LC_MESSAGES/djangojs.po
  62. +208 −0 cms/locale/sv/LC_MESSAGES/django.po
  63. +10 −2 cms/locale/sv/LC_MESSAGES/djangojs.po
  64. +109 −0 cms/locale/tr/LC_MESSAGES/django.po
  65. +19 −0 cms/locale/tr/LC_MESSAGES/djangojs.po
  66. +214 −5 cms/locale/zh_CN/LC_MESSAGES/django.po
  67. +15 −0 cms/locale/zh_CN/LC_MESSAGES/djangojs.po
  68. +82 −0 cms/locale/zh_TW/LC_MESSAGES/django.po
  69. +10 −0 cms/locale/zh_TW/LC_MESSAGES/djangojs.po
View
280 AUTHORS
@@ -1,156 +1,160 @@
-In no particular order:
+Current or previous core committers:
+* Chris Glass
+* Eric Robitaille
+* Jonas Obrist
* Patrick Lauber
* Peter Ciciman
-* Jonas Obrist
* Stefan Foulis
-* Chris Glass
-* Eric Robitaille
-* Simon Meers
-* brightwhitefox
+* Øyvind Saltvik
+
+Contributors (in alphabetical order):
+
+* A. Bram Neijt
+* aaloy
+* Aaron Renner
+* aball
+* Adi Sieker
+* Alberto Paro
+* Alessandro Ronchi
+* Angelo Dini
+* angular_circle
+* Antoni Aloy López
+* Arne Gellhaus
+* Artem Skoretskiy
+* Arthur Debert
+* Batiste Bieler
+* behrooz
* Behrooz Nobakht
-* Martin Bommeli
-* Jason Zylks
-* philomat
-* Jannis Leidel
-* Ekrem Seren
+* Benjamin Wohlwend
+* Bernd Zeimetz
+* beshrkayali
+* Bob Karreman
+* brightwhitefox
+* Chanita Siridechkun
+* Charpentier Johan
+* Cheng-Chia Tseng
* Chris Adams
-* martinkosir
-* Manolis Stamatogiannakis
-* Ulrich Petri
-* Luke Plant
-* Evandro Miquelito
-* Marco Rimoldi
-* aaloy
-* GaretJax
+* Chris Hughes
+* Christof Hagedorn
+* daniele
+* DaNmarner
+* Darryl Woods
* David Jean Louis
-* Pedro Gracia
-* limpbrains :P
-* yohanboniface
+* David Thompson
+* Diógenes Augusto Fernandes Hermínio
* dstufft
-* Samuel Lüscher
-* Philipp Bosch
-* timesong
-* kunitoki
+* DZ
+* eged
+* Egor V. Nazarkin
+* Ekrem Seren
+* Evandro Miquelito
+* f4nt
+* fcurella
+* Filip Kazimierczak
+* GaretJax
+* George Marshall
+* Gerard Świderski
+* homebrew79
+* hysia
+* Ian Lewis
+* indexofire
+* Ionel Maries Cristian
+* Ivan Vershigora
+* izi
+* Jameel Al-Aziz
+* James Richards
+* Jannis Leidel
+* Janusz Harkot
+* Jason Davies
+* Jason Jenkins
+* Jason Zylks
+* Javi Nievas
* Johannes Bornhold
-* Alberto Paro
-* Yann Malet
-* wildermesser
-* Thomas Parslow
-* Maik Lustenberger
-* Arne Gellhaus
-* pigletto
+* John-Scott Atlakson
+* Jonathan Stoppani
+* jordanjambazov
+* kar1m
* kochin
-* MW
+* Krzysztof Bandurski
+* kunitoki
+* Lars Smit
* Lars van de Kerkhof
-* Jonathan Stoppani
-* Chanita Siridechkun
-* Benjamin Wohlwend
-* Aaron Renner
-* spookylukey
-* hysia
-* aball
-* Yann Malet
+* limpbrains :P
+* Lucas Vogelsang
+* Lucio Asnaghi
+* Luke Plant
+* m000
+* Maik Lustenberger
+* Manolis Stamatogiannakis
+* Manuel Schmidt
+* Marco Rimoldi
+* Mark Rogers
+* Martin Bommeli
+* Martin Kosír
+* martinkosir
+* mathijs
+* Maxim Bodyansky
+* Maxime Haineault
+* mbouchar
+* mcosta
+* meers
+* MerLex
* Mokys
-* George Marshall
-* Diógenes Augusto Fernandes Hermínio
-* zundoya
-* yedpodtrzitko
-* shed
-* izi
-* behrooz
-* angular_circle
-* Robert Pogorzelski
-* Pigletto
+* mrlundis
+* MW
+* neoprolog
+* Orne Brocaar
+* padelt
+* Patrick Toal
+* Paul van der Linden
+* pbgc
+* Pedro Gracia
+* Pete Loggie
+* Peter-Paul van Gemerden
* Petteri
-* Mark Rogers
-* Jason Jenkins
-* Антон Евжаков
-* Øyvind Saltvik
-* wid
-* wangJunjie
+* Philipp Bosch
+* philomat
* phuihock
-* pbgc
-* padelt
-* neoprolog
-* mcosta
-* mathijs
-* m000
-* indexofire
-* fcurella
-* f4nt
-* beshrkayali
-* Yosuke Ikeda
-* Steve Steiner
-* Shinya Okano
+* Pigletto
+* pigletto
+* Piotr Kilczuk
+* poweredbypenguins
+* Remco Wendt
+* Restless Being
+* Robert Pogorzelski
+* Rodolfo Carvalho
+* rtpm
+* Samuel Lüscher
+* sealibora
+* Sean Bleier
* Seyhun Akyurek
-* Peter-Paul van Gemerden
-* Martin Kosír
-* Lucio Asnaghi
-* James Richards
-* Ian Lewis
-* DaNmarner
-* DZ
-* Cheng-Chia Tseng
-* Charpentier Johan
-* Adi Sieker
-* A. Bram Neijt
-* tiret
-* ssteinerX
+* Shatalov Vadim
+* shed
+* Shinya Okano
+* Simon Hedberg
+* Simon Meers
* sleytr
-* sealibora
-* rtpm
-* mrlundis
-* meers
-* mbouchar
-* jordanjambazov
-* eged
-* daniele
-* Yuri van der Meer
-* Wayne Moore
-* Tanel Külaots
+* spookylukey
+* ssteinerX
* Stavros Korokithakis
-* Shatalov Vadim
-* Sean Bleier
-* Rodolfo Carvalho
-* Restless Being
-* Remco Wendt
-* Patrick Toal
-* Orne Brocaar
-* MerLex
-* Maxime Haineault
-* Maxim Bodyansky
-* Lucas Vogelsang
-* Lars Smit
-* John-Scott Atlakson
-* Jason Davies
-* Janusz Harkot
-* Ivan Vershigora
-* Gerard Świderski
-* Filip Kazimierczak
-* Egor V. Nazarkin
-* David Thompson
-* Darryl Woods
-* Chris Hughes
-* Bernd Zeimetz
-* Arthur Debert
-* Artem Skoretskiy
-* Alessandro Ronchi
-* Batiste Bieler
-* Antoni Aloy López
-* poweredbypenguins
-* homebrew79
-* Christof Hagedorn
-* Bob Karreman
-* Tino de Bruijn
-* Piotr Kilczuk
-* Pete Loggie
* Steve R. Jones
-* Paul van der Linden
-* Ionel Maries Cristian
-* Simon Hedberg
-* Jameel Al-Aziz
-* Javi Nievas
-* tomviner
-* Mitar
-* Gleb Chipiga
+* Steve Steiner
+* Tanel Külaots
+* Thomas Parslow
+* timesong
+* Tino de Bruijn
+* tiret
+* Ulrich Petri
+* wangJunjie
+* Wayne Moore
+* wid
+* wildermesser
+* Yann Malet
+* Yann Malet
+* yedpodtrzitko
+* yohanboniface
+* Yosuke Ikeda
+* Yuri van der Meer
+* zundoya
+* Антон Евжаков
View
11 CHANGELOG.txt
@@ -12,7 +12,7 @@
- testsuite working again
- changelog file added
-==== 2.1.0 (2010-XX-XX) ====
+==== 2.1.0 (2011-01-26) ====
- language namespaces for apphooks (reverse("de:myview"), reverse("en:myview"))
- video plugin switch to http://github.com/FlashJunior/OSFlashVideoPlayer
@@ -35,3 +35,12 @@
- templatetags refactored: see cms/docs/templatetags.txt for new signatures.
- placeholder has new option: or and a endpalceholder templatetag
+==== 2.1.1 (2011-02-09) ====
+
+- Fixed CMS AJAX requests not being CSRF protected, thus not working in Django 1.2.5
+- Fixed toolbar CSS issues in Chrome/Firefox
+
+==== 2.1.2 (2011-02-16) ====
+
+- Fixed issues with the CSRF fix from 2.1.1.
+- Updated translation files from transifex.
View
2  cms/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-VERSION = (2, 1, 1, 'final')
+VERSION = (2, 1, 2, 'final')
if VERSION[-1] != "final": # pragma: no cover
__version__ = '.'.join(map(str, VERSION))
else: # pragma: no cover
View
130 cms/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:39+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:12+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+<<<<<<< HEAD
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+>>>>>>> hotfix/2.1.2
#: plugin_base.py:100
msgid "Advanced options"
@@ -114,8 +124,17 @@ msgid "user"
msgstr "مستخدم"
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
msgstr "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+msgstr ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:218
msgid "Add page permission also requires edit page permission."
@@ -150,8 +169,17 @@ msgid "Notify user"
msgstr "أعلم المستخدم"
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
msgstr "بعث رسالة تنبيهية للمسخدم حول تغيير اسم المستخدم أو كلمة المرور. يتطب عنوان البريد الإلكتروني للمستخدم."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+msgstr ""
+"بعث رسالة تنبيهية للمسخدم حول تغيير اسم المستخدم أو كلمة المرور. يتطب "
+"عنوان البريد الإلكتروني للمستخدم."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:316
msgid "New password"
@@ -166,11 +194,23 @@ msgid "Email notification requires valid email address."
msgstr "التنبيه بالبريد الإلكتروني يتطلب بريد إلكتروني صحيح"
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr "حقوق إضافة صفحات يتطلب حقوق تغيير الصفحات أولاً!"
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr "حقوق إضافة صفحات يتطلب حقوق تغيير الصفحات أولاً!"
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+>>>>>>> hotfix/2.1.2
msgstr "حقوق إضافة مستخدمين جدد يتطلب حقوق تغيير مستخدمين أولاً!"
#: admin/forms.py:343
@@ -187,7 +227,13 @@ msgstr "إعدادات إفتراضية"
#: admin/pageadmin.py:137
msgid "Note: This page reloads if you change the selection. Save it first."
+<<<<<<< HEAD
msgstr "ملاحظة: هذه الصفحة ستقوم بإعادة التحميل عند تغيير المحدد. قم بالحفظ أولاً."
+=======
+msgstr ""
+"ملاحظة: هذه الصفحة ستقوم بإعادة التحميل عند تغيير المحدد. قم بالحفظ "
+"أولاً."
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:143
msgid "Advanced Settings"
@@ -269,8 +315,17 @@ msgstr "تم نسخ إضافات اللغة %(language)s الى %(placeholder)s"
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
msgstr "تم تعديل الإضافة %(plugin_name)s في %(position)s الموجودة في %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+msgstr ""
+"تم تعديل الإضافة %(plugin_name)s في %(position)s الموجودة في "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:1318
msgid "Plugins where moved"
@@ -278,8 +333,17 @@ msgstr "تم نقل الإضافات"
#: admin/pageadmin.py:1345 admin/placeholderadmin.py:216
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was deleted."
msgstr "تم حذف الإضافة %(plugin_name)s الموجودة في %(placeholder)s في المكان %(position)s."
+=======
+msgid ""
+"%(plugin_name)s plugin at position %(position)s in %(placeholder)s was "
+"deleted."
+msgstr ""
+"تم حذف الإضافة %(plugin_name)s الموجودة في %(placeholder)s في المكان "
+"%(position)s."
+>>>>>>> hotfix/2.1.2
#: admin/permissionadmin.py:114 models/permissionmodels.py:75
msgid "Page permissions"
@@ -586,8 +650,17 @@ msgid "changed by"
msgstr "مغير من قبل"
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
msgstr "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+msgstr ""
+"When the page should go live. Status must be \"Published\" for page to "
+"go live."
+>>>>>>> hotfix/2.1.2
#: models/pagemodel.py:65
msgid "When to expire the page. Leave empty to never expire."
@@ -598,8 +671,17 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr "لن يتم عرض الآباء في التصفح"
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
msgstr "An unique identifier that is used with the page_url templatetag for linking to this page"
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+msgstr ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+>>>>>>> hotfix/2.1.2
#: models/pagemodel.py:69
msgid "attached menu"
@@ -841,8 +923,17 @@ msgid "Language or Page must be filled out"
msgstr "يجب أن يتم تعبئة اللغة أو الصفحة"
#: plugins/inherit/models.py:10
+<<<<<<< HEAD
msgid "Choose a page to include its plugins into this placeholder, empty will choose current page"
msgstr "قم باختيار صفحة ليتم وضع إضافاتها في مكان محدد، سيتم إختيار الصفحة الحالية عند عدم التحديد."
+=======
+msgid ""
+"Choose a page to include its plugins into this placeholder, empty will "
+"choose current page"
+msgstr ""
+"قم باختيار صفحة ليتم وضع إضافاتها في مكان محدد، سيتم إختيار الصفحة "
+"الحالية عند عدم التحديد."
+>>>>>>> hotfix/2.1.2
#: plugins/inherit/models.py:11
msgid "Optional: the language of the plugins you want"
@@ -933,7 +1024,13 @@ msgid "HTML"
msgstr "HTML"
#: plugins/snippet/models.py:15
+<<<<<<< HEAD
msgid "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
+=======
+msgid ""
+"Enter a template (i.e. \"snippets/plugin_xy.html\") which will be "
+"rendered. "
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/snippet/models.py:25
@@ -1067,8 +1164,17 @@ msgid "movie url"
msgstr "عنوان url لملف الفيديو"
#: plugins/video/models.py:10
+<<<<<<< HEAD
msgid "vimeo or youtube video url. Example: http://www.youtube.com/watch?v=YFa59lK-kpo"
msgstr "عنوان url لفيديو على فيميو أو يوتيوب. مثال http://www.youtube.com/watch?v=YFa59lK-kpo"
+=======
+msgid ""
+"vimeo or youtube video url. Example: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+msgstr ""
+"عنوان url لفيديو على فيميو أو يوتيوب. مثال "
+"http://www.youtube.com/watch?v=YFa59lK-kpo"
+>>>>>>> hotfix/2.1.2
#: plugins/video/models.py:11
msgid "preview image file"
@@ -1130,8 +1236,17 @@ msgid "button highlight color"
msgstr "لون التحديد للزر"
#: plugins/video/templates/cms/plugins/video.html:3
+<<<<<<< HEAD
msgid "Missing flash plugin. Download <a href=\"http://adobe.com/flashplayer\">here</a>"
msgstr "لم يتم العثور على مشغل فلاش. حمل من <a href=\"http://adobe.com/flashplayer\">هنا</a>"
+=======
+msgid ""
+"Missing flash plugin. Download <a "
+"href=\"http://adobe.com/flashplayer\">here</a>"
+msgstr ""
+"لم يتم العثور على مشغل فلاش. حمل من <a "
+"href=\"http://adobe.com/flashplayer\">هنا</a>"
+>>>>>>> hotfix/2.1.2
#: templates/admin/page_submit_line.html:3
#: templates/admin/cms/page/change_form.html:273
@@ -1160,7 +1275,13 @@ msgstr "إحفظ وأكمل التعديل"
#: templates/admin/cms/mail/approvement_required.html:5
#: templates/admin/cms/mail/approvement_required.txt:5
#, python-format
+<<<<<<< HEAD
msgid "Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by you."
+=======
+msgid ""
+"Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by "
+"you."
+>>>>>>> hotfix/2.1.2
msgstr "تحتاج الصفة <a href=\"%(admin_url)s\">%(page)s</a> الموافقة منك."
#: templates/admin/cms/mail/approvement_required.html:8
@@ -1273,8 +1394,17 @@ msgstr "حالة الصفحة"
#: templates/admin/cms/page/change_form.html:183
#, python-format
+<<<<<<< HEAD
msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
msgstr "يجب إدارة الصفحة من مستخدم بمستوى %(moderation_level)s، أرسل رسالة إلى المدير."
+=======
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a "
+"message for moderator."
+msgstr ""
+"يجب إدارة الصفحة من مستخدم بمستوى %(moderation_level)s، أرسل رسالة إلى"
+" المدير."
+>>>>>>> hotfix/2.1.2
#: templates/admin/cms/page/change_form.html:185
msgid "Request approvemet"
View
10 cms/locale/ar/LC_MESSAGES/djangojs.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:37+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +22,13 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#: media/cms/js/change_form.js:31
+<<<<<<< HEAD
msgid "Are you sure you want to change the %(field_name)s without saving the page first?"
+=======
+msgid ""
+"Are you sure you want to change the %(field_name)s without saving the "
+"page first?"
+>>>>>>> hotfix/2.1.2
msgstr "هل أنت متأكد من تغيير الحقل %(field_name)s دون حفظ الصفحة أولاً؟"
#: media/cms/js/change_form.js:69
View
208 cms/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:38+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+<<<<<<< HEAD
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+>>>>>>> hotfix/2.1.2
#: plugin_base.py:100
msgid "Advanced options"
@@ -82,7 +92,13 @@ msgstr "Напиши адрес"
#: admin/forms.py:136
msgid "Keep this field empty if standard path should be used."
+<<<<<<< HEAD
msgstr "Оставете това поле празно, ако трябва да бъде използван стандартен път."
+=======
+msgstr ""
+"Оставете това поле празно, ако трябва да бъде използван стандартен "
+"път."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:142
msgid "Redirect"
@@ -114,8 +130,17 @@ msgid "user"
msgstr "потребител"
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
msgstr "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+msgstr ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:218
msgid "Add page permission also requires edit page permission."
@@ -150,8 +175,17 @@ msgid "Notify user"
msgstr "Предопреди потребителя"
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
msgstr "Изпращането на имейл предупреждение на потребителя изисква неговото добавяне."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+msgstr ""
+"Изпращането на имейл предупреждение на потребителя изисква неговото "
+"добавяне."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:316
msgid "New password"
@@ -166,12 +200,27 @@ msgid "Email notification requires valid email address."
msgstr "И-мейл потвърждението изисква валиден имейл адрес."
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr "Правото за добавяне изисква и право за редактиране."
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
msgstr "Правото за добавяне на потребители изисква и правото за тяхното редактиране."
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr "Правото за добавяне изисква и право за редактиране."
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+msgstr ""
+"Правото за добавяне на потребители изисква и правото за тяхното "
+"редактиране."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:343
msgid "To add permissions you also need to edit them!"
@@ -269,8 +318,17 @@ msgstr ""
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
msgstr "%(plugin_name)s плъгин беше редактиран в позиция %(position)s на %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+msgstr ""
+"%(plugin_name)s плъгин беше редактиран в позиция %(position)s на "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:1318
msgid "Plugins where moved"
@@ -278,8 +336,17 @@ msgstr "Плъгините бяха преместени"
#: admin/pageadmin.py:1345 admin/placeholderadmin.py:216
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was deleted."
msgstr "%(plugin_name)s плъгин в позиция %(position)s на %(placeholder)s беше изтрит."
+=======
+msgid ""
+"%(plugin_name)s plugin at position %(position)s in %(placeholder)s was "
+"deleted."
+msgstr ""
+"%(plugin_name)s плъгин в позиция %(position)s на %(placeholder)s беше "
+"изтрит."
+>>>>>>> hotfix/2.1.2
#: admin/permissionadmin.py:114 models/permissionmodels.py:75
msgid "Page permissions"
@@ -586,7 +653,13 @@ msgid "changed by"
msgstr "променена от"
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+>>>>>>> hotfix/2.1.2
msgstr "За да се вижда страницата статуса трябва да е \"Публикувана\""
#: models/pagemodel.py:65
@@ -598,8 +671,17 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr "Всички прародители няма да бъдат показвани в навигацията"
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
msgstr "Уникален идентификатор, използван с page_url темплейт тага за създаване на връзка до тази страница."
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+msgstr ""
+"Уникален идентификатор, използван с page_url темплейт тага за "
+"създаване на връзка до тази страница."
+>>>>>>> hotfix/2.1.2
#: models/pagemodel.py:69
msgid "attached menu"
@@ -802,7 +884,13 @@ msgstr "ширина"
#: plugins/googlemap/models.py:19
msgid "Use latitude & longitude to fine tune the map possiton."
+<<<<<<< HEAD
msgstr "Използвайте latitude & longitude за да определите позицията на картата."
+=======
+msgstr ""
+"Използвайте latitude & longitude за да определите позицията на "
+"картата."
+>>>>>>> hotfix/2.1.2
#: plugins/googlemap/models.py:20
msgid "longitude"
@@ -933,7 +1021,13 @@ msgid "HTML"
msgstr "HTML"
#: plugins/snippet/models.py:15
+<<<<<<< HEAD
msgid "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
+=======
+msgid ""
+"Enter a template (i.e. \"snippets/plugin_xy.html\") which will be "
+"rendered. "
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/snippet/models.py:25
@@ -1036,7 +1130,13 @@ msgstr "подсказка на връзката"
#: plugins/twitter/models.py:9
msgid "If given, the hint is displayed as link to your Twitter profile."
+<<<<<<< HEAD
msgstr "Ако бъде предоставено, подсказката ще бъде показана като линк до Вашия Twitter профил."
+=======
+msgstr ""
+"Ако бъде предоставено, подсказката ще бъде показана като линк до Вашия"
+" Twitter профил."
+>>>>>>> hotfix/2.1.2
#: plugins/twitter/models.py:16
msgid "query"
@@ -1067,7 +1167,13 @@ msgid "movie url"
msgstr ""
#: plugins/video/models.py:10
+<<<<<<< HEAD
msgid "vimeo or youtube video url. Example: http://www.youtube.com/watch?v=YFa59lK-kpo"
+=======
+msgid ""
+"vimeo or youtube video url. Example: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/video/models.py:11
@@ -1130,7 +1236,13 @@ msgid "button highlight color"
msgstr ""
#: plugins/video/templates/cms/plugins/video.html:3
+<<<<<<< HEAD
msgid "Missing flash plugin. Download <a href=\"http://adobe.com/flashplayer\">here</a>"
+=======
+msgid ""
+"Missing flash plugin. Download <a "
+"href=\"http://adobe.com/flashplayer\">here</a>"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/page_submit_line.html:3
@@ -1160,8 +1272,17 @@ msgstr "Запази и продължи да редактираш"
#: templates/admin/cms/mail/approvement_required.html:5
#: templates/admin/cms/mail/approvement_required.txt:5
#, python-format
+<<<<<<< HEAD
msgid "Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by you."
msgstr "Страницата <a href=\"%(admin_url)s\">%(page)s</a> може да изисква потвърждение от Вас."
+=======
+msgid ""
+"Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by "
+"you."
+msgstr ""
+"Страницата <a href=\"%(admin_url)s\">%(page)s</a> може да изисква "
+"потвърждение от Вас."
+>>>>>>> hotfix/2.1.2
#: templates/admin/cms/mail/approvement_required.html:8
#: templates/admin/cms/mail/approvement_required.txt:7
@@ -1269,7 +1390,13 @@ msgstr "Статуси на страниците"
#: templates/admin/cms/page/change_form.html:183
#, python-format
+<<<<<<< HEAD
msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
+=======
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a "
+"message for moderator."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/cms/page/change_form.html:185
@@ -1581,11 +1708,19 @@ msgstr "Потребителско име"
#: templates/cms/toolbar/toolbar.html:158
msgid "login"
msgstr "влез"
+<<<<<<< HEAD
#: templates/cms/toolbar/toolbar.html:175
msgid "Request Approval"
msgstr ""
+=======
+
+#: templates/cms/toolbar/toolbar.html:175
+msgid "Request Approval"
+msgstr ""
+
+>>>>>>> hotfix/2.1.2
#: templates/cms/toolbar/toolbar.html:184
msgid "Template"
msgstr ""
@@ -1710,6 +1845,78 @@ msgstr ""
#: test/run_tests.py:158 test/project/settings.py:137
msgid "two columns"
msgstr ""
+<<<<<<< HEAD
+
+#: test/run_tests.py:159 test/project/settings.py:138
+msgid "three columns"
+msgstr ""
+
+#: test/run_tests.py:160 test/project/settings.py:139
+msgid "navigation examples"
+msgstr ""
+
+#: test/run_tests.py:167 test/project/settings.py:148
+msgid "sidebar column"
+msgstr ""
+
+#: test/run_tests.py:173 test/project/settings.py:154
+msgid "left column"
+msgstr ""
+
+#: test/run_tests.py:179 test/project/settings.py:160
+msgid "right column"
+msgstr ""
+
+#: test/apps/pluginapp/plugins/manytomany_rel/cms_plugins.py:13
+msgid "Articles"
+msgstr ""
+
+#: test/apps/sampleapp/cms_app.py:7
+msgid "Sample App"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:17
+msgid "sample root page"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:18
+msgid "sample settings page"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:19
+msgid "sample account page"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:20
+msgid "sample my profile page"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:32
+msgid "Static Menu"
+msgstr ""
+
+#: test/apps/sampleapp/menu.py:48
+msgid "Static Menu2"
+msgstr ""
+
+#: utils/moderator.py:83
+msgid "parent first"
+msgstr "първо родителите"
+
+#: utils/moderator.py:90
+msgid "approve"
+msgstr "потвърди"
+
+#: utils/moderator.py:251
+#, python-format
+msgid "CMS - Page %s requires approvement."
+msgstr "CMS - Страницата %s изисква одобряване."
+
+#: utils/permissions.py:206
+msgid "CMS - your user account was created."
+msgstr "CMS — Вашия потребителски профил беше създаден."
+
+=======
#: test/run_tests.py:159 test/project/settings.py:138
msgid "three columns"
@@ -1780,6 +1987,7 @@ msgstr "CMS - Страницата %s изисква одобряване."
msgid "CMS - your user account was created."
msgstr "CMS — Вашия потребителски профил беше създаден."
+>>>>>>> hotfix/2.1.2
#: utils/permissions.py:208
msgid "CMS - your user account was changed."
msgstr "CMS — Вашия потребителски профил беше променен."
View
19 cms/locale/bg/LC_MESSAGES/djangojs.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:37+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:10+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,8 +22,17 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: media/cms/js/change_form.js:31
+<<<<<<< HEAD
msgid "Are you sure you want to change the %(field_name)s without saving the page first?"
msgstr "Наистина ли искате да промените %(field_name)s и без запазване на страница първа?"
+=======
+msgid ""
+"Are you sure you want to change the %(field_name)s without saving the "
+"page first?"
+msgstr ""
+"Наистина ли искате да промените %(field_name)s и без запазване на "
+"страница първа?"
+>>>>>>> hotfix/2.1.2
#: media/cms/js/change_form.js:69
msgid ""
@@ -29,7 +42,13 @@ msgstr ""
#: media/cms/js/change_form.js:127
msgid "Are you sure you want to change tabs without saving the page first?"
+<<<<<<< HEAD
msgstr "Наистина ли искате да промените раздели, без да записвате страница първа?"
+=======
+msgstr ""
+"Наистина ли искате да промените раздели, без да записвате страница "
+"първа?"
+>>>>>>> hotfix/2.1.2
#: media/cms/js/plugin_editor.js:125
msgid "Are you sure you want to delete this plugin?"
View
82 cms/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 17:35+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:12+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+<<<<<<< HEAD
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+>>>>>>> hotfix/2.1.2
#: plugin_base.py:100
msgid "Advanced options"
@@ -114,7 +124,13 @@ msgid "user"
msgstr ""
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:218
@@ -150,7 +166,13 @@ msgid "Notify user"
msgstr ""
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:316
@@ -166,11 +188,23 @@ msgid "Email notification requires valid email address."
msgstr ""
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr ""
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr ""
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:343
@@ -269,7 +303,13 @@ msgstr ""
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/pageadmin.py:1318
@@ -586,7 +626,13 @@ msgid "changed by"
msgstr ""
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:65
@@ -598,7 +644,13 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr ""
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:69
@@ -933,7 +985,13 @@ msgid "HTML"
msgstr ""
#: plugins/snippet/models.py:15
+<<<<<<< HEAD
msgid "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
+=======
+msgid ""
+"Enter a template (i.e. \"snippets/plugin_xy.html\") which will be "
+"rendered. "
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/snippet/models.py:25
@@ -1067,7 +1125,13 @@ msgid "movie url"
msgstr ""
#: plugins/video/models.py:10
+<<<<<<< HEAD
msgid "vimeo or youtube video url. Example: http://www.youtube.com/watch?v=YFa59lK-kpo"
+=======
+msgid ""
+"vimeo or youtube video url. Example: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/video/models.py:11
@@ -1130,7 +1194,13 @@ msgid "button highlight color"
msgstr ""
#: plugins/video/templates/cms/plugins/video.html:3
+<<<<<<< HEAD
msgid "Missing flash plugin. Download <a href=\"http://adobe.com/flashplayer\">here</a>"
+=======
+msgid ""
+"Missing flash plugin. Download <a "
+"href=\"http://adobe.com/flashplayer\">here</a>"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/page_submit_line.html:3
@@ -1160,7 +1230,13 @@ msgstr ""
#: templates/admin/cms/mail/approvement_required.html:5
#: templates/admin/cms/mail/approvement_required.txt:5
#, python-format
+<<<<<<< HEAD
msgid "Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by you."
+=======
+msgid ""
+"Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by "
+"you."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/cms/mail/approvement_required.html:8
@@ -1269,7 +1345,13 @@ msgstr ""
#: templates/admin/cms/page/change_form.html:183
#, python-format
+<<<<<<< HEAD
msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
+=======
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a "
+"message for moderator."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/cms/page/change_form.html:185
View
10 cms/locale/bn/LC_MESSAGES/djangojs.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 17:34+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +22,13 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: media/cms/js/change_form.js:31
+<<<<<<< HEAD
msgid "Are you sure you want to change the %(field_name)s without saving the page first?"
+=======
+msgid ""
+"Are you sure you want to change the %(field_name)s without saving the "
+"page first?"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: media/cms/js/change_form.js:69
View
158 cms/locale/ca/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:38+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,6 +20,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+<<<<<<< HEAD
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+>>>>>>> hotfix/2.1.2
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
@@ -66,7 +74,13 @@ msgstr "Títol de la pàgina"
#: admin/forms.py:131
msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
+<<<<<<< HEAD
msgstr "Sobreescriu el que es mostra a la part superior del navegador o en els seus favorits"
+=======
+msgstr ""
+"Sobreescriu el que es mostra a la part superior del navegador o en els"
+" seus favorits"
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:132
msgid "Application"
@@ -98,7 +112,13 @@ msgstr "Una descripció de la pàgina a vegades utilitzada pels motors de cerca.
#: admin/forms.py:147
msgid "A list of comma seperated keywords sometimes used by search engines."
+<<<<<<< HEAD
msgstr "Una llista de paraules clau separades per comes a vegades utilitzada pels motors de cerca."
+=======
+msgstr ""
+"Una llista de paraules clau separades per comes a vegades utilitzada "
+"pels motors de cerca."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:163
msgid "A page with this reverse URL id exists already."
@@ -114,8 +134,18 @@ msgid "user"
msgstr "usuari"
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
msgstr "Afegir el permís pàgina requereix també l'accés als fills, o descendents, en cas contrari la pàgina afegida no podria ser modificada pel seu creador."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+msgstr ""
+"Afegir el permís pàgina requereix també l'accés als fills, o "
+"descendents, en cas contrari la pàgina afegida no podria ser "
+"modificada pel seu creador."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:218
msgid "Add page permission also requires edit page permission."
@@ -150,8 +180,17 @@ msgid "Notify user"
msgstr "Notificar a l'usuari"
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
msgstr "Enviar notificació per correu electrònic a l'usuari sobre el canvi nom d'usuari o contrasenya. Requereix del correu electrònic de l'usuari."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+msgstr ""
+"Enviar notificació per correu electrònic a l'usuari sobre el canvi nom"
+" d'usuari o contrasenya. Requereix del correu electrònic de l'usuari."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:316
msgid "New password"
@@ -166,12 +205,29 @@ msgid "Email notification requires valid email address."
msgstr "Notificació per correu electrònic requereix d'una adreça de correu electrònic vàlida."
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr "El permís per afegir noves pàgines requereix el permís per modificar pàgines!"
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
msgstr "El permís per afegir nous usuaris requereix el permís per modificar usuaris!"
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr ""
+"El permís per afegir noves pàgines requereix el permís per modificar "
+"pàgines!"
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+msgstr ""
+"El permís per afegir nous usuaris requereix el permís per modificar "
+"usuaris!"
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:343
msgid "To add permissions you also need to edit them!"
@@ -187,7 +243,13 @@ msgstr "Configuració bàsica"
#: admin/pageadmin.py:137
msgid "Note: This page reloads if you change the selection. Save it first."
+<<<<<<< HEAD
msgstr "Nota: Aquesta plana es torna a carregar si canvia la selecció. Desa-la primer."
+=======
+msgstr ""
+"Nota: Aquesta plana es torna a carregar si canvia la selecció. Desa-la"
+" primer."
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:143
msgid "Advanced Settings"
@@ -269,8 +331,17 @@ msgstr "El connector %(language)s s'ha copiat a %(placeholder)s"
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
msgstr "El connector %(plugin_name)s s'ha editat a la posició %(position)s de %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+msgstr ""
+"El connector %(plugin_name)s s'ha editat a la posició %(position)s de "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:1318
msgid "Plugins where moved"
@@ -278,8 +349,17 @@ msgstr "Els connectors s'han mogut"
#: admin/pageadmin.py:1345 admin/placeholderadmin.py:216
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was deleted."
msgstr "El connector %(plugin_name)s a la posició %(position)s de %(placeholder)s s'ha esborrat"
+=======
+msgid ""
+"%(plugin_name)s plugin at position %(position)s in %(placeholder)s was "
+"deleted."
+msgstr ""
+"El connector %(plugin_name)s a la posició %(position)s de "
+"%(placeholder)s s'ha esborrat"
+>>>>>>> hotfix/2.1.2
#: admin/permissionadmin.py:114 models/permissionmodels.py:75
msgid "Page permissions"
@@ -586,7 +666,13 @@ msgid "changed by"
msgstr "modificat per"
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+>>>>>>> hotfix/2.1.2
msgstr "Quan la pàgina ha d'anar a producció l'estat ha de ser \"Publicat\"."
#: models/pagemodel.py:65
@@ -598,8 +684,17 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr "Tots els avantpassats no es mostraran al menú de navegació"
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
msgstr "Un identificador únic que s'utilitza amb el page_url_templatetag per enllaçar-se a aquesta pàgina"
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+msgstr ""
+"Un identificador únic que s'utilitza amb el page_url_templatetag per "
+"enllaçar-se a aquesta pàgina"
+>>>>>>> hotfix/2.1.2
#: models/pagemodel.py:69
msgid "attached menu"
@@ -683,7 +778,13 @@ msgstr "pot recuperar qualsevol pàgina eliminada"
#: models/permissionmodels.py:53
msgid "If none selected, user haves granted permissions to all sites."
+<<<<<<< HEAD
msgstr "Si no hi ha res seleccionat, l'usuari tindrà permisos concedits a tot arreu."
+=======
+msgstr ""
+"Si no hi ha res seleccionat, l'usuari tindrà permisos concedits a tot "
+"arreu."
+>>>>>>> hotfix/2.1.2
#: models/permissionmodels.py:53
msgid "sites"
@@ -933,8 +1034,17 @@ msgid "HTML"
msgstr "HTML"
#: plugins/snippet/models.py:15
+<<<<<<< HEAD
msgid "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
msgstr "Introduex la plantilla (i.e. \"snippets/plugin_xy.html\") que serà renderitzada. "
+=======
+msgid ""
+"Enter a template (i.e. \"snippets/plugin_xy.html\") which will be "
+"rendered. "
+msgstr ""
+"Introduex la plantilla (i.e. \"snippets/plugin_xy.html\") que serà "
+"renderitzada. "
+>>>>>>> hotfix/2.1.2
#: plugins/snippet/models.py:25
msgid "Snippets"
@@ -1036,7 +1146,13 @@ msgstr "ajuda de l'enllaç"
#: plugins/twitter/models.py:9
msgid "If given, the hint is displayed as link to your Twitter profile."
+<<<<<<< HEAD
msgstr "Si s'indica, l'ajuda es mostrarà com a enllaç al seu perfil de Twitter."
+=======
+msgstr ""
+"Si s'indica, l'ajuda es mostrarà com a enllaç al seu perfil de "
+"Twitter."
+>>>>>>> hotfix/2.1.2
#: plugins/twitter/models.py:16
msgid "query"
@@ -1067,8 +1183,17 @@ msgid "movie url"
msgstr "url de la película"
#: plugins/video/models.py:10
+<<<<<<< HEAD
msgid "vimeo or youtube video url. Example: http://www.youtube.com/watch?v=YFa59lK-kpo"
msgstr "vimeo o URL del vídeo youtube. Exemple: http://www.youtube.com/watch?v=YFa59lK-kpo"
+=======
+msgid ""
+"vimeo or youtube video url. Example: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+msgstr ""
+"vimeo o URL del vídeo youtube. Exemple: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+>>>>>>> hotfix/2.1.2
#: plugins/video/models.py:11
msgid "preview image file"
@@ -1130,8 +1255,17 @@ msgid "button highlight color"
msgstr "color de ressaltat del botó"
#: plugins/video/templates/cms/plugins/video.html:3
+<<<<<<< HEAD
msgid "Missing flash plugin. Download <a href=\"http://adobe.com/flashplayer\">here</a>"
msgstr "Falta plugin de flash. Descarregar <a href=\"http://adobe.com/flashplayer\">aquí</a>"
+=======
+msgid ""
+"Missing flash plugin. Download <a "
+"href=\"http://adobe.com/flashplayer\">here</a>"
+msgstr ""
+"Falta plugin de flash. Descarregar <a "
+"href=\"http://adobe.com/flashplayer\">aquí</a>"
+>>>>>>> hotfix/2.1.2
#: templates/admin/page_submit_line.html:3
#: templates/admin/cms/page/change_form.html:273
@@ -1160,8 +1294,17 @@ msgstr "Guardar i continuar editant"
#: templates/admin/cms/mail/approvement_required.html:5
#: templates/admin/cms/mail/approvement_required.txt:5
#, python-format
+<<<<<<< HEAD
msgid "Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by you."
msgstr "La pàgina <a href=\"%(admin_url)s\">%(page)s</a> pot requerir que l'aprovis."
+=======
+msgid ""
+"Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by "
+"you."
+msgstr ""
+"La pàgina <a href=\"%(admin_url)s\">%(page)s</a> pot requerir que "
+"l'aprovis."
+>>>>>>> hotfix/2.1.2
#: templates/admin/cms/mail/approvement_required.html:8
#: templates/admin/cms/mail/approvement_required.txt:7
@@ -1269,8 +1412,17 @@ msgstr "Estat de la pàgina"
#: templates/admin/cms/page/change_form.html:183
#, python-format
+<<<<<<< HEAD
msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
msgstr "Aquesta pàgina ha de ser moderat en el nivell %(moderation_level)s , envia un missatge per al moderador."
+=======
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a "
+"message for moderator."
+msgstr ""
+"Aquesta pàgina ha de ser moderat en el nivell %(moderation_level)s , "
+"envia un missatge per al moderador."
+>>>>>>> hotfix/2.1.2
#: templates/admin/cms/page/change_form.html:185
msgid "Request approvemet"
@@ -1550,7 +1702,13 @@ msgstr "Ho has seleccionat cap connector. Tria'n un de l'esquerra"
#: templates/admin/cms/page/widgets/plugin_editor.html:17
msgid "No Plugins present. Add a plugin to this placeholder-slot."
+<<<<<<< HEAD
msgstr "No hi ha connectors. Afegir un connector per aquest marcador de posició."
+=======
+msgstr ""
+"No hi ha connectors. Afegir un connector per aquest marcador de "
+"posició."
+>>>>>>> hotfix/2.1.2
#: templates/cms/toolbar/add_plugins.html:10
msgid "Available plugins"
View
16 cms/locale/ca/LC_MESSAGES/djangojs.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:37+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:10+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,8 +22,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: media/cms/js/change_form.js:31
-msgid "Are you sure you want to change the %(field_name)s without saving the page first?"
-msgstr "Estàs segur que vols canviar el %(field_name) sense guardar primer la plana?"
+msgid ""
+"Are you sure you want to change the %(field_name)s without saving the "
+"page first?"
+msgstr ""
+"Estàs segur que vols canviar el %(field_name) sense guardar primer la "
+"plana?"
#: media/cms/js/change_form.js:69
msgid ""
@@ -29,7 +37,9 @@ msgstr ""
#: media/cms/js/change_form.js:127
msgid "Are you sure you want to change tabs without saving the page first?"
-msgstr "Estàs segur que voleu canviar de secció sense guardar la primera pàgina?"
+msgstr ""
+"Estàs segur que voleu canviar de secció sense guardar la primera "
+"pàgina?"
#: media/cms/js/plugin_editor.js:125
msgid "Are you sure you want to delete this plugin?"
View
115 cms/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:38+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+<<<<<<< HEAD
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+>>>>>>> hotfix/2.1.2
#: plugin_base.py:100
msgid "Advanced options"
@@ -66,7 +76,13 @@ msgstr "Název stránky"
#: admin/forms.py:131
msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
+<<<<<<< HEAD
msgstr "Přepsat to, co se zobrazuje v horní části vašeho prohlížeče nebo v záložkách"
+=======
+msgstr ""
+"Přepsat to, co se zobrazuje v horní části vašeho prohlížeče nebo v "
+"záložkách"
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:132
msgid "Application"
@@ -98,7 +114,13 @@ msgstr "Popis stránky, který mohou indexovat vyhledávače."
#: admin/forms.py:147
msgid "A list of comma seperated keywords sometimes used by search engines."
+<<<<<<< HEAD
msgstr "Seznam klíčových slov oddělených čárkou, které mohou indexovat vyhledávače."
+=======
+msgstr ""
+"Seznam klíčových slov oddělených čárkou, které mohou indexovat "
+"vyhledávače."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:163
msgid "A page with this reverse URL id exists already."
@@ -114,8 +136,17 @@ msgid "user"
msgstr "uživatel"
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
msgstr "Právo na přidání stránky vyžaduje také přístup k \"vnořeným\" stránkám, jinak tyto stránky nebude moci editovat jejich autor."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+msgstr ""
+"Právo na přidání stránky vyžaduje také přístup k \"vnořeným\" stránkám, "
+"jinak tyto stránky nebude moci editovat jejich autor."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:218
msgid "Add page permission also requires edit page permission."
@@ -150,8 +181,17 @@ msgid "Notify user"
msgstr "Informovat uživatele"
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
msgstr "Posílat uživateli informační email o změně uživatelského jména nebo hesla. Vyžaduje uživatelův email."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+msgstr ""
+"Posílat uživateli informační email o změně uživatelského jména nebo "
+"hesla. Vyžaduje uživatelův email."
+>>>>>>> hotfix/2.1.2
#: admin/forms.py:316
msgid "New password"
@@ -166,11 +206,23 @@ msgid "Email notification requires valid email address."
msgstr "Emailová notifikace vyžaduje platnou emailovou adresu."
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr "Právo na přidávání nových stránek vyžaduje právo na změnu stránek!"
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr "Právo na přidávání nových stránek vyžaduje právo na změnu stránek!"
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+>>>>>>> hotfix/2.1.2
msgstr "Právo na přidávání nových uživatelů vyžaduje právo na změnu uživatelů!"
#: admin/forms.py:343
@@ -187,7 +239,13 @@ msgstr "Základní nastavení"
#: admin/pageadmin.py:137
msgid "Note: This page reloads if you change the selection. Save it first."
+<<<<<<< HEAD
msgstr "Upozornění: Při změně výběru se stránka se znovu načte. Provedené změny nejprve uložte."
+=======
+msgstr ""
+"Upozornění: Při změně výběru se stránka se znovu načte. Provedené "
+"změny nejprve uložte."
+>>>>>>> hotfix/2.1.2
#: admin/pageadmin.py:143
msgid "Advanced Settings"
@@ -269,7 +327,13 @@ msgstr ""
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/pageadmin.py:1318
@@ -586,7 +650,13 @@ msgid "changed by"
msgstr "změnil"
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:65
@@ -598,7 +668,13 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr "Potomci nebudou zobrazeni v navigaci"
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:69
@@ -933,7 +1009,13 @@ msgid "HTML"
msgstr "HTML"
#: plugins/snippet/models.py:15
+<<<<<<< HEAD
msgid "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
+=======
+msgid ""
+"Enter a template (i.e. \"snippets/plugin_xy.html\") which will be "
+"rendered. "
+>>>>>>> hotfix/2.1.2
msgstr ""
#: plugins/snippet/models.py:25
@@ -1067,8 +1149,17 @@ msgid "movie url"
msgstr "URL videa"
#: plugins/video/models.py:10
+<<<<<<< HEAD
msgid "vimeo or youtube video url. Example: http://www.youtube.com/watch?v=YFa59lK-kpo"
msgstr "URL adresa na youtube nebo vimeo. Př.: http://www.youtube.com/watch?v=YFa59lK-kpo"
+=======
+msgid ""
+"vimeo or youtube video url. Example: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+msgstr ""
+"URL adresa na youtube nebo vimeo. Př.: http://www.youtube.com/watch?v"
+"=YFa59lK-kpo"
+>>>>>>> hotfix/2.1.2
#: plugins/video/models.py:11
msgid "preview image file"
@@ -1130,7 +1221,13 @@ msgid "button highlight color"
msgstr ""
#: plugins/video/templates/cms/plugins/video.html:3
+<<<<<<< HEAD
msgid "Missing flash plugin. Download <a href=\"http://adobe.com/flashplayer\">here</a>"
+=======
+msgid ""
+"Missing flash plugin. Download <a "
+"href=\"http://adobe.com/flashplayer\">here</a>"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/page_submit_line.html:3
@@ -1160,7 +1257,13 @@ msgstr "Uložit a pokračovat v editaci"
#: templates/admin/cms/mail/approvement_required.html:5
#: templates/admin/cms/mail/approvement_required.txt:5
#, python-format
+<<<<<<< HEAD
msgid "Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by you."
+=======
+msgid ""
+"Page <a href=\"%(admin_url)s\">%(page)s</a> may require approvement by "
+"you."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/cms/mail/approvement_required.html:8
@@ -1270,7 +1373,13 @@ msgstr ""
#: templates/admin/cms/page/change_form.html:183
#, python-format
+<<<<<<< HEAD
msgid "This page must be moderated at level %(moderation_level)s, post a message for moderator."
+=======
+msgid ""
+"This page must be moderated at level %(moderation_level)s, post a "
+"message for moderator."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: templates/admin/cms/page/change_form.html:185
@@ -1551,7 +1660,13 @@ msgstr "Není zvolen žádný typ obsahu. Vyberte z nabídky na levé straně."
#: templates/admin/cms/page/widgets/plugin_editor.html:17
msgid "No Plugins present. Add a plugin to this placeholder-slot."
+<<<<<<< HEAD
msgstr "Není dostupný žádný typ obsahu. Přidejte typ obsahu do placeholderu (TODO)"
+=======
+msgstr ""
+"Není dostupný žádný typ obsahu. Přidejte typ obsahu do placeholderu "
+"(TODO)"
+>>>>>>> hotfix/2.1.2
#: templates/cms/toolbar/add_plugins.html:10
msgid "Available plugins"
View
8 cms/locale/cs/LC_MESSAGES/djangojs.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 13:37+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:10+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: ojii <me@ojii.ch>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +22,9 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#: media/cms/js/change_form.js:31
-msgid "Are you sure you want to change the %(field_name)s without saving the page first?"
+msgid ""
+"Are you sure you want to change the %(field_name)s without saving the "
+"page first?"
msgstr "Opravdu chcete změnit %(field_name)s bez uložení změn?"
#: media/cms/js/change_form.js:69
View
82 cms/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,11 @@ 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"
+<<<<<<< HEAD
"PO-Revision-Date: 2011-02-07 17:34+0000\n"
+=======
+"PO-Revision-Date: 2011-02-16 17:11+0000\n"
+>>>>>>> hotfix/2.1.2
"Last-Translator: Benjamin Wohlwend <piquadrat@gmail.com>\n"
"Language-Team: divio.ch <developers@divio.ch>\n"
"MIME-Version: 1.0\n"
@@ -16,9 +20,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Language: cy\n"
"Plural-Forms: nplurals=4; plural=(n==2) ? 1 : 0\n"
+<<<<<<< HEAD
"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: SWITZERLAND\n"
+=======
+"X-Poedit-Country: SWITZERLAND\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+>>>>>>> hotfix/2.1.2
#: plugin_base.py:100
msgid "Advanced options"
@@ -114,7 +124,13 @@ msgid "user"
msgstr ""
#: admin/forms.py:215
+<<<<<<< HEAD
msgid "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
+=======
+msgid ""
+"Add page permission requires also access to children, or descendants, "
+"otherwise added page can't be changed by its creator."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:218
@@ -150,7 +166,13 @@ msgid "Notify user"
msgstr ""
#: admin/forms.py:296
+<<<<<<< HEAD
msgid "Send email notification to user about username or password change. Requires user email."
+=======
+msgid ""
+"Send email notification to user about username or password change. "
+"Requires user email."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:316
@@ -166,11 +188,23 @@ msgid "Email notification requires valid email address."
msgstr ""
#: admin/forms.py:339
+<<<<<<< HEAD
msgid "The permission to add new pages requires the permission to change pages!"
msgstr ""
#: admin/forms.py:341
msgid "The permission to add new users requires the permission to change users!"
+=======
+msgid ""
+"The permission to add new pages requires the permission to change "
+"pages!"
+msgstr ""
+
+#: admin/forms.py:341
+msgid ""
+"The permission to add new users requires the permission to change "
+"users!"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/forms.py:343
@@ -269,7 +303,13 @@ msgstr ""
#: admin/pageadmin.py:1260
#, python-format
+<<<<<<< HEAD
msgid "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
+=======
+msgid ""
+"%(plugin_name)s plugin edited at position %(position)s in "
+"%(placeholder)s"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: admin/pageadmin.py:1318
@@ -586,7 +626,13 @@ msgid "changed by"
msgstr ""
#: models/pagemodel.py:64
+<<<<<<< HEAD
msgid "When the page should go live. Status must be \"Published\" for page to go live."
+=======
+msgid ""
+"When the page should go live. Status must be \"Published\" for page to go"
+" live."
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:65
@@ -598,7 +644,13 @@ msgid "All ancestors will not be displayed in the navigation"
msgstr ""
#: models/pagemodel.py:68
+<<<<<<< HEAD
msgid "An unique identifier that is used with the page_url templatetag for linking to this page"
+=======
+msgid ""
+"An unique identifier that is used with the page_url templatetag for "
+"linking to this page"
+>>>>>>> hotfix/2.1.2
msgstr ""
#: models/pagemodel.py:69