Skip to content
This repository
Browse code

Merge branch 'develop' into new_i18n

Conflicts:
	cms/locale/ar/LC_MESSAGES/django.po
	cms/locale/bg/LC_MESSAGES/django.po
	cms/locale/bn/LC_MESSAGES/django.po
	cms/locale/ca/LC_MESSAGES/django.po
	cms/locale/cs/LC_MESSAGES/django.po
	cms/locale/cy/LC_MESSAGES/django.po
	cms/locale/da/LC_MESSAGES/django.po
	cms/locale/de/LC_MESSAGES/django.mo
	cms/locale/de/LC_MESSAGES/django.po
	cms/locale/el/LC_MESSAGES/django.po
	cms/locale/en/LC_MESSAGES/django.po
	cms/locale/es/LC_MESSAGES/django.po
	cms/locale/es_AR/LC_MESSAGES/django.po
	cms/locale/es_BO/LC_MESSAGES/django.po
	cms/locale/et/LC_MESSAGES/django.po
	cms/locale/eu/LC_MESSAGES/django.po
	cms/locale/fa/LC_MESSAGES/django.po
	cms/locale/fi/LC_MESSAGES/django.po
	cms/locale/fr/LC_MESSAGES/django.po
	cms/locale/gu/LC_MESSAGES/django.po
	cms/locale/he/LC_MESSAGES/django.po
	cms/locale/hi/LC_MESSAGES/django.po
	cms/locale/hr/LC_MESSAGES/django.po
	cms/locale/hu/LC_MESSAGES/django.po
	cms/locale/it/LC_MESSAGES/django.po
	cms/locale/ja/LC_MESSAGES/django.po
	cms/locale/ka/LC_MESSAGES/django.po
	cms/locale/km/LC_MESSAGES/django.po
	cms/locale/ku_IQ/LC_MESSAGES/django.po
	cms/locale/nl/LC_MESSAGES/django.po
	cms/locale/no/LC_MESSAGES/django.po
	cms/locale/pl/LC_MESSAGES/django.po
	cms/locale/pt/LC_MESSAGES/django.po
	cms/locale/pt_BR/LC_MESSAGES/django.po
	cms/locale/ro/LC_MESSAGES/django.po
	cms/locale/ru/LC_MESSAGES/django.po
	cms/locale/sk/LC_MESSAGES/django.po
	cms/locale/sl_SI/LC_MESSAGES/django.po
	cms/locale/sr@latin/LC_MESSAGES/django.po
	cms/locale/sv/LC_MESSAGES/django.po
	cms/locale/tr/LC_MESSAGES/django.po
	cms/locale/uk/LC_MESSAGES/django.po
	cms/locale/zh_CN/LC_MESSAGES/django.po
	cms/locale/zh_TW/LC_MESSAGES/django.po
	cms/utils/page_resolver.py
	test_requirements/requirements_base.txt
  • Loading branch information...
commit 569cffc9ba876ecd0acd494a46d063c5f7109f09 2 parents 838db9a + dc7937c
Patrick Lauber authored September 20, 2012

Showing 101 changed files with 3,367 additions and 5,312 deletions. Show diff stats Hide diff stats

  1. 2  .tx/config
  2. 2  CHANGELOG.txt
  3. 199  CONTRIBUTING.rst
  4. 2  cms/__init__.py
  5. BIN  cms/locale/ar/LC_MESSAGES/django.mo
  6. 222  cms/locale/ar/LC_MESSAGES/django.po
  7. BIN  cms/locale/bg/LC_MESSAGES/django.mo
  8. 179  cms/locale/bg/LC_MESSAGES/django.po
  9. BIN  cms/locale/bn/LC_MESSAGES/django.mo
  10. 73  cms/locale/bn/LC_MESSAGES/django.po
  11. BIN  cms/locale/ca/LC_MESSAGES/django.mo
  12. 187  cms/locale/ca/LC_MESSAGES/django.po
  13. BIN  cms/locale/cs/LC_MESSAGES/django.mo
  14. 199  cms/locale/cs/LC_MESSAGES/django.po
  15. BIN  cms/locale/cy/LC_MESSAGES/django.mo
  16. 74  cms/locale/cy/LC_MESSAGES/django.po
  17. BIN  cms/locale/da/LC_MESSAGES/django.mo
  18. 180  cms/locale/da/LC_MESSAGES/django.po
  19. BIN  cms/locale/de/LC_MESSAGES/django.mo
  20. 234  cms/locale/de/LC_MESSAGES/django.po
  21. BIN  cms/locale/el/LC_MESSAGES/django.mo
  22. 148  cms/locale/el/LC_MESSAGES/django.po
  23. BIN  cms/locale/en/LC_MESSAGES/django.mo
  24. 44  cms/locale/en/LC_MESSAGES/django.po
  25. BIN  cms/locale/es/LC_MESSAGES/django.mo
  26. 207  cms/locale/es/LC_MESSAGES/django.po
  27. BIN  cms/locale/es_AR/LC_MESSAGES/django.mo
  28. 126  cms/locale/es_AR/LC_MESSAGES/django.po
  29. BIN  cms/locale/es_BO/LC_MESSAGES/django.mo
  30. 212  cms/locale/es_BO/LC_MESSAGES/django.po
  31. BIN  cms/locale/et/LC_MESSAGES/django.mo
  32. 99  cms/locale/et/LC_MESSAGES/django.po
  33. BIN  cms/locale/eu/LC_MESSAGES/django.mo
  34. 664  cms/locale/eu/LC_MESSAGES/django.po
  35. BIN  cms/locale/fa/LC_MESSAGES/django.mo
  36. 284  cms/locale/fa/LC_MESSAGES/django.po
  37. BIN  cms/locale/fi/LC_MESSAGES/django.mo
  38. 269  cms/locale/fi/LC_MESSAGES/django.po
  39. BIN  cms/locale/fr/LC_MESSAGES/django.mo
  40. 196  cms/locale/fr/LC_MESSAGES/django.po
  41. 25  cms/locale/fr/LC_MESSAGES/djangojs.po
  42. BIN  cms/locale/gu/LC_MESSAGES/django.mo
  43. 82  cms/locale/gu/LC_MESSAGES/django.po
  44. BIN  cms/locale/he/LC_MESSAGES/django.mo
  45. 73  cms/locale/he/LC_MESSAGES/django.po
  46. BIN  cms/locale/hi/LC_MESSAGES/django.mo
  47. 221  cms/locale/hi/LC_MESSAGES/django.po
  48. BIN  cms/locale/hr/LC_MESSAGES/django.mo
  49. 173  cms/locale/hr/LC_MESSAGES/django.po
  50. BIN  cms/locale/hu/LC_MESSAGES/django.mo
  51. 73  cms/locale/hu/LC_MESSAGES/django.po
  52. BIN  cms/locale/it/LC_MESSAGES/django.mo
  53. 326  cms/locale/it/LC_MESSAGES/django.po
  54. BIN  cms/locale/ja/LC_MESSAGES/django.mo
  55. 105  cms/locale/ja/LC_MESSAGES/django.po
  56. BIN  cms/locale/ka/LC_MESSAGES/django.mo
  57. 73  cms/locale/ka/LC_MESSAGES/django.po
  58. BIN  cms/locale/km/LC_MESSAGES/django.mo
  59. 172  cms/locale/km/LC_MESSAGES/django.po
  60. BIN  cms/locale/ku_IQ/LC_MESSAGES/django.mo
  61. 184  cms/locale/ku_IQ/LC_MESSAGES/django.po
  62. BIN  cms/locale/nl/LC_MESSAGES/django.mo
  63. 215  cms/locale/nl/LC_MESSAGES/django.po
  64. BIN  cms/locale/no/LC_MESSAGES/django.mo
  65. 175  cms/locale/no/LC_MESSAGES/django.po
  66. BIN  cms/locale/pl/LC_MESSAGES/django.mo
  67. 191  cms/locale/pl/LC_MESSAGES/django.po
  68. BIN  cms/locale/pt/LC_MESSAGES/django.mo
  69. 381  cms/locale/pt/LC_MESSAGES/django.po
  70. 25  cms/locale/pt/LC_MESSAGES/djangojs.po
  71. BIN  cms/locale/pt_BR/LC_MESSAGES/django.mo
  72. 200  cms/locale/pt_BR/LC_MESSAGES/django.po
  73. BIN  cms/locale/ro/LC_MESSAGES/django.mo
  74. 273  cms/locale/ro/LC_MESSAGES/django.po
  75. BIN  cms/locale/ru/LC_MESSAGES/django.mo
  76. 286  cms/locale/ru/LC_MESSAGES/django.po
  77. BIN  cms/locale/sk/LC_MESSAGES/django.mo
  78. 247  cms/locale/sk/LC_MESSAGES/django.po
  79. BIN  cms/locale/sl_SI/LC_MESSAGES/django.mo
  80. 169  cms/locale/sl_SI/LC_MESSAGES/django.po
  81. BIN  cms/locale/sr@latin/LC_MESSAGES/django.mo
  82. 166  cms/locale/sr@latin/LC_MESSAGES/django.po
  83. BIN  cms/locale/sv/LC_MESSAGES/django.mo
  84. 160  cms/locale/sv/LC_MESSAGES/django.po
  85. BIN  cms/locale/tr/LC_MESSAGES/django.mo
  86. 129  cms/locale/tr/LC_MESSAGES/django.po
  87. BIN  cms/locale/uk/LC_MESSAGES/django.mo
  88. 95  cms/locale/uk/LC_MESSAGES/django.po
  89. BIN  cms/locale/zh_CN/LC_MESSAGES/django.mo
  90. 115  cms/locale/zh_CN/LC_MESSAGES/django.po
  91. BIN  cms/locale/zh_TW/LC_MESSAGES/django.mo
  92. 192  cms/locale/zh_TW/LC_MESSAGES/django.po
  93. 62  cms/plugins/googlemap/migrations/0011_remove_zoom_null_values.py
  94. 3  ...height__chg_field.py → 0012_auto__add_field_googlemap_width__add_field_googlemap_height__chg_field.py}
  95. 12  cms/tests/page.py
  96. 24  cms/utils/page_resolver.py
  97. 191  docs/contribution.rst
  98. 29  docs/getting_started/plugin_reference.rst
  99. 19  docs/upgrade/2.3.2.rst
  100. 8  docs/upgrade/index.rst
  101. 3  test_requirements/requirements_base.txt
