Changeset 2638

Timestamp:

04/09/06 18:18:42 (3 years ago)

Author:

adrian

Message:

magic-removal: Merged to [2637]

Files:

• django/branches/magic-removal/django/conf/global_settings.py (modified) (2 diffs)
• django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.po (modified) (3 diffs)
• django/branches/magic-removal/django/conf/locale/he (copied) (copied from django/trunk/django/conf/locale/he)
• django/branches/magic-removal/django/conf/locale/he/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/he/LC_MESSAGES)
• django/branches/magic-removal/django/conf/locale/he/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/he/LC_MESSAGES/djangojs.mo)
• django/branches/magic-removal/django/conf/locale/he/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/he/LC_MESSAGES/djangojs.po)
• django/branches/magic-removal/django/conf/locale/he/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/he/LC_MESSAGES/django.mo)
• django/branches/magic-removal/django/conf/locale/he/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/he/LC_MESSAGES/django.po)
• django/branches/magic-removal/django/conf/locale/uk (copied) (copied from django/trunk/django/conf/locale/uk)
• django/branches/magic-removal/django/conf/locale/uk/LC_MESSAGES (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES)
• django/branches/magic-removal/django/conf/locale/uk/LC_MESSAGES/django.mo (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/django.mo)
• django/branches/magic-removal/django/conf/locale/uk/LC_MESSAGES/django.po (copied) (copied from django/trunk/django/conf/locale/uk/LC_MESSAGES/django.po)
• django/branches/magic-removal/docs/url_dispatch.txt (modified) (1 diff)

django/branches/magic-removal/django/conf/global_settings.py

@@ -45 +45 @@
-    ('fr', _('French')),
-    ('gl', _('Galician')),
+    ('he', _('Hebrew')),
-    ('is', _('Icelandic')),
-    ('it', _('Italian')),
@@ -57 +58 @@
-    ('sr', _('Serbian')),
-    ('sv', _('Swedish')),
+    ('uk', _('Ukrainian')),
-    ('zh-cn', _('Simplified Chinese')),
-    ('zh-tw', _('Traditional Chinese')),

django/branches/magic-removal/django/conf/locale/de/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-3-20 11:44+01
+4-06 12:00+02
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -1485 +1485 @@
-
-#: conf/global_settings.py:47
+msgid "Hebrew"
+msgstr "Hebr�ch"
+
+#: conf/global_settings.py:48
-msgid "Icelandic"
-msgstr "Isl�isch"
-
-8
+9
-msgid "Italian"
-msgstr "Italienisch"
-
-49
+50
-msgid "Japanese"
-msgstr "Japanisch"
-
-0
+1
-msgid "Dutch"
-msgstr "Holl�isch"
-
-1
+2
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-2
+3
-msgid "Brazilian"
-msgstr "Brasilianisch"
-
-3
+4
-msgid "Romanian"
-msgstr "Rum�sch"
-
-4
+5
-msgid "Russian"
-msgstr "Russisch"
-
-5
+6
-msgid "Slovak"
-msgstr "Slowakisch"
-
-6
+7
-msgid "Slovenian"
-msgstr "Slowenisch"
-
-7
+8
-msgid "Serbian"
-msgstr "Serbisch"
-
-8
+9
-msgid "Swedish"
-msgstr "Schwedisch"
-
-
+
+
+
+
+
-msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
-
-0
+2
-msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
@@ -1853 +1861 @@
-"beginnt mit \"%(start)s\"."
-
-44
+55
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."

django/branches/magic-removal/docs/url_dispatch.txt

@@ -174 +174 @@
---------
-
- an arbitrary number of URL patterns and returns
-
+, and an arbitrary number of URL patterns, and
+returns 
-
-The first argument to ``patterns()`` is a string ``prefix``. See