magic-removal: Merged to [2637]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2638 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/conf/global_settings.py

@@ -44,6 +44,7 @@ LANGUAGES = (
     ('es', _('Spanish')),
     ('fr', _('French')),
     ('gl', _('Galician')),
+    ('he', _('Hebrew')),
     ('is', _('Icelandic')),
     ('it', _('Italian')),
     ('ja', _('Japanese')),
@@ -56,6 +57,7 @@ LANGUAGES = (
     ('sl', _('Slovenian')),
     ('sr', _('Serbian')),
     ('sv', _('Swedish')),
+    ('uk', _('Ukrainian')),
     ('zh-cn', _('Simplified Chinese')),
     ('zh-tw', _('Traditional Chinese')),
 )

django/conf/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-20 11:44+0100\n"
+"POT-Creation-Date: 2006-04-06 12:00+0200\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
@@ -1490,58 +1490,66 @@ msgid "Galician"
 msgstr "Galicisch"
 
 #: conf/global_settings.py:47
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: conf/global_settings.py:48
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Italian"
 msgstr "Italienisch"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Dutch"
 msgstr "Holländisch"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Brazilian"
 msgstr "Brasilianisch"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Russian"
 msgstr "Russisch"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
+msgid "Ukrainian"
+msgstr "Ukrainisch"
+
+#: conf/global_settings.py:61
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:62
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
@@ -1858,7 +1866,7 @@ msgstr ""
 "Das Attribut %(attr)s in Zeile %(line)s hat einen ungültigen Wert. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/meta/__init__.py:1944
+#: core/meta/__init__.py:1955
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""

django/conf/locale/he/LC_MESSAGES/djangojs.po

@@ -0,0 +1,112 @@
+# Hebrew translation of djangojs.
+# Copyright (C) 2006 THE djangojs'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the djangojs package.
+# Meir Kriheli <meir@mksoft.co.il>, 2006.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: djangojs 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-30 13:28+0200\n"
+"PO-Revision-Date: 2006-03-30 13:35+0200\n"
+"Last-Translator: Meir Kriheli <meir@mksoft.co.il>\n"
+"Language-Team: Hebrew\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#: contrib/admin/media/js/dateparse.js:32
+#: contrib/admin/media/js/calendar.js:24
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"ינואר פברואר מרץ אפריל מאי יוני יולי אוגוסט ספטמבר אוקטובר נובמבר דצמבר"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "ראשון שני שלישי רביעי חמישי שישי שבת"
+
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "%s זמינות"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "בחירת הכל"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "הוספה"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "הסרה"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "%s נבחרות"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "יש לסמן את ההרשאות המבוקשות וללחוץ על"
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "איפוס הכל"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "ר ש ש ר ח ש ש"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+msgid "Now"
+msgstr "כעת"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+msgid "Clock"
+msgstr "שעון"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+msgid "Choose a time"
+msgstr "בחירת שעה"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+msgid "Midnight"
+msgstr "חצות"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+msgid "6 a.m."
+msgstr "6 בבוקר"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+msgid "Noon"
+msgstr "צהריים"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+msgid "Cancel"
+msgstr "ביטול"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+msgid "Today"
+msgstr "היום"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+msgid "Calendar"
+msgstr "לוח שנה"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+msgid "Yesterday"
+msgstr "אתמול"
+
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+msgid "Tomorrow"
+msgstr "מחר"
+

docs/url_dispatch.txt

@@ -173,8 +173,8 @@ your URLconf. This gives your module access to these objects:
 patterns
 --------
 
-A function that takes a prefix an arbitrary number of URL patterns and returns
+A function that takes a prefix, and an arbitrary number of URL patterns, and
-a list of URL patterns in the format Django needs.
+returns a list of URL patterns in the format Django needs.
 
 The first argument to ``patterns()`` is a string ``prefix``. See
 "The view prefix" below.