2  .tx/config
@@ -4,7 +4,7 @@ source_file = cms/locale/en/LC_MESSAGES/djangojs.po
4 4
 source_lang = en
5 5
 
6 6
 [main]
7  
-host = http://www.transifex.net
  7
+host = https://www.transifex.com
8 8
 
9 9
 [django-cms.core]
10 10
 file_filter = cms/locale/<lang>/LC_MESSAGES/django.po
2  CHANGELOG.txt
@@ -95,7 +95,7 @@
95 95
 - Fixed wrong language prefix handling for form actions and admin preview
96 96
 - Admin icons in django 1.4 fixed
97 97
 - Added requirements.txt for pip and testing in test_requirements
98  
-- Google map plugin with height and width properties
  98
+- Google map plugin with height and width properties. Migrations will set default values on not-null fields.
99 99
 - Docs fixes
100 100
 - Code cleanup
101 101
 - Switched html5lib to HTML serializer
199  CONTRIBUTING.rst
Source Rendered
... ...
@@ -0,0 +1,199 @@
  1
+##########################
  2
+Contributing to django CMS
  3
+##########################
  4
+
  5
+Like every open-source project, django CMS is always looking for motivated
  6
+individuals to contribute to its source code.
  7
+However, to ensure the highest code quality and keep the repository nice and
  8
+tidy, everybody has to follow a few rules (nothing major, I promise :) )
  9
+
  10
+
  11
+*********
  12
+Community
  13
+*********
  14
+
  15
+People interested in developing for the django CMS should join the
  16
+`django-cms-developers`_ mailing list as well as heading over to #django-cms on
  17
+the `freenode`_ IRC network for help and to discuss the development.
  18
+
  19
+You may also be interested in following `@djangocmsstatus`_ on twitter to get the
  20
+GitHub commits as well as the hudson build reports. There is also a `@djangocms`_
  21
+account for less technical announcements.
  22
+
  23
+
  24
+*************
  25
+In a nutshell
  26
+*************
  27
+
  28
+Here's what the contribution process looks like, in a bullet-points fashion, and
  29
+only for the stuff we host on GitHub:
  30
+
  31
+#. django CMS is hosted on `GitHub`_, at https://github.com/divio/django-cms
  32
+#. The best method to contribute back is to create an account there, then fork
  33
+   the project. You can use this fork as if it was your own project, and should
  34
+   push your changes to it.
  35
+#. When you feel your code is good enough for inclusion, "send us a `pull
  36
+   request`_", by using the nice GitHub web interface.
  37
+
  38
+
  39
+
  40
+*****************
  41
+Contributing Code
  42
+*****************
  43
+
  44
+
  45
+Getting the source code
  46
+=======================
  47
+
  48
+If you're interested in developing a new feature for the CMS, it is recommended
  49
+that you first discuss it on the `django-cms-developers`_  mailing list so as
  50
+not to do any work that will not get merged in anyway.
  51
+
  52
+- Code will be reviewed and tested by at least one core developer, preferably
  53
+  by several. Other community members are welcome to give feedback.
  54
+- Code *must* be tested. Your pull request should include unit-tests (that cover
  55
+  the piece of code you're submitting, obviously)
  56
+- Documentation should reflect your changes if relevant. There is nothing worse
  57
+  than invalid documentation.
  58
+- Usually, if unit tests are written, pass, and your change is relevant, then
  59
+  it'll be merged.
  60
+
  61
+Since we're hosted on GitHub, django CMS uses `git`_ as a version control system.
  62
+
  63
+The `GitHub help`_ is very well written and will get you started on using git
  64
+and GitHub in a jiffy. It is an invaluable resource for newbies and old timers
  65
+alike.
  66
+
  67
+
  68
+Syntax and conventions
  69
+======================
  70
+
  71
+We try to conform to `PEP8`_ as much as possible. A few highlights:
  72
+
  73
+- Indentation should be exactly 4 spaces. Not 2, not 6, not 8. **4**. Also, tabs
  74
+  are evil.
  75
+- We try (loosely) to keep the line length at 79 characters. Generally the rule
  76
+  is "it should look good in a terminal-base editor" (eg vim), but we try not be
  77
+  [Godwin's law] about it.
  78
+
  79
+
  80
+Process
  81
+=======
  82
+
  83
+This is how you fix a bug or add a feature:
  84
+
  85
+#. `fork`_ us on GitHub.
  86
+#. Checkout your fork.
  87
+#. Hack hack hack, test test test, commit commit commit, test again.
  88
+#. Push to your fork.
  89
+#. Open a pull request.
  90
+
  91
+
  92
+Tests
  93
+=====
  94
+
  95
+Having a wide and comprehensive library of unit-tests and integration tests is
  96
+of exceeding importance. Contributing tests is widely regarded as a very
  97
+prestigious contribution (you're making everybody's future work much easier by
  98
+doing so). Good karma for you. Cookie points. Maybe even a beer if we meet in
  99
+person :)
  100
+
  101
+Generally tests should be:
  102
+
  103
+- Unitary (as much as possible). I.E. should test as much as possible only one
  104
+  function/method/class. That's the 
  105
+  very definition of unit tests. Integration tests are interesting too
  106
+  obviously, but require more time to maintain since they have a higher
  107
+  probability of breaking.
  108
+- Short running. No hard numbers here, but if your one test doubles the time it
  109
+  takes for everybody to run them, it's probably an indication that you're doing
  110
+  it wrong.
  111
+
  112
+In a similar way to code, pull requests will be reviewed before pulling
  113
+(obviously), and we encourage discussion via code review (everybody learns
  114
+something this way) or IRC discussions.
  115
+
  116
+Running the tests
  117
+-----------------
  118
+
  119
+To run the tests simply execute ``python setup.py test`` from your shell.
  120
+
  121
+
  122
+**************************
  123
+Contributing Documentation
  124
+**************************
  125
+
  126
+Perhaps considered "boring" by hard-core coders, documentation is sometimes even
  127
+more important than code! This is what brings fresh blood to a project, and
  128
+serves as a reference for old timers. On top of this, documentation is the one
  129
+area where less technical people can help most - you just need to write
  130
+semi-decent English. People need to understand you. We don't care about style or
  131
+correctness.
  132
+
  133
+Documentation should be:
  134
+
  135
+- We use `Sphinx`_/`restructuredText`_. So obviously this is the format you should
  136
+  use :) File extensions should be .rst.
  137
+- Written in English. We could discuss how it would bring more people to the
  138
+  project by having a Klingon or some other translation, but that's a problem we
  139
+  will confront once we already have good documentation in English.
  140
+- Accessible. You should assume the reader to be moderately familiar with
  141
+  Python and Django, but not anything else. Link to documentation of libraries
  142
+  you use, for example, even if they are "obvious" to you (South is the first
  143
+  example that comes to mind - it's obvious to any Django programmer, but not to
  144
+  any newbie at all).
  145
+  A brief description of what it does is also welcome. 
  146
+
  147
+Pulling of documentation is pretty fast and painless. Usually somebody goes over
  148
+your text and merges it, since there are no "breaks" and that GitHub parses rst
  149
+files automagically it's really convenient to work with.
  150
+
  151
+Also, contributing to the documentation will earn you great respect from the
  152
+core developers. You get good karma just like a test contributor, but you get
  153
+double cookie points. Seriously. You rock.
  154
+
  155
+Section style
  156
+=============
  157
+
  158
+We use Python documentation conventions for section marking:
  159
+
  160
+* ``#`` with overline, for parts
  161
+* ``*`` with overline, for chapters
  162
+* ``=``, for sections
  163
+* ``-``, for subsections
  164
+* ``^``, for subsubsections
  165
+* ``"``, for paragraphs
  166
+
  167
+
  168
+************
  169
+Translations
  170
+************
  171
+
  172
+
  173
+For translators we have a `Transifex account
  174
+<https://www.transifex.com/projects/p/django-cms/>`_ where you can translate
  175
+the .po files and don't need to install git or mercurial to be able to
  176
+contribute. All changes there will be automatically sent to the project.
  177
+
  178
+
  179
+    .. raw:: html
  180
+
  181
+        Top translations django-cms core:<br/>
  182
+
  183
+        <img border="0" src="https://www.transifex.com/projects/p/django-cms/resource/core/chart/image_png"/>
  184
+
  185
+
  186
+
  187
+.. _fork: http://github.com/divio/django-cms
  188
+.. _Sphinx: http://sphinx.pocoo.org/
  189
+.. _PEP8: http://www.python.org/dev/peps/pep-0008/
  190
+.. _django-cms-developers: http://groups.google.com/group/django-cms-developers
  191
+.. _GitHub : http://www.github.com
  192
+.. _GitHub help : http://help.github.com
  193
+.. _freenode : http://freenode.net/
  194
+.. _@djangocmsstatus : https://twitter.com/djangocmsstatus
  195
+.. _@djangocms : https://twitter.com/djangocms
  196
+.. _pull request : http://help.github.com/send-pull-requests/
  197
+.. _git : http://git-scm.com/
  198
+.. _restructuredText: http://docutils.sourceforge.net/docs/ref/rst/introduction.html
  199
+
2  cms/__init__.py
... ...
@@ -1,5 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2  
-__version__ = '2.3.2.post0'
  2
+__version__ = '2.4.0.pre'
3 3
 
4 4
 # patch settings 
5 5
 try:
BIN  cms/locale/ar/LC_MESSAGES/django.mo
Binary file not shown
222  cms/locale/ar/LC_MESSAGES/django.po
... ...
@@ -1,21 +1,22 @@
1 1
 # SOME DESCRIPTIVE TITLE.
2 2
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 3
 # This file is distributed under the same license as the PACKAGE package.
4  
-#
  4
+# 
  5
+# Translators:
  6
+# Jonas Obrist <me@ojii.ch>, 2011.
5 7
 msgid ""
6 8
 msgstr ""
7 9
 "Project-Id-Version: django-cms\n"
8  
-"Report-Msgid-Bugs-To: \n"
9  
-"POT-Creation-Date: 2012-09-14 16:08+0200\n"
10  
-"PO-Revision-Date: 2011-03-22 15:24+0000\n"
11  
-"Last-Translator: ojii <me@ojii.ch>\n"
  10
+"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
  11
+"POT-Creation-Date: 2012-09-19 14:44+0200\n"
  12
+"PO-Revision-Date: 2012-09-19 14:44+0000\n"
  13
+"Last-Translator: Patrick Lauber <patrick.lauber@divio.ch>\n"
12 14
 "Language-Team: divio.ch <developers@divio.ch>\n"
13  
-"Language: ar\n"
14 15
 "MIME-Version: 1.0\n"
15 16
 "Content-Type: text/plain; charset=UTF-8\n"
16 17
 "Content-Transfer-Encoding: 8bit\n"
17  
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
18  
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
  18
+"Language: ar\n"
  19
+"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"
19 20
 "X-Poedit-Country: SWITZERLAND\n"
20 21
 "X-Poedit-Language: English\n"
21 22
 "X-Poedit-SourceCharset: utf-8\n"
@@ -126,7 +127,8 @@ msgid "Page Title"
126 127
 msgstr "عنوان الصفحة"
127 128
 
128 129
 #: admin/forms.py:154
129  
-msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
  130
+msgid ""
  131
+"Overwrites what is displayed at the top of your browser or in bookmarks"
130 132
 msgstr "حرر المعروض في أعلى متصفحك أو في الـ bookmarks."
131 133
 
132 134
 #: admin/forms.py:155
@@ -174,18 +176,15 @@ msgstr "مستخدم"
174 176
 msgid ""
175 177
 "Add page permission requires also access to children, or descendants, "
176 178
 "otherwise added page can't be changed by its creator."
177  
-msgstr ""
178  
-"Add page permission requires also access to children, or descendants, "
179  
-"otherwise added page can't be changed by its creator."
  179
+msgstr "Add page permission requires also access to children, or descendants, otherwise added page can't be changed by its creator."
180 180
 
181 181
 #: admin/forms.py:233
182 182
 msgid "Add page permission also requires edit page permission."
183 183
 msgstr "حقوق إضافة الصفحةات تتطلب إضافة حقوق تعديل الصفحات أيضاً."
184 184
 
185 185
 #: admin/forms.py:260
186  
-#, fuzzy
187 186
 msgid "can_view"
188  
-msgstr "عرض"
  187
+msgstr ""
189 188
 
190 189
 #: admin/forms.py:272
191 190
 msgid "Please select user or group first."
