[multi-db] Merge trunk to [3825]. Some tests still failing. (previous…

… commit was from tests/ dir only) git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
alex · Nov 29, 2006 · 9a01534 · 9a01534
1 parent 08fe1b6
commit 9a01534
Show file tree

Hide file tree

Showing 20 changed files with 3,204 additions and 867 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -151,8 +151,10 @@ answer newbie questions, and generally made Django that much better:
     Milton Waddams
     Dan Watson <http://theidioteque.net/>
     Rachel Willmer <http://www.willmer.com/kb/>
+    Gary Wilson <gary.wilson@gmail.com>
     wojtek
     ye7cakf02@sneakemail.com
+    ymasuda@ethercube.com
     Cheng Zhang
 
 A big THANK YOU goes to:

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
@@ -64,6 +64,7 @@
     ('sr', gettext_noop('Serbian')),
     ('sv', gettext_noop('Swedish')),
     ('ta', gettext_noop('Tamil')),
+    ('tr', gettext_noop('Turkish')),
     ('uk', gettext_noop('Ukrainian')),
     ('zh-cn', gettext_noop('Simplified Chinese')),
     ('zh-tw', gettext_noop('Traditional Chinese')),

diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo