Merged to trunk r1185

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1187 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/bin/django-admin.py

@@ -3,14 +3,6 @@ from django.core import management
 from optparse import OptionParser
 import os, sys
 
-# switch to english, because django-admin creates database content
-# like permissions, and those shouldn't contain any translations
-try:
-    from django.utils import translation
-    translation.activate('en-us')
-except:
-    pass
-
 ACTION_MAPPING = {
     'adminindex': management.get_admin_index,
     'createsuperuser': management.createsuperuser,
@@ -80,6 +72,14 @@ def main():
         parser.print_usage_and_exit()
     if not ACTION_MAPPING.has_key(action):
         print_error("Your action, %r, was invalid." % action, sys.argv[0])
+
+    # switch to english, because django-admin creates database content
+    # like permissions, and those shouldn't contain any translations.
+    # But only do this if we should have a working settings file.
+    if action not in ('startproject', 'startapp'):
+        from django.utils import translation
+        translation.activate('en-us')
+
     if action in ('createsuperuser', 'init', 'validate'):
         ACTION_MAPPING[action]()
     elif action == 'inspectdb':

django/bin/unique-messages.py

@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+import os
+import sys
+import getopt
+
+basedir = None
+
+if os.path.isdir(os.path.join('conf', 'locale')):
+    basedir = os.path.abspath(os.path.join('conf', 'locale'))
+elif os.path.isdir('locale'):
+    basedir = os.path.abspath('locale')
+else:
+    print "this script should be run from the django svn tree or your project or app tree"
+    sys.exit(1)
+
+for (dirpath, dirnames, filenames) in os.walk(basedir):
+    for file in filenames:
+        if file.endswith('.po'):
+            sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
+            pf = os.path.splitext(os.path.join(dirpath, file))[0]
+            cmd = 'msguniq %s.po' % pf
+            stdout = os.popen(cmd)
+            msg = stdout.read()
+            open('%s.po' % pf, 'w').write(msg)
+

django/conf/global_settings.py

@@ -79,6 +79,9 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
 
+# List of strings representing installed apps.
+INSTALLED_APPS = ()
+
 # List of locations of the template source files, in search order.
 TEMPLATE_DIRS = ()
 

django/conf/locale/bn/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-10 05:53-0600\n"
+"POT-Creation-Date: 2005-11-11 16:13-0600\n"
 "PO-Revision-Date: 2005-11-10 06:11+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
 "Language-Team: Bengali <core@bengalinux.org>\n"
@@ -309,6 +309,89 @@ msgstr "আমাদের স্থান ব্যবহার করার
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s দল"
 
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "রিডাইরেক্ট করা"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।"
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "রিডাইরেক্ট কর"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"এইটি হয় একটি পরম পাথ হতে পারে  (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া "
+"একটি পূর্ণ ইউ.আর.এল ।"
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "রিডাইরেক্ট"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "রিডাইরেক্ট করে"
+
+#: contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "ইউ.আর.এল"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।"
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "শিরোনাম"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "অভ্যন্তরস্থ বস্তু"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "ছাঁদ নাম"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম "
+"'flatfiles/default ব্যবহার করবে।"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "নিবন্ধন প্রয়োজনীয়"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।"
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "চ্যাপ্টা পাতা"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "চ্যাপ্টা পাতাগুলো"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "সোমবার"
@@ -457,105 +540,23 @@ msgstr "অভ্যন্তরস্থ বস্তু ধরন"
 msgid "content types"
 msgstr "অভ্যন্তরস্থ বস্তু ধরন"
 
-#: models/core.py:68
+#: models/core.py:67
-msgid "redirect from"
-msgstr "রিডাইরেক্ট করা"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।"
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "রিডাইরেক্ট কর"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"এইটি হয় একটি পরম পাথ হতে পারে  (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া "
-"একটি পূর্ণ ইউ.আর.এল ।"
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "রিডাইরেক্ট"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "রিডাইরেক্ট করে"
-
-#: models/core.py:87
-msgid "URL"
-msgstr "ইউ.আর.এল"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।"
-
-#: models/core.py:89
-msgid "title"
-msgstr "শিরোনাম"
-
-#: models/core.py:90
-msgid "content"
-msgstr "অভ্যন্তরস্থ বস্তু"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "মন্তব্য সক্রিয় করুন"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "ছাঁদ নাম"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম "
-"'flatfiles/default ব্যবহার করবে।"
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "নিবন্ধন প্রয়োজনীয়"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।"
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "চ্যাপ্টা পাতা"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "চ্যাপ্টা পাতাগুলো"
-
-#: models/core.py:117
 msgid "session key"
 msgstr "অধিবেশন চাবি"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "অধিবেশন তথ্য"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "শেষ তারিখ"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "অধিবেশন"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "সেশন"
 

django/conf/locale/cs/LC_MESSAGES/django.po

@@ -796,19 +796,19 @@ msgstr "statické stránky"
 msgid "session key"
 msgstr "klíč sezení"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "data sezení"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "datum expirace"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sezení"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sezení"
 

django/conf/locale/cy/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-10 05:53-0600\n"
+"POT-Creation-Date: 2005-11-11 16:13-0600\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -307,6 +307,92 @@ msgstr "Diolch am ddefnyddio ein safle!"
 msgid "The %(site_name)s team"
 msgstr "Y tîm %(site_name)s"
 
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "ailgyfeirio o"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
+"digwyddiadau/chwilio/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "ailgyfeirio i"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "ailgyfeiriad"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "ailgyfeiriadau"
+
+#: contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
+"trywyddiol."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "teitl"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "cynnwys"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "galluogi sylwadau"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "enw'r templed"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Er enghraifft: 'flatfiles/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
+"system 'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "cofrestriad gofynnol"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
+"tudalen."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "tudalen fflat"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "tudalennau fflat"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Dydd Llun"
@@ -455,108 +541,23 @@ msgstr "math cynnwys"
 msgid "content types"
 msgstr "mathau cynnwys"
 
-#: models/core.py:68
+#: models/core.py:67
-msgid "redirect from"
-msgstr "ailgyfeirio o"
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
-"digwyddiadau/chwilio/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "ailgyfeirio i"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
-"'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "ailgyfeiriad"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "ailgyfeiriadau"
-
-#: models/core.py:87
-msgid "URL"
-msgstr "URL"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
-"trywyddiol."
-
-#: models/core.py:89
-msgid "title"
-msgstr "teitl"
-
-#: models/core.py:90
-msgid "content"
-msgstr "cynnwys"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "galluogi sylwadau"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "enw'r templed"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Er enghraifft: 'flatfiles/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
-"system 'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "cofrestriad gofynnol"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
-"tudalen."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "tudalen fflat"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "tudalennau fflat"
-
-#: models/core.py:117
 msgid "session key"
 msgstr "goriad sesiwn"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "data sesiwn"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "dyddiad darfod"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sesiwn"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sesiynau"
 

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

@@ -278,6 +278,7 @@ msgid "Page not found"
 msgstr "Seite nicht gefunden"
 
 #: contrib/admin/templates/admin/404.html:10
+#, fuzzy
 msgid "We're sorry, but the requested page could not be found."
 msgstr ""
 "Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
@@ -800,19 +801,19 @@ msgstr "Webseiten"
 msgid "session key"
 msgstr "Sitzungs-ID"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "Sitzungsdaten"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "Verfallsdatum"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "Sitzung"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "Sitzungen"
 

django/conf/locale/en/LC_MESSAGES/django.po

@@ -762,19 +762,19 @@ msgstr ""
 msgid "session key"
 msgstr ""
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr ""
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr ""
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr ""
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr ""
 

django/conf/locale/es/LC_MESSAGES/django.po

@@ -788,19 +788,19 @@ msgstr ""
 msgid "session key"
 msgstr ""
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr ""
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr ""
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr ""
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr ""
 

django/conf/locale/fr/LC_MESSAGES/django.po

@@ -800,19 +800,19 @@ msgstr "pages
 msgid "session key"
 msgstr "clé de session"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "donnée de session"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "date d'expiration"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "session"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sessions"
 
@@ -1256,5 +1256,8 @@ msgstr ""
 "Maintenez \"Control\", or \"Command\" sur un Mac, pour en sélectionner plus "
 "d'une."
 
+#~ msgid "Traditional Chinese"
+#~ msgstr "Chinois traditionnel"
+
 #~ msgid "Messages"
 #~ msgstr "Messages"

django/conf/locale/gl/LC_MESSAGES/django.po

@@ -250,6 +250,7 @@ msgid "Time"
 msgstr ""
 
 #: contrib/admin/views/doc.py:284 models/core.py:81
+#: contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr ""
 
@@ -563,6 +564,77 @@ msgstr "Grazas por usar o noso sitio web!"
 msgid "The %(site_name)s team"
 msgstr "O equipo de %(site_name)s"
 
+#: contrib/redirects/models/redirects.py:7 models/core.py:62
+msgid "redirect from"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:8 models/core.py:63
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:9 models/core.py:64
+msgid "redirect to"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:10 models/core.py:65
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:12 models/core.py:67
+msgid "redirect"
+msgstr ""
+
+#: contrib/redirects/models/redirects.py:13 models/core.py:68
+msgid "redirects"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:7 models/core.py:82
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:8 models/core.py:83
+msgid "title"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:9 models/core.py:84
+msgid "content"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:10 models/core.py:85
+msgid "enable comments"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:11 models/core.py:86
+msgid "template name"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13 models/core.py:88
+msgid "registration required"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:13 models/core.py:88
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:17 models/core.py:92
+msgid "flat page"
+msgstr ""
+
+#: contrib/flatpages/models/flatpages.py:18 models/core.py:93
+msgid "flat pages"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@@ -712,77 +784,12 @@ msgstr ""
 msgid "content types"
 msgstr ""
 
-#: models/core.py:62
-msgid "redirect from"
-msgstr ""
-
-#: models/core.py:63
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-
-#: models/core.py:64
-msgid "redirect to"
-msgstr ""
-
-#: models/core.py:65
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-
-#: models/core.py:67
-msgid "redirect"
-msgstr ""
-
-#: models/core.py:68
-msgid "redirects"
-msgstr ""
-
-#: models/core.py:82
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-
-#: models/core.py:83
-msgid "title"
-msgstr ""
-
-#: models/core.py:84
-msgid "content"
-msgstr ""
-
-#: models/core.py:85
-msgid "enable comments"
-msgstr ""
-
-#: models/core.py:86
-msgid "template name"
-msgstr ""
-
 #: models/core.py:87
 msgid ""
 "Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
 "use 'flatfiles/default'."
 msgstr ""
 
-#: models/core.py:88
-msgid "registration required"
-msgstr ""
-
-#: models/core.py:88
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-
-#: models/core.py:92
-msgid "flat page"
-msgstr ""
-
-#: models/core.py:93
-msgid "flat pages"
-msgstr ""
-
 #: models/core.py:114
 msgid "session key"
 msgstr ""

django/conf/locale/it/LC_MESSAGES/django.po

@@ -794,19 +794,19 @@ msgstr "pagine statiche"
 msgid "session key"
 msgstr "chiave di sessione"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "dati di sessione"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "data di scadenza"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sessione"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sessioni"
 

django/conf/locale/no/LC_MESSAGES/django.po

@@ -795,19 +795,19 @@ msgstr "flatsider"
 msgid "session key"
 msgstr "sesjon nøkkel"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "sesjon data"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "utløpsdato"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sesjon"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sesjoner"
 

django/conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -794,19 +794,19 @@ msgstr "páginas planas"
 msgid "session key"
 msgstr "chave da sessão"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "dados da sessão"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "data de expiração"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sessão"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sessões"
 

django/conf/locale/ro/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-10 12:53+0100\n"
+"POT-Creation-Date: 2005-11-11 23:12+0100\n"
 "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -310,6 +310,91 @@ msgstr "Mulţumesc pentru folosirea saitului nostru!"
 msgid "The %(site_name)s team"
 msgstr "Echipa %(site_name)s"
 
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "redirectat de la "
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. "
+"Exemplu: '/evenimente/cautare/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "redirectat la"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "redirectare"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "redictări"
+
+#: contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la "
+"sfîrşit."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "titlu"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "conţinut"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "permite comentarii"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "nume şablon"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va "
+"folosi 'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "necesită înregistrare"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "pagina plată"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "pagini plate"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Luni"
@@ -458,107 +543,23 @@ msgstr "tip conţinut"
 msgid "content types"
 msgstr "tipuri conţinute"
 
-#: models/core.py:68
+#: models/core.py:67
-msgid "redirect from"
-msgstr "redirectat de la "
-
-#: models/core.py:69
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. "
-"Exemplu: '/evenimente/cautare/'."
-
-#: models/core.py:70
-msgid "redirect to"
-msgstr "redirectat la"
-
-#: models/core.py:71
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu "
-"'http://'."
-
-#: models/core.py:73
-msgid "redirect"
-msgstr "redirectare"
-
-#: models/core.py:74
-msgid "redirects"
-msgstr "redictări"
-
-#: models/core.py:87
-msgid "URL"
-msgstr "URL"
-
-#: models/core.py:88
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la "
-"sfîrşit."
-
-#: models/core.py:89
-msgid "title"
-msgstr "titlu"
-
-#: models/core.py:90
-msgid "content"
-msgstr "conţinut"
-
-#: models/core.py:91
-msgid "enable comments"
-msgstr "permite comentarii"
-
-#: models/core.py:92
-msgid "template name"
-msgstr "nume şablon"
-
-#: models/core.py:93
-msgid ""
-"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
-"use 'flatfiles/default'."
-msgstr ""
-"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va "
-"folosi 'flatfiles/default'."
-
-#: models/core.py:94
-msgid "registration required"
-msgstr "necesită înregistrare"
-
-#: models/core.py:94
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina."
-
-#: models/core.py:98
-msgid "flat page"
-msgstr "pagina plată"
-
-#: models/core.py:99
-msgid "flat pages"
-msgstr "pagini plate"
-
-#: models/core.py:117
 msgid "session key"
 msgstr "cheie sesiune"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "date sesiune"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "data expirare"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "seiune"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sesiuni"
 

django/conf/locale/ru/LC_MESSAGES/django.po

@@ -785,19 +785,19 @@ msgstr ""
 msgid "session key"
 msgstr ""
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr ""
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr ""
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr ""
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr ""
 

django/conf/locale/sk/LC_MESSAGES/django.po

@@ -799,19 +799,19 @@ msgstr "ploché stránky"
 msgid "session key"
 msgstr "kľúč sedenia"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "údaje sedenia"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "dátum konca platnosti"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sedenie"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sedenia"
 
@@ -1244,37 +1244,12 @@ msgstr ""
 " Podržte \"Control\", alebo \"Command\" na  Mac_u, na výber viac ako jednej "
 "položky."
 
+# #-#-#-#-#  django.po (PACKAGE VERSION)  #-#-#-#-#
+# templates/blog/entries_detail.html:24
 #: commit
 msgid "Post a comment"
 msgstr "Pošli komentár"
 
-msgid "Comments"
-msgstr "Komentáre"
-
-msgid "Comment"
-msgstr "Komentár"
-
-msgid "Your name"
-msgstr "Vaše meno"
-
-msgid "Preview revised comment"
-msgstr "Ukázať upravený komentár"
-
-msgid "Post public comment"
-msgstr "Zveréjniť komentár"
-
-msgid "Preview comment"
-msgstr "Ukázať komentár"
-
-msgid "Posted by"
-msgstr "Poslané"
-
-msgid "Or edit it again"
-msgstr "Alebo ho vytvorte znova"
-
-msgid "Please correct the following errors."
-msgstr "Odstráňte nasledujúce chyby, prosím."
-
 msgid ""
 "Looks like you followed a bad link. If you think it is our fault, please <a "
 "href=\"http://doma.myvtoronte.com/staznost/\">let us know</a>"
@@ -1286,3 +1261,28 @@ msgid ""
 "Here is a link to the <a href=\"/\">homepage</a>. You know, just in case"
 msgstr ""
 "Tu je adresa <a href=\"/\">úvodnej stránky</a>. Ak by ste ju potrebovali"
+
+#~ msgid "Comment posted"
+#~ msgstr "Komentár bol poslaný"
+
+#~ msgid "Comment posted successfully"
+#~ msgstr "Komentár bol úspešne odoslaný"
+
+#~ msgid "Thanks for contributing."
+#~ msgstr "Ďakujeme za príspevok."
+
+#~ msgid "View your comment"
+#~ msgstr "Pozri svôj príspevok"
+
+# templates/blog/entries_detail.html:15
+#~ msgid "Comments"
+#~ msgstr "Komentáre"
+
+#~ msgid "Comment"
+#~ msgstr "Komentár"
+
+#~ msgid "Your name"
+#~ msgstr "Vaše meno"
+
+#~ msgid "Preview revised comment"
+#~ msgstr "Prezretie upraveného komentára"

django/conf/locale/sr/LC_MESSAGES/django.po

@@ -800,19 +800,19 @@ msgstr "statične strane"
 msgid "session key"
 msgstr "ključ sesije"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "podaci sesije"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "datum prestanka važenja sesije"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr "sesija"
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr "sesije"
 

django/conf/locale/zh_CN/LC_MESSAGES/django.po

@@ -785,19 +785,19 @@ msgstr "简单页面"
 msgid "session key"
 msgstr "session键字"
 
-#: models/core.py:118
+#: models/core.py:68
 msgid "session data"
 msgstr "session数据"
 
-#: models/core.py:119
+#: models/core.py:69
 msgid "expire date"
 msgstr "过期日期"
 
-#: models/core.py:121
+#: models/core.py:71
 msgid "session"
 msgstr ""
 
-#: models/core.py:122
+#: models/core.py:72
 msgid "sessions"
 msgstr ""
 

django/core/db/backends/ado_mssql.py

@@ -111,8 +111,9 @@ def get_relations(cursor, table_name):
     raise NotImplementedError
 
 def quote_name(name):
-    # TODO: Figure out how MS-SQL quotes database identifiers.
+    if name.startswith('[') and name.endswith(']'):
-    return name
+        return name # Quoting once is enough.
+    return '[%s]' % name
 
 OPERATOR_MAPPING = {
     'exact': '=',

docs/settings.txt

@@ -361,7 +361,7 @@ the 404 e-mailer. See ``SEND_BROKEN_LINK_EMAILS`` and ``IGNORABLE_404_ENDS``.
 INSTALLED_APPS
 --------------
 
-Default: Not defined
+Default: ``()`` (Empty tuple)
 
 A tuple of strings designating all applications that are enabled in this Django
 installation. Each string should be a full Python path to a Python package that