@@ -220,9 +219,7 @@ msgstr "أعلم المستخدم"
220 219
 msgid ""
221 220
 "Send email notification to user about username or password change. Requires "
222 221
 "user email."
223  
-msgstr ""
224  
-"بعث رسالة تنبيهية للمسخدم حول تغيير اسم المستخدم أو كلمة المرور. يتطب عنوان "
225  
-"البريد الإلكتروني للمستخدم."
  222
+msgstr "بعث رسالة تنبيهية للمسخدم حول تغيير اسم المستخدم أو كلمة المرور. يتطب عنوان البريد الإلكتروني للمستخدم."
226 223
 
227 224
 #: admin/forms.py:330
228 225
 msgid "New password"
@@ -256,8 +253,7 @@ msgstr "إعدادات إفتراضية"
256 253
 
257 254
 #: admin/pageadmin.py:111
258 255
 msgid "Note: This page reloads if you change the selection. Save it first."
259  
-msgstr ""
260  
-"ملاحظة: هذه الصفحة ستقوم بإعادة التحميل عند تغيير المحدد. قم بالحفظ أولاً."
  256
+msgstr "ملاحظة: هذه الصفحة ستقوم بإعادة التحميل عند تغيير المحدد. قم بالحفظ أولاً."
261 257
 
262 258
 #: admin/pageadmin.py:113 admin/pageadmin.py:165
263 259
 msgid "Hidden"
@@ -272,9 +268,8 @@ msgid "SEO Settings"
272 268
 msgstr "خيارات الإستمثال لمحركات البحث"
273 269
 
274 270
 #: admin/pageadmin.py:311
275  
-#, fuzzy
276 271
 msgid "You have no permission to change the template"
277  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  272
+msgstr ""
278 273
 
279 274
 #: admin/pageadmin.py:498
280 275
 msgid "higher"
@@ -285,10 +280,9 @@ msgid "Database error"
285 280
 msgstr "خطأ في قاعدة البيانات"
286 281
 
287 282
 #: admin/pageadmin.py:779
288  
-#, fuzzy
289 283
 msgid ""
290 284
 "Error! You don't have permissions to move this page. Please reload the page"
291  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  285
+msgstr ""
292 286
 
293 287
 #: admin/pageadmin.py:880
294 288
 msgid "Page was successfully approved."
@@ -321,9 +315,8 @@ msgid "You do not have permission to change this page's in_navigation status"
321 315
 msgstr "لا تملك الحقوق لتغيير حالة تصفح هذه الصفحة"
322 316
 
323 317
 #: admin/pageadmin.py:1113
324  
-#, fuzzy
325 318
 msgid "You have no permission to add a plugin"
326  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  319
+msgstr ""
327 320
 
328 321
 #: admin/pageadmin.py:1160 admin/pageadmin.py:1192
329 322
 msgid "Language must be set to a supported language!"
@@ -343,9 +336,8 @@ msgid "Language must be different than the copied language!"
343 336
 msgstr ""
344 337
 
345 338
 #: admin/pageadmin.py:1200
346  
-#, fuzzy
347 339
 msgid "You do not have permission to add plugins"
348  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  340
+msgstr ""
349 341
 
350 342
 #: admin/pageadmin.py:1207
351 343
 #, python-format
@@ -353,44 +345,37 @@ msgid "Copied %(language)s plugins to %(placeholder)s"
353 345
 msgstr "تم نسخ إضافات اللغة %(language)s الى %(placeholder)s"
354 346
 
355 347
 #: admin/pageadmin.py:1221 admin/pageadmin.py:1349 admin/pageadmin.py:1375
356  
-#, fuzzy
357 348
 msgid "You have no permission to change this page"
358  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  349
+msgstr ""
359 350
 
360 351
 #: admin/pageadmin.py:1255
361  
-#, fuzzy
362 352
 msgid "You have no permission to edit a plugin"
363  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  353
+msgstr ""
364 354
 
365 355
 #: admin/pageadmin.py:1311
366 356
 #, python-format
367 357
 msgid ""
368 358
 "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
369  
-msgstr ""
370  
-"تم تعديل الإضافة %(plugin_name)s في %(position)s الموجودة في %(placeholder)s"
  359
+msgstr "تم تعديل الإضافة %(plugin_name)s في %(position)s الموجودة في %(placeholder)s"
371 360
 
372 361
 #: admin/pageadmin.py:1370
373  
-#, fuzzy
374 362
 msgid "You have no permission to move a plugin"
375  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  363
+msgstr ""
376 364
 
377 365
 #: admin/pageadmin.py:1388
378 366
 msgid "Plugins where moved"
379 367
 msgstr "تم نقل الإضافات"
380 368
 
381 369
 #: admin/pageadmin.py:1402
382  
-#, fuzzy
383 370
 msgid "You have no permission to remove a plugin"
384  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  371
+msgstr ""
385 372
 
386 373
 #: admin/pageadmin.py:1420 admin/placeholderadmin.py:293
387 374
 #, python-format
388 375
 msgid ""
389 376
 "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was "
390 377
 "deleted."
391  
-msgstr ""
392  
-"تم حذف الإضافة %(plugin_name)s الموجودة في %(placeholder)s في المكان "
393  
-"%(position)s."
  378
+msgstr "تم حذف الإضافة %(plugin_name)s الموجودة في %(placeholder)s في المكان %(position)s."
394 379
 
395 380
 #: admin/permissionadmin.py:94
396 381
 msgid "View restriction"
@@ -413,19 +398,16 @@ msgid "Page permissions management"
413 398
 msgstr "إدارة حقوق الصفحة"
414 399
 
415 400
 #: admin/placeholderadmin.py:151 admin/placeholderadmin.py:192
416  
-#, fuzzy
417 401
 msgid "You don't have permission to add content here."
418  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  402
+msgstr ""
419 403
 
420 404
 #: admin/placeholderadmin.py:188
421  
-#, fuzzy
422 405
 msgid "You don't have permission to add plugins"
423  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  406
+msgstr ""
424 407
 
425 408
 #: admin/placeholderadmin.py:289
426  
-#, fuzzy
427 409
 msgid "You don't have permission to delete a plugin"
428  
-msgstr "لا تملك الحقوق لتغيير هذه الصفحة"
  410
+msgstr ""
429 411
 
430 412
 #: admin/useradmin.py:25
431 413
 msgid "User details"
@@ -447,7 +429,7 @@ msgstr "نسخ الحقوق"
447 429
 msgid "Copy moderation"
448 430
 msgstr "نسخ الإدارة"
449 431
 
450  
-#: conf/patch.py:14
  432
+#: conf/patch.py:28
451 433
 msgid "Inherit the template of the nearest ancestor"
452 434
 msgstr "نسخ القالب من أقرب آب"
453 435
 
@@ -727,9 +709,7 @@ msgstr "مغير من قبل"
727 709
 msgid ""
728 710
 "When the page should go live. Status must be \"Published\" for page to go "
729 711
 "live."
730  
-msgstr ""
731  
-"When the page should go live. Status must be \"Published\" for page to go "
732  
-"live."
  712
+msgstr "When the page should go live. Status must be \"Published\" for page to go live."
733 713
 
734 714
 #: models/pagemodel.py:62
735 715
 msgid "When to expire the page. Leave empty to never expire."
@@ -743,9 +723,7 @@ msgstr "لن يتم عرض الآباء في التصفح"
743 723
 msgid ""
744 724
 "An unique identifier that is used with the page_url templatetag for linking "
745 725
 "to this page"
746  
-msgstr ""
747  
-"An unique identifier that is used with the page_url templatetag for linking "
748  
-"to this page"
  726
+msgstr "An unique identifier that is used with the page_url templatetag for linking to this page"
749 727
 
750 728
 #: models/pagemodel.py:66
751 729
 msgid "attached menu"
@@ -783,11 +761,11 @@ msgstr ""
783 761
 msgid "pages"
784 762
 msgstr "الصفحات"
785 763
 
786  
-#: models/pagemodel.py:267
  764
+#: models/pagemodel.py:268
787 765
 msgid "Page was copied."
788 766
 msgstr "تم نسخ الصفحة."
789 767
 
790  
-#: models/pagemodel.py:689
  768
+#: models/pagemodel.py:690
791 769
 msgid "default"
792 770
 msgstr "الإفتراضي"
793 771
 
@@ -925,11 +903,8 @@ msgstr "الطول"
925 903
 
926 904
 #: plugins/flash/templates/cms/plugins/flash.html:40
927 905
 #: plugins/video/templates/cms/plugins/video.html:60
928  
-#, fuzzy
929 906
 msgid "Missing flash plugin. Please download the latest Adobe Flash Player: "
930 907
 msgstr ""
931  
-"لم يتم العثور على مشغل فلاش. حمل من <a href=\"http://adobe.com/flashplayer"
932  
-"\">هنا</a>"
933 908
 
934 909
 #: plugins/flash/templates/cms/plugins/flash.html:42
935 910
 #: plugins/video/templates/cms/plugins/video.html:62
@@ -941,9 +916,8 @@ msgid "Google Map"
941 916
 msgstr "خرائط غوغل"
942 917
 
943 918
 #: plugins/googlemap/cms_plugins.py:19
944  
-#, fuzzy
945 919
 msgid "Advanced"
946  
-msgstr "خيارات متقدمة"
  920
+msgstr ""
947 921
 
948 922
 #: plugins/googlemap/forms.py:23
949 923
 msgid "Must be a positive integer followed by “px” or “%”."
@@ -986,7 +960,6 @@ msgid "latitude"
986 960
 msgstr "خط العرض"
987 961
 
988 962
 #: plugins/googlemap/models.py:26
989  
-#, fuzzy
990 963
 msgid "Use latitude & longitude to fine tune the map position."
991 964
 msgstr "استخدم خطوط الطول والعرض لتحديد الموضع على الخريطة بدقة."
992 965
 
@@ -1038,9 +1011,7 @@ msgstr "يجب أن يتم تعبئة اللغة أو الصفحة"
1038 1011
 msgid ""
1039 1012
 "Choose a page to include its plugins into this placeholder, empty will "
1040 1013
 "choose current page"
1041  
-msgstr ""
1042  
-"قم باختيار صفحة ليتم وضع إضافاتها في مكان محدد، سيتم إختيار الصفحة الحالية "
1043  
-"عند عدم التحديد."
  1014
+msgstr "قم باختيار صفحة ليتم وضع إضافاتها في مكان محدد، سيتم إختيار الصفحة الحالية عند عدم التحديد."
1044 1015
 
1045 1016
 #: plugins/inherit/models.py:11
1046 1017
 msgid "Optional: the language of the plugins you want"
@@ -1088,9 +1059,8 @@ msgid "new window"
1088 1059
 msgstr ""
1089 1060
 
1090 1061
 #: plugins/link/models.py:17
1091  
-#, fuzzy
1092 1062
 msgid "parent window"
1093  
-msgstr "الأب أولاً"
  1063
+msgstr ""
1094 1064
 
1095 1065
 #: plugins/link/models.py:18
1096 1066
 msgid "topmost frame"
@@ -1296,9 +1266,8 @@ msgid "we were checking out"
1296 1266
 msgstr ""
1297 1267
 
1298 1268
 #: plugins/twitter/templates/cms/plugins/twitter_recent_entries.html:19
1299  
-#, fuzzy
1300 1269
 msgid "loading tweets..."
1301  
-msgstr "جاري التحميل..."
  1270
+msgstr ""
1302 1271
 
1303 1272
 #: plugins/video/cms_plugins.py:10
1304 1273
 msgid "Video"
@@ -1321,13 +1290,10 @@ msgid "movie url"
1321 1290
 msgstr "عنوان url لملف الفيديو"
1322 1291
 
1323 1292
 #: plugins/video/models.py:10
1324  
-#, fuzzy
1325 1293
 msgid ""
1326  
-"vimeo or youtube video url. Example: http://www.youtube.com/watch?v=-"
1327  
-"iJ7bs4mTUY"
  1294
+"vimeo or youtube video url. Example: "
  1295
+"http://www.youtube.com/watch?v=-iJ7bs4mTUY"
1328 1296
 msgstr ""
1329  
-"عنوان url لفيديو على فيميو أو يوتيوب. مثال http://www.youtube.com/watch?"
1330  
-"v=YFa59lK-kpo"
1331 1297
 
1332 1298
 #: plugins/video/models.py:11
1333 1299
 msgid "preview image file"
@@ -1532,9 +1498,7 @@ msgstr "حالة الصفحة"
1532 1498
 msgid ""
1533 1499
 "This page must be moderated at level %(moderation_level)s, post a message "
1534 1500
 "for moderator."
1535  
-msgstr ""
1536  
-"يجب إدارة الصفحة من مستخدم بمستوى %(moderation_level)s، أرسل رسالة إلى "
1537  
-"المدير."
  1501
+msgstr "يجب إدارة الصفحة من مستخدم بمستوى %(moderation_level)s، أرسل رسالة إلى المدير."
1538 1502
 
1539 1503
 #: templates/admin/cms/page/change_form.html:190
1540 1504
 msgid "Request approvemet"
@@ -1734,9 +1698,8 @@ msgid "Can move"
1734 1698
 msgstr "يستطيع النقل"
1735 1699
 
1736 1700
 #: templates/admin/cms/page/permissions.html:14
1737  
-#, fuzzy
1738 1701
 msgid "Can view"
1739  
-msgstr "يستطيع النقل"
  1702
+msgstr ""
1740 1703
 
1741 1704
 #: templates/admin/cms/page/permissions.html:21
1742 1705
 #: templates/admin/cms/page/permissions.html:22
@@ -1765,9 +1728,8 @@ msgid "An old revision of a plugin can not be saved!"
1765 1728
 msgstr "يمكنك حفظ نسخة سابقة من الإضافة!"
1766 1729
 
1767 1730
 #: templates/admin/cms/page/plugin_forms_ok.html:26
1768  
-#, fuzzy
1769 1731
 msgid "Your changes to this plugin have not been saved."
1770  
-msgstr "يمكنك حفظ نسخة سابقة من الإضافة!"
  1732
+msgstr ""
1771 1733
 
1772 1734
 #: templates/admin/cms/page/plugin_forms_ok.html:26
1773 1735
 msgid "Plugin saved successfully."
@@ -1857,9 +1819,8 @@ msgstr "اسم المستخدم"
1857 1819
 
1858 1820
 #: templates/cms/toolbar/items/login.html:10
1859 1821
 #: templates/cms/toolbar/items/login.html:12
1860  
-#, fuzzy
1861 1822
 msgid "Login"
1862  
-msgstr "تسجيل دخول"
  1823
+msgstr ""
1863 1824
 
1864 1825
 #: templates/cms/toolbar/items/status.html:2
1865 1826
 msgid "Status"
@@ -1894,62 +1855,57 @@ msgstr ""
1894 1855
 #: templatetags/cms_tags.py:80
1895 1856
 #, python-format
1896 1857
 msgid ""
1897  
-"A template tag couldn't find the page with lookup arguments `"
1898  
-"%(page_lookup)s\n"
  1858
+"A template tag couldn't find the page with lookup arguments `%(page_lookup)s\n"
1899 1859
 "`. The URL of the request was: http://%(host)s%(path)s"
1900 1860
 msgstr ""
1901 1861
 
1902  
-#: test_utils/cli.py:99 test_utils/cli.py:106
1903  
-#, fuzzy
1904  
-msgid "English"
1905  
-msgstr "التراجع عن النشر"
1906  
-
1907 1862
 #: test_utils/cli.py:100 test_utils/cli.py:107
1908  
-msgid "French"
  1863
+msgid "English"
1909 1864
 msgstr ""
1910 1865
 
1911 1866
 #: test_utils/cli.py:101 test_utils/cli.py:108
1912  
-msgid "German"
  1867
+msgid "French"
1913 1868
 msgstr ""
1914 1869
 
1915 1870
 #: test_utils/cli.py:102 test_utils/cli.py:109
1916  
-msgid "Brazilian Portuguese"
  1871
+msgid "German"
1917 1872
 msgstr ""
1918 1873
 
1919 1874
 #: test_utils/cli.py:103 test_utils/cli.py:110
  1875
+msgid "Brazil"
  1876
+msgstr ""
  1877
+
  1878
+#: test_utils/cli.py:104 test_utils/cli.py:111
1920 1879
 msgid "Dutch"
1921 1880
 msgstr ""
1922 1881
 
1923  
-#: test_utils/cli.py:127
  1882
+#: test_utils/cli.py:128
1924 1883
 msgid "two columns"
1925 1884
 msgstr ""
1926 1885
 
1927  
-#: test_utils/cli.py:128
  1886
+#: test_utils/cli.py:129
1928 1887
 msgid "three columns"
1929 1888
 msgstr ""
1930 1889
 
1931  
-#: test_utils/cli.py:129
1932  
-#, fuzzy
  1890
+#: test_utils/cli.py:130
1933 1891
 msgid "navigation examples"
1934  
-msgstr "توسيع التصفح"
  1892
+msgstr ""
1935 1893
 
1936  
-#: test_utils/cli.py:135
1937  
-#, fuzzy
  1894
+#: test_utils/cli.py:136
1938 1895
 msgid "sidebar column"
1939  
-msgstr "لون شريط التنقل"
  1896
+msgstr "لون خلفية شريط التنقل"
1940 1897
 
1941  
-#: test_utils/cli.py:141
  1898
+#: test_utils/cli.py:142
1942 1899
 msgid "left column"
1943  
-msgstr ""
  1900
+msgstr "لون خلفية شريط التنقل"
1944 1901
 
1945  
-#: test_utils/cli.py:147
  1902
+#: test_utils/cli.py:148
1946 1903
 msgid "right column"
1947  
-msgstr ""
  1904
+msgstr "لون خلفية شريط التنقل"
1948 1905
 
1949 1906
 #: test_utils/project/placeholderapp/cms_plugins.py:7
1950  
-#, fuzzy
1951 1907
 msgid "Test Plugin"
1952  
-msgstr "احذف الإضافة"
  1908
+msgstr ""
1953 1909
 
1954 1910
 #: test_utils/project/pluginapp/plugins/extra_context/cms_plugins.py:9
1955 1911
 msgid "Extra Context"
@@ -1963,19 +1919,13 @@ msgstr ""
1963 1919
 msgid "Sample App"
1964 1920
 msgstr ""
1965 1921
 
1966  
-#: test_utils/project/sampleapp/cms_app.py:15
1967  
-msgid "Namespaced App"
1968  
-msgstr ""
1969  
-
1970 1922
 #: test_utils/project/sampleapp/menu.py:16
1971  
-#, fuzzy
1972 1923
 msgid "sample root page"
1973  
-msgstr "حدد هذه الصفحة"
  1924
+msgstr ""
1974 1925
 
1975 1926
 #: test_utils/project/sampleapp/menu.py:17
1976  
-#, fuzzy
1977 1927
 msgid "sample settings page"
1978  
-msgstr "حدد هذه الصفحة"
  1928
+msgstr ""
1979 1929
 
1980 1930
 #: test_utils/project/sampleapp/menu.py:18
1981 1931
 msgid "sample account page"
@@ -1993,11 +1943,6 @@ msgstr ""
1993 1943
 msgid "Static Menu2"
1994 1944
 msgstr ""
1995 1945
 
1996  
-#: test_utils/project/sampleapp/urls.py:11
1997  
-#, fuzzy
1998  
-msgid "^account/$"
1999  
-msgstr "العدد"
2000  
-
2001 1946
 #: utils/mail.py:37
2002 1947
 msgid "CMS - your user account was created."
2003 1948
 msgstr "نظام ادارة المحتوى - تم انشاء المستخدم."
@@ -2019,16 +1964,17 @@ msgstr "قبول"
2019 1964
 msgid "CMS - Page %s requires approvement."
2020 1965
 msgstr "نظام ادارة المحتوى - الصفحة %s تحتاج الى الموافقة."
2021 1966
 
2022  
-#: utils/page_resolver.py:148
  1967
+#: utils/page_resolver.py:146
2023 1968
 msgid "Invalid URL, use /my/url format."
2024 1969
 msgstr "عنوان الـ URL غير صحيح. مثال: /my/url "
2025 1970
 
2026  
-#: utils/page_resolver.py:177
  1971
+#: utils/page_resolver.py:176
2027 1972
 #, python-format
2028 1973
 msgid ""
2029 1974
 "Page %(pages)s has the same url '%(url)s' as current page \"%(instance)s\"."
2030 1975
 msgid_plural ""
2031  
-"Pages %(pages)s have the same url '%(url)s' as current page \"%(instance)s\"."
  1976
+"Pages %(pages)s have the same url '%(url)s' as current page "
  1977
+"\"%(instance)s\"."
2032 1978
 msgstr[0] ""
2033 1979
 msgstr[1] ""
2034 1980
 msgstr[2] ""
@@ -2036,33 +1982,11 @@ msgstr[3] ""
2036 1982
 msgstr[4] ""
2037 1983
 msgstr[5] ""
2038 1984
 
2039  
-#, fuzzy
2040  
-#~ msgid "Page with redirect url %r already exist"
2041  
-#~ msgstr "توجد صفحة سابقة بنفس الـ Slug"
2042  
-
2043  
-#~ msgid "Missing flash plugin."
2044  
-#~ msgstr "لا يوجد دعم لفلاش."
2045  
-
2046  
-#~ msgid "Move to %(name)s"
2047  
-#~ msgstr "قم بالنقل الى %(name)s"
2048  
-
2049 1985
 #~ msgid "move"
2050  
-#~ msgstr "انقل"
2051  
-
2052  
-#~ msgid "add child"
2053  
-#~ msgstr "أضف ولداً"
2054  
-
2055  
-#~ msgid "add sibling"
2056  
-#~ msgstr "أضف أخوة"
2057  
-
2058  
-#~ msgid "history"
2059  
-#~ msgstr "التاريخ"
2060  
-
2061  
-#~ msgid "Lock"
2062  
-#~ msgstr "اقفل"
  1986
+#~ msgstr "move request"
2063 1987
 
2064  
-#~ msgid "Close"
2065  
-#~ msgstr "أغلق"
  1988
+#~ msgid "fgcolor"
  1989
+#~ msgstr "foreground color"
2066 1990
 
2067  
-#~ msgid "Settings"
2068  
-#~ msgstr "خيارات"
  1991
+#~ msgid "Wanted language has not been translated yet."
  1992
+#~ msgstr "Requested language has not been translated yet."
BIN  cms/locale/bg/LC_MESSAGES/django.mo
Binary file not shown
179  cms/locale/bg/LC_MESSAGES/django.po
... ...
@@ -1,23 +1,23 @@
1 1
 # SOME DESCRIPTIVE TITLE.
2 2
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3 3
 # This file is distributed under the same license as the PACKAGE package.
4  
-#
  4
+# 
5 5
 # Translators:
6 6
 # Boris Chervenkov <office@sentido.bg>, 2012.
7 7
 # masarliev <mitko@masarliev.net>, 2011.
8 8
 msgid ""
9 9
 msgstr ""
10 10
 "Project-Id-Version: django-cms\n"
11  
-"Report-Msgid-Bugs-To: \n"
12  
-"POT-Creation-Date: 2012-09-14 16:08+0200\n"
13  
-"PO-Revision-Date: 2012-01-26 13:34+0000\n"
14  
-"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
  11
+"Report-Msgid-Bugs-To: https://github.com/divio/django-cms/issues\n"
  12
+"POT-Creation-Date: 2012-09-19 14:44+0200\n"
  13
+"PO-Revision-Date: 2012-09-19 14:44+0000\n"
  14
+"Last-Translator: Patrick Lauber <patrick.lauber@divio.ch>\n"
15 15
 "Language-Team: divio.ch <developers@divio.ch>\n"
16  
-"Language: bg\n"
17 16
 "MIME-Version: 1.0\n"
18 17
 "Content-Type: text/plain; charset=UTF-8\n"
19 18
 "Content-Transfer-Encoding: 8bit\n"
20  
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
  19
+"Language: bg\n"
  20
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
21 21
 "X-Poedit-Country: SWITZERLAND\n"
22 22
 "X-Poedit-Language: English\n"
23 23
 "X-Poedit-SourceCharset: utf-8\n"
@@ -128,7 +128,8 @@ msgid "Page Title"
128 128
 msgstr "Заглавие на страницата"
129 129
 
130 130
 #: admin/forms.py:154
131  
-msgid "Overwrites what is displayed at the top of your browser or in bookmarks"
  131
+msgid ""
  132
+"Overwrites what is displayed at the top of your browser or in bookmarks"
132 133
 msgstr "Изписва показаното отгоре във Вашия браузър или отметки"
133 134
 
134 135
 #: admin/forms.py:155
@@ -145,8 +146,7 @@ msgstr "Напиши URL адрес"
145 146
 
146 147
 #: admin/forms.py:159
147 148
 msgid "Keep this field empty if standard path should be used."
148  
-msgstr ""
149  
-"Оставете това поле празно, ако трябва да бъде използван стандартен път."
  149
+msgstr "Оставете това поле празно, ако трябва да бъде използван стандартен път."
150 150
 
151 151
 #: admin/forms.py:165
152 152
 msgid "Redirect"
@@ -162,8 +162,7 @@ msgstr "Описание на страницата, което понякога
162 162
 
163 163
 #: admin/forms.py:170
164 164
 msgid "A list of comma seperated keywords sometimes used by search engines."
165  
-msgstr ""
166  
-"Списък с думи, разделени със запетая, който понякога използват търсачките."
  165
+msgstr "Списък с думи, разделени със запетая, който понякога използват търсачките."
167 166
 
168 167
 #: admin/forms.py:186
169 168
 msgid "A page with this reverse URL id exists already."
@@ -178,9 +177,7 @@ msgstr "потребител"
178 177
 msgid ""
179 178
 "Add page permission requires also access to children, or descendants, "
180 179
 "otherwise added page can't be changed by its creator."
181  
-msgstr ""
182  
-"Правата за създаване на страница изискват достъп и до подстраниците. В "
183  
-"противен случай добавената страница не може да бъде променяна от своя автор."
  180
+msgstr "Правата за създаване на страница изискват достъп и до подстраниците. В противен случай добавената страница не може да бъде променяна от своя автор."
184 181
 
185 182
 #: admin/forms.py:233
186 183
 msgid "Add page permission also requires edit page permission."
@@ -223,9 +220,7 @@ msgstr "Предупреди потребителя"
223 220
 msgid ""
224 221
 "Send email notification to user about username or password change. Requires "
225 222
 "user email."
226  
-msgstr ""
227  
-"Изпратете имейл предупреждение на потребителя относно промяна на "
228  
-"потребителско име или парола. Изисква се имейл на потребителя."
  223
+msgstr "Изпратете имейл предупреждение на потребителя относно промяна на потребителско име или парола. Изисква се имейл на потребителя."
229 224
 
230 225
 #: admin/forms.py:330
231 226
 msgid "New password"
@@ -247,9 +242,7 @@ msgstr "Правото за добавяне изисква и право за 
247 242
 #: admin/forms.py:355
248 243
 msgid ""
249 244
 "The permission to add new users requires the permission to change users!"
250  
-msgstr ""
251  
-"Правото за добавяне на нови потребители изисква и правото за тяхното "
252  
-"редактиране!"
  245
+msgstr "Правото за добавяне на нови потребители изисква и правото за тяхното редактиране!"
253 246
 
254 247
 #: admin/forms.py:357
255 248
 msgid "To add permissions you also need to edit them!"
@@ -261,9 +254,7 @@ msgstr "Основни настройки"
261 254
 
262 255
 #: admin/pageadmin.py:111
263 256
 msgid "Note: This page reloads if you change the selection. Save it first."
264  
-msgstr ""
265  
-"Забележка: страницата се презарежда ако промените значението. Запазете "
266  
-"промените първо."
  257
+msgstr "Забележка: страницата се презарежда ако промените значението. Запазете промените първо."
267 258
 
268 259
 #: admin/pageadmin.py:113 admin/pageadmin.py:165
269 260
 msgid "Hidden"
@@ -290,10 +281,9 @@ msgid "Database error"
290 281
 msgstr "Грешка в базата данни"
291 282
 
292 283
 #: admin/pageadmin.py:779
293  
-#, fuzzy
294 284
 msgid ""
295 285
 "Error! You don't have permissions to move this page. Please reload the page"
296  
-msgstr "Нямате право да променяте тази страница"
  286
+msgstr ""
297 287
 
298 288
 #: admin/pageadmin.py:880
299 289
 msgid "Page was successfully approved."
@@ -367,9 +357,7 @@ msgstr "Нямате право да редактирате добавка."
367 357
 #, python-format
368 358
 msgid ""
369 359
 "%(plugin_name)s plugin edited at position %(position)s in %(placeholder)s"
370  
-msgstr ""
371  
-"%(plugin_name)s добавка беше редактирана в позиция %(position)s на "
372  
-"%(placeholder)s"
  360
+msgstr "%(plugin_name)s добавка беше редактирана в позиция %(position)s на %(placeholder)s"
373 361
 
374 362
 #: admin/pageadmin.py:1370
375 363
 msgid "You have no permission to move a plugin"
@@ -388,9 +376,7 @@ msgstr "Нямате право да премахвате добавка"
388 376
 msgid ""
389 377
 "%(plugin_name)s plugin at position %(position)s in %(placeholder)s was "
390 378
 "deleted."
391  
-msgstr ""
392  
-"%(plugin_name)s добавка в позиция %(position)s на %(placeholder)s беше "
393  
-"изтрита."
  379
+msgstr "%(plugin_name)s добавка в позиция %(position)s на %(placeholder)s беше изтрита."
394 380
 
395 381
 #: admin/permissionadmin.py:94
396 382
 msgid "View restriction"
@@ -444,7 +430,7 @@ msgstr "Копирай права"
444 430
 msgid "Copy moderation"
445 431
 msgstr "Копирай модериране"
446 432
 
447  
-#: conf/patch.py:14
  433
+#: conf/patch.py:28
448 434
 msgid "Inherit the template of the nearest ancestor"
449 435
 msgstr "Наследи шаблона от най-близката главна страница"
450 436
 
@@ -738,9 +724,7 @@ msgstr "Всички прародители няма да бъдат показ
738 724
 msgid ""
739 725
 "An unique identifier that is used with the page_url templatetag for linking "
740 726
 "to this page"
741  
-msgstr ""
742  
-"Уникален идентификатор, използван с page_url етикета на темплейта за "
743  
-"създаване на връзка до тази страница."
  727
+msgstr "Уникален идентификатор, използван с page_url етикета на темплейта за създаване на връзка до тази страница."
744 728
 
745 729
 #: models/pagemodel.py:66
746 730
 msgid "attached menu"
@@ -778,11 +762,11 @@ msgstr "ограничи, когато тази страница е видима
778 762
 msgid "pages"
779 763
 msgstr "страници"
780 764
 
781  
-#: models/pagemodel.py:267
  765
+#: models/pagemodel.py:268
782 766
 msgid "Page was copied."
783 767
 msgstr "Страницата беше копирана."
784 768
 
785  
-#: models/pagemodel.py:689
  769
+#: models/pagemodel.py:690
786 770
 msgid "default"
787 771
 msgstr "по подразбиране"
788 772
 
@@ -921,8 +905,7 @@ msgstr "височина"
921 905
 #: plugins/flash/templates/cms/plugins/flash.html:40
922 906
 #: plugins/video/templates/cms/plugins/video.html:60
923 907
 msgid "Missing flash plugin. Please download the latest Adobe Flash Player: "
924  
-msgstr ""
925  
-"Липсваща добавка. Моля, изтеглете последната версия на Adobe Flash Player"
  908
+msgstr "Липсваща добавка. Моля, изтеглете последната версия на Adobe Flash Player"
926 909
 
927 910
 #: plugins/flash/templates/cms/plugins/flash.html:42
928 911
 #: plugins/video/templates/cms/plugins/video.html:62
@@ -934,9 +917,8 @@ msgid "Google Map"
934 917
 msgstr "Google Карта"
935 918
 
936 919
 #: plugins/googlemap/cms_plugins.py:19
937  
-#, fuzzy
938 920
 msgid "Advanced"
939  
-msgstr "Разширени опции"
  921
+msgstr ""
940 922
 
941 923
 #: plugins/googlemap/forms.py:23
942 924
 msgid "Must be a positive integer followed by “px” or “%”."
@@ -979,10 +961,8 @@ msgid "latitude"
979 961
 msgstr "ширина"
980 962
 
981 963
 #: plugins/googlemap/models.py:26
982  
-#, fuzzy
983 964
 msgid "Use latitude & longitude to fine tune the map position."
984  
-msgstr ""
985  
-"Използвайте latitude & longitude, за да определите позицията на картата."
  965
+msgstr "Използвайте latitude & longitude, за да определите позицията на картата."
986 966
 
987 967
 #: plugins/googlemap/models.py:28
988 968
 msgid "longitude"
@@ -1032,9 +1012,7 @@ msgstr "Поле \"Език\" или \"Страница\" трябва да бъ
1032 1012
 msgid ""
1033 1013
 "Choose a page to include its plugins into this placeholder, empty will "
1034 1014
 "choose current page"
1035  
-msgstr ""
1036  
-"Изберете страница за включване на добавки на това място; ако оставите празно "
1037  
-"ще бъде използвана текущата страница."
  1015
+msgstr "Изберете страница за включване на добавки на това място; ако оставите празно ще бъде използвана текущата страница."
1038 1016
 
1039 1017
 #: plugins/inherit/models.py:11
1040 1018
 msgid "Optional: the language of the plugins you want"
@@ -1082,9 +1060,8 @@ msgid "new window"
1082 1060
 msgstr ""
1083 1061
 
1084 1062
 #: plugins/link/models.py:17
1085  
-#, fuzzy
1086 1063
 msgid "parent window"
1087  
-msgstr "първо главните страници"
  1064
+msgstr ""
1088 1065
 
1089 1066
 #: plugins/link/models.py:18
1090 1067
 msgid "topmost frame"
@@ -1152,8 +1129,7 @@ msgstr "HTML"
1152 1129
 #: plugins/snippet/models.py:15
1153 1130
 msgid ""
1154 1131
 "Enter a template (i.e. \"snippets/plugin_xy.html\") which will be rendered. "
1155  
-msgstr ""
1156  
-"Въведете шаблон (i.e. \"snippets/plugin_xy.html\") , който да бъде зает."
  1132
+msgstr "Въведете шаблон (i.e. \"snippets/plugin_xy.html\") , който да бъде зает."
1157 1133
 
1158 1134
 #: plugins/snippet/models.py:25
1159 1135
 msgid "Snippets"
@@ -1257,9 +1233,7 @@ msgstr "подсказка на връзката"
1257 1233
 
1258 1234
 #: plugins/twitter/models.py:9
1259 1235
 msgid "If given, the hint is displayed as link to your Twitter profile."
1260  
-msgstr ""
1261  
-"Ако бъде предоставено, подсказката ще бъде показана като връзка към Вашия "
1262  
-"Twitter профил."
  1236
+msgstr "Ако бъде предоставено, подсказката ще бъде показана като връзка към Вашия Twitter профил."
1263 1237
 
1264 1238
 #: plugins/twitter/models.py:16
1265 1239
 msgid "query"
@@ -1270,10 +1244,7 @@ msgid ""
1270 1244
 "Example: \"brains AND zombies AND from:umbrella AND to:nemesis\": tweets "
1271 1245
 "from the user \"umbrella\" to the user \"nemesis\" that contain the words "
1272 1246
 "\"brains\" and \"zombies\""
1273  
-msgstr ""
1274  
-"Пример: \"усмивки AND целувки AND from:снежинка AND to:капка\": изпраща туит "
1275  
-"от потребител \"снежинка\" до потребител \"капка\", което съдържа думите "
1276  
-"\"усмивки\" and \"целувки\""
  1247
+msgstr "Пример: \"усмивки AND целувки AND from:снежинка AND to:капка\": изпраща туит от потребител \"снежинка\" до потребител \"капка\", което съдържа думите \"усмивки\" and \"целувки\""
1277 1248
 
1278 1249
 #: plugins/twitter/templates/cms/plugins/twitter_recent_entries.html:14
1279 1250
 msgid "we said,"
@@ -1313,9 +1284,7 @@ msgstr "премести заявка"
1313 1284
 
1314 1285
 #: plugins/video/models.py:9
1315 1286
 msgid "use .flv file or h264 encoded video file"
1316  
-msgstr ""
1317  
-"използвайте видео файлове във формат .FLV или видео файл кодиран в h264 "
1318  
-"формат"
  1287
+msgstr "използвайте видео файлове във формат .FLV или видео файл кодиран в h264 формат"
1319 1288
 
1320 1289
 #: plugins/video/models.py:10
1321 1290
 msgid "movie url"
@@ -1323,11 +1292,9 @@ msgstr "премести заявка"
1323 1292
 
1324 1293
 #: plugins/video/models.py:10
1325 1294
 msgid ""
1326  
-"vimeo or youtube video url. Example: http://www.youtube.com/watch?v=-"
1327  
-"iJ7bs4mTUY"
1328  
-msgstr ""
1329  
-"адрес на видео във Vimeo или  YouTube, например http://www.youtube.com/watch?"
1330  
-"v=-iJ7bs4mTUY"
  1295
+"vimeo or youtube video url. Example: "
  1296
+"http://www.youtube.com/watch?v=-iJ7bs4mTUY"
  1297
+msgstr "адрес на видео във Vimeo или  YouTube, например http://www.youtube.com/watch?v=-iJ7bs4mTUY"
1331 1298
 
1332 1299