Changeset 2965

Timestamp:

05/22/06 10:19:32 (2 years ago)

Author:

jkocherhans

Message:

multi-auth: Merged to [2964]

Files:

• django/branches/multi-auth/django/conf/__init__.py (modified) (3 diffs)
• django/branches/multi-auth/django/conf/locale/he/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multi-auth/django/conf/locale/he/LC_MESSAGES/django.po (modified) (25 diffs)
• django/branches/multi-auth/django/conf/locale/ja/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multi-auth/django/conf/locale/ja/LC_MESSAGES/django.po (modified) (9 diffs)
• django/branches/multi-auth/django/conf/locale/zh_CN/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/multi-auth/django/conf/locale/zh_CN/LC_MESSAGES/django.po (modified) (61 diffs)
• django/branches/multi-auth/django/contrib/admin/templates/admin_doc/model_detail.html (modified) (1 diff)
• django/branches/multi-auth/django/contrib/admin/views/doc.py (modified) (2 diffs)
• django/branches/multi-auth/django/contrib/auth/decorators.py (modified) (2 diffs)
• django/branches/multi-auth/django/contrib/sites/managers.py (copied) (copied from django/trunk/django/contrib/sites/managers.py)
• django/branches/multi-auth/django/core/management.py (modified) (1 diff)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2 (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/base.py (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2/base.py)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/client.py (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2/client.py)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/creation.py (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2/creation.py)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/__init__.py (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2/__init__.py)
• django/branches/multi-auth/django/db/backends/postgresql_psycopg2/introspection.py (copied) (copied from django/trunk/django/db/backends/postgresql_psycopg2/introspection.py)
• django/branches/multi-auth/django/db/models/base.py (modified) (2 diffs)
• django/branches/multi-auth/django/template/defaultfilters.py (modified) (2 diffs)
• django/branches/multi-auth/django/utils/translation.py (modified) (2 diffs)
• django/branches/multi-auth/django/views/generic/create_update.py (modified) (1 diff)
• django/branches/multi-auth/docs/add_ons.txt (modified) (3 diffs)
• django/branches/multi-auth/docs/authentication.txt (modified) (1 diff)
• django/branches/multi-auth/docs/db-api.txt (modified) (1 diff)
• django/branches/multi-auth/docs/django-admin.txt (modified) (5 diffs)
• django/branches/multi-auth/docs/generic_views.txt (modified) (12 diffs)
• django/branches/multi-auth/docs/i18n.txt (modified) (1 diff)
• django/branches/multi-auth/docs/install.txt (modified) (2 diffs)
• django/branches/multi-auth/docs/middleware.txt (modified) (1 diff)
• django/branches/multi-auth/docs/model-api.txt (modified) (3 diffs)
• django/branches/multi-auth/docs/settings.txt (modified) (2 diffs)
• django/branches/multi-auth/docs/sites.txt (copied) (copied from django/trunk/docs/sites.txt)
• django/branches/multi-auth/docs/templates_python.txt (modified) (3 diffs)
• django/branches/multi-auth/docs/tutorial01.txt (modified) (5 diffs)
• django/branches/multi-auth/tests/othertests/templates.py (modified) (1 diff)
• django/branches/multi-auth/tests/runtests.py (modified) (4 diffs)

django/branches/multi-auth/django/conf/__init__.py

@@ -13 +13 @@
-ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
-
+class LazySettings:
+    """
+    A lazy proxy for either global Django settings or a custom settings object.
+    The user can manually configure settings prior to using them. Otherwise,
+    Django uses the settings module pointed to by DJANGO_SETTINGS_MODULE.
+    """
+    def __init__(self):
+        # _target must be either None or something that supports attribute
+        # access (getattr, hasattr, etc).
+        self._target = None
+
+    def __getattr__(self, name):
+        if self._target is None:
+            self._import_settings()
+        if name == '__members__':
+            # Used to implement dir(obj), for example.
+            return self._target.get_all_members()
+        return getattr(self._target, name)
+
+    def __setattr__(self, name, value):
+        if name == '_target':
+            # Assign directly to self.__dict__, because otherwise we'd call
+            # __setattr__(), which would be an infinite loop.
+            self.__dict__['_target'] = value
+        else:
+            setattr(self._target, name, value)
+
+    def _import_settings(self):
+        """
+        Load the settings module pointed to by the environment variable. This
+        is used the first time we need any settings at all, if the user has not
+        previously configured the settings manually.
+        """
+        try:
+            settings_module = os.environ[ENVIRONMENT_VARIABLE]
+            if not settings_module: # If it's set but is an empty string.
+                raise KeyError
+        except KeyError:
+            raise EnvironmentError, "Environment variable %s is undefined." % ENVIRONMENT_VARIABLE
+
+        self._target = Settings(settings_module)
+
+    def configure(self, default_settings=global_settings, **options):
+        """
+        Called to manually configure the settings. The 'default_settings'
+        parameter sets where to retrieve any unspecified values from (its
+        argument must support attribute access (__getattr__)).
+        """
+        if self._target != None:
+            raise EnvironmentError, 'Settings already configured.'
+        holder = UserSettingsHolder(default_settings)
+        for name, value in options.items():
+            setattr(holder, name, value)
+        self._target = holder
+
-class Settings:
-
-    def __init__(self, settings_module):
-
-        # update this dict from global settings (but only for ALL_CAPS settings)
-        for setting in dir(global_settings):
@@ -28 +81 @@
-            mod = __import__(self.SETTINGS_MODULE, '', '', [''])
-        except ImportError, e:
-is it on sys.path
+Is it on sys.path? Does it have syntax errors
-
-        # Settings that should be converted into tuples if they're mistakenly entered
@@ -57 +110 @@
-        os.environ['TZ'] = self.TIME_ZONE
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# install the translation machinery so that it is available
-from django.utils import translation
-translation.install()
-

django/branches/multi-auth/django/conf/locale/he/LC_MESSAGES/django.po

@@ -2 +2 @@
-# Copyright (C) 2006 THE Django'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Django package.
-# <>, 2006.
-# , fuzzy
-# <>, 2006.
-# 
-# 
-msgid ""
-msgstr ""
-1.0
+0.95
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:14+0200\n"
-4-04 14:29
+5-16 15:48
-"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"
-\n
+
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
@@ -89 +86 @@
-"removed\" message will be displayed instead."
-msgstr ""
-
+ 
-
-#: contrib/comments/models.py:91
-#, fuzzy
-msgid "comments"
-ה
+ות
-
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
@@ -128 +124 @@
-
-#: contrib/comments/models.py:176
-#, fuzzy
-msgid "free comment"
-msgstr "הערה אנונימית"
-
-#: contrib/comments/models.py:177
-#, fuzzy
-msgid "free comments"
-msgstr "הערות אנונימיות"
@@ -146 +140 @@
-
-#: contrib/comments/models.py:237
-#, fuzzy
-msgid "karma score"
-ציון
+ניקוד
-
-#: contrib/comments/models.py:238
-#, fuzzy
-msgid "karma scores"
-ציונ
+ניקוד
-
-#: contrib/comments/models.py:242
@@ -176 +168 @@
-
-#: contrib/comments/models.py:268
-#, fuzzy
-msgid "user flag"
-ן
+ון ע\"י
-
-#: contrib/comments/models.py:269
-#, fuzzy
-msgid "user flags"
-נ
+ונים ע\"
-
-#: contrib/comments/models.py:273
@@ -195 +185 @@
-
-#: contrib/comments/models.py:280
-#, fuzzy
-msgid "moderator deletion"
-ציה
+טור
-
-#: contrib/comments/models.py:281
-#, fuzzy
-msgid "moderator deletions"
-ציה
+טור
-
-#: contrib/comments/models.py:285
@@ -227 +215 @@
-
-#: contrib/comments/views/comments.py:112
-fuzzy, 
+
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
@@ -233 +221 @@
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
-"\n"
-"%(text)s"
-
-
+
+
+
-"\n"
-"%(text)s"
-msgstr[1] "
-ההודעה נשלחה ע\"י משתמש מפוקפק
+"תגובה זו נשלחה ע\"י משתמש אשר שלח פחות מ %(count)s 
+תגובות
-"\n"
-"%(text)s"
@@ -297 +285 @@
-
-#: contrib/comments/templates/comments/form.html:6
-#, fuzzy
-msgid "Forgotten your password?"
-נה את סיסמתי
+כחת את סיסמתך ?
-
-#: contrib/comments/templates/comments/form.html:8
@@ -323 +310 @@
-
-#: contrib/comments/templates/comments/form.html:12
-#, fuzzy
-msgid "Ratings"
- #1
+
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+נדרש
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-
+אופציונלי
-
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-
+שליחת תמונה
-
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-#, fuzzy
-msgid "Comment:"
-
+:
-
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-#, fuzzy
-msgid "Preview comment"
-הערה אנונימית
+תצוגה מקדימה של התגובה
-
-#: contrib/comments/templates/comments/freeform.html:4
-#, fuzzy
-msgid "Your name:"
-ם משתמש
+מך:
-
-#: contrib/admin/filterspecs.py:40
@@ -753 +736 @@
-#, python-format
-msgid "Models available in the %(name)s application."
-
+מודלים זמינים ביישום %(name)s.
-
-#: contrib/admin/templates/admin/index.html:28
@@ -835 +818 @@
-
-#: contrib/admin/templates/admin/change_form.html:30
-#, fuzzy
-msgid "Please correct the error below."
-
-
-
+
-
-#: contrib/admin/templates/admin/change_form.html:48
@@ -1140 +1120 @@
-
-#: contrib/auth/models.py:17
-#, fuzzy
-msgid "permission"
-msgstr "הרשאה"
-
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
-#, fuzzy
-msgid "permissions"
-msgstr "הרשאות"
-
-#: contrib/auth/models.py:29
-#, fuzzy
-msgid "group"
-msgstr "קבוצה"
-
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-#, fuzzy
-msgid "groups"
-msgstr "קבוצות"
@@ -1216 +1192 @@
-
-#: contrib/auth/models.py:67
-#, fuzzy
-msgid "user permissions"
-
+ משתמש
-
-#: contrib/auth/models.py:70
-#, fuzzy
-msgid "user"
-msgstr "משתמש"
-
-#: contrib/auth/models.py:71
-#, fuzzy
-msgid "users"
-msgstr "משתמשים"
@@ -1247 +1220 @@
-
-#: contrib/auth/models.py:219
-#, fuzzy
-msgid "message"
-msgstr "הודעה"
@@ -1258 +1230 @@
-
-#: contrib/contenttypes/models.py:25
-#, fuzzy
-msgid "python model class name"
-
+ה-class של 
-
-#: contrib/contenttypes/models.py:28
@@ -1395 +1366 @@
-
-#: utils/dates.py:19
-#, fuzzy
-msgid "jan"
-ו
+יאנ
-
-#: utils/dates.py:19
-msgid "feb"
-
+פבר
-
-#: utils/dates.py:19
-msgid "mar"
-
+מרץ
-
-#: utils/dates.py:19
-msgid "apr"
-
+אפר
-
-#: utils/dates.py:19
-#, fuzzy
-msgid "may"
-יום
+מאי
-
-#: utils/dates.py:19
-msgid "jun"
-
+יונ
-
-#: utils/dates.py:20
-msgid "jul"
-
+יול
-
-#: utils/dates.py:20
-msgid "aug"
-
+אוג
-
-#: utils/dates.py:20
-msgid "sep"
-
+ספט
-
-#: utils/dates.py:20
-msgid "oct"
-
+אוק
-
-#: utils/dates.py:20
-msgid "nov"
-
+נוב
-
-#: utils/dates.py:20
-msgid "dec"
-
+דצמ
-
-#: utils/dates.py:27
@@ -1473 +1442 @@
-
-#: utils/timesince.py:12
-#, fuzzy
-msgid "year"
-
-
-
+
-
-#: utils/timesince.py:13
-#, fuzzy
-msgid "month"
-
-
-
+
-
-#: utils/timesince.py:14
-#, fuzzy
-msgid "week"
-
-
-
+
-
-#: utils/timesince.py:15
-#, fuzzy
-msgid "day"
-
-
-
+
-
-#: utils/timesince.py:16
-#, fuzzy
-msgid "hour"
-
-
-
+
-
-#: utils/timesince.py:17
-#, fuzzy
-msgid "minute"
-
-
-
+
-
-#: conf/global_settings.py:37
@@ -1556 +1507 @@
-#: conf/global_settings.py:47
-msgid "Hungarian"
-
+הונגרית (Hungarian)
-
-#: conf/global_settings.py:48
@@ -1611 +1562 @@
-
-#: conf/global_settings.py:61
-#, fuzzy
-msgid "Ukrainian"
-ברזילאית - Brazil
+אוקראינית - Ukrain
-
-#: conf/global_settings.py:62
@@ -1743 +1693 @@
-
-#: core/validators.py:229
-fuzzy, 
+
-msgid "Watch your mouth! The word %s is not allowed here."
-
-
-
+
-
-#: core/validators.py:236
@@ -1786 +1734 @@
-
-#: core/validators.py:349
-fuzzy, 
+
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-[0] "יש להזין מספר עשרוני חוקי
-msgstr[1] "יש להזין מספר עשרוני חוקי
+ "נא להזין מספר שלם המכיל %s ספרה לכל היותר
+"נא להזין מספר שלם המכיל %s ספרות לכל היותר
-
-#: core/validators.py:352
-fuzzy, 
+
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
-[0] "יש להזין מספר עשרוני חוקי
-msgstr[1] "יש להזין מספר עשרוני חוקי
+ "נא·להזין·מספר·עשרוני·חוקי·המכיל·%s·ספרה·אחרי·הנקודה·לכל·היותר
+"נא להזין מספר עשרוני חוקי המכיל %s ספרות אחרי הנקודה לכל היותר
-
-#: core/validators.py:362
@@ -1896 +1842 @@
-
-#: db/models/fields/__init__.py:337
-#, fuzzy
-msgid "This value must be an integer."
-חזקה של %s
+מספר שלם
-
-#: db/models/fields/__init__.py:369
-#, fuzzy
-msgid "This value must be either True or False."
-חזקה של %s
+אמת או שקר
-
-#: db/models/fields/__init__.py:385
-#, fuzzy
-msgid "This field cannot be null."
-חוקי
+יכול להכיל null
-
-#: db/models/fields/__init__.py:562
@@ -1920 +1863 @@
-
-#: db/models/fields/related.py:579
-#, fuzzy
-msgid "Separate multiple IDs with commas."
-msgstr "יש להפריד מזהים מרובים בפסיקים."
-
-#: db/models/fields/related.py:581
-#, fuzzy
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
- יש להחזיק לחוץ את \"Control\" או \"Command\" על מק,
+החזק את \"Control\", או \"Command\" על מק, לחוץ
-
-#: db/models/fields/related.py:625
-fuzzy, 
+
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-
-
-
-
-
-
+
+
-
-#: forms/__init__.py:380
-fuzzy, 
+
-msgid "Ensure your text is less than %s character."
-
-
-
+
-
-#: forms/__init__.py:385
@@ -1979 +1913 @@
-msgstr "כן,לא,אולי"
-
-#~ msgid "label"
-#~ msgstr "תווית"
-
-#~ msgid "package"
-#~ msgstr "חבילה"
-
-#~ msgid "packages"
-#~ msgstr "חבילות"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a valid decimal number with at most %s total digit.Please "
-#~ "enter a valid decimal number with at most %s total digits."
-#~ msgstr ""
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "יש להזין מספר עשרוני חוקי עם %s ספרה לכל היותר.יש להזין מספר עשרוני חוקי "
-#~ "עם %s ספרות לכל היותר.\n"
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "יש להזין מספר עשרוני הכולל %s ספרה לכל היותר.יש להזין מספר עשרוני הכולל  %"
-#~ "s ספרות לכל היותר."
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a valid decimal number with at most %s decimal place.Please "
-#~ "enter a valid decimal number with at most %s decimal places."
-#~ msgstr ""
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "יש להזין מספר עשרוני חוקי עם %s ספרה אחרי הנקודה לכל היותר."
-#~ "יש·להזין·מספר·עשרוני·חוקי·עם·%s·ספרות·אחרי·הנקודה·לכל·היותר.\n"
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "יש להזין מספר עשרוני עם %s ספרה אחרי הנקודה העשרונית לכל היותר.יש להזין "
-#~ "מספר עשרוני עם %s ספרות אחרי הנקודה העשרונית לכל היותר."
-
-#~ msgid "Comments"
-#~ msgstr "תגובות"
-
-#, fuzzy
-#~ msgid ""
-#~ "This comment was posted by a user who has posted fewer than %(count)s "
-#~ "comment:\n"
-#~ "\n"
-#~ "%(text)sThis comment was posted by a user who has posted fewer than %"
-#~ "(count)s comments:\n"
-#~ "\n"
-#~ "%(text)s"
-#~ msgstr ""
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "התגובה נשלחה ע\"י משתמש בעל פחות מ %(count)s תגובה:\n"
-#~ "\n"
-#~ "%(text)sהתגובה·נשלחה·ע\"י·משתמש·בעל·פחות·מ·%(count)s·תגובות:\n"
-#~ "\n"
-#~ "%(text)s\n"
-#~ "#-#-#-#-#  django.po (Django 1.0)  #-#-#-#-#\n"
-#~ "התגובה נשלח ע\"י משתמש ששלח פחות מ %(count)s·תגובה:\n"
-#~ "\n"
-#~ "%(text)sהתגובה נשלח ע\"י משתמש ששלח פחות מ %(count)s·תגובות:\n"
-#~ "\n"
-#~ "%(text)s"

django/branches/multi-auth/django/conf/locale/ja/LC_MESSAGES/django.po

@@ -9 +9 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-6 10:13+02
-08 13:39
+8 00:21+09
+18 00:28
-"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
-"Language-Team: Japanese <django-ja@googlegroups.com>\n"
@@ -17 +17 @@
-"Content-Transfer-Encoding: 8bit\n"
-
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "ベンガル語"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "チェコ語"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "ウェールズ語"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "デンマーク語"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "ドイツ語"
+
+#: conf/global_settings.py:42
+msgid "Greek"
+msgstr "ギリシャ語"
+
+#: conf/global_settings.py:43
+msgid "English"
+msgstr "英語"
+
+#: conf/global_settings.py:44
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: conf/global_settings.py:45
+msgid "French"
+msgstr "フランス語"
+
+#: conf/global_settings.py:46
+msgid "Galician"
+msgstr "ガリシア語"
+
+#: conf/global_settings.py:47
+msgid "Hungarian"
+msgstr "ハンガリー語"
+
+#: conf/global_settings.py:48
+msgid "Hebrew"
+msgstr "ヘブライ語"
+
+#: conf/global_settings.py:49
+msgid "Icelandic"
+msgstr "アイスランド語"
+
+#: conf/global_settings.py:50
+msgid "Italian"
+msgstr "イタリア語"
+
+#: conf/global_settings.py:51
+msgid "Japanese"
+msgstr "日本語"
+
+#: conf/global_settings.py:52
+msgid "Dutch"
+msgstr "オランダ語"
+
+#: conf/global_settings.py:53
+msgid "Norwegian"
+msgstr "ノルウェー語"
+
+#: conf/global_settings.py:54
+msgid "Brazilian"
+msgstr "ブラジル語"
+
+#: conf/global_settings.py:55
+msgid "Romanian"
+msgstr "ルーマニア語"
+
+#: conf/global_settings.py:56
+msgid "Russian"
+msgstr "ロシア語"
+
+#: conf/global_settings.py:57
+msgid "Slovak"
+msgstr "スロバキア語"
+
+#: conf/global_settings.py:58
+#, fuzzy
+msgid "Slovenian"
+msgstr "スロヴェニア語"
+
+#: conf/global_settings.py:59
+msgid "Serbian"
+msgstr "セルビア語"
+
+#: conf/global_settings.py:60
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: conf/global_settings.py:61
+#, fuzzy
+msgid "Ukrainian"
+msgstr "ウクライナ語"
+
+#: conf/global_settings.py:62
+msgid "Simplified Chinese"
+msgstr "簡体字中国語"
+
+#: conf/global_settings.py:63
+msgid "Traditional Chinese"
+msgstr "繁体字中国語"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>%s で絞り込む</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "全て"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "いつでも"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "今日"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "過去 7 日間"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "今月"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "今年"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "はい"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "いいえ"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "不明"
+
+#: contrib/admin/models.py:16
+msgid "action time"
+msgstr "操作時刻"
+
+#: contrib/admin/models.py:19
+msgid "object id"
+msgstr "オブジェクト ID"
+
+#: contrib/admin/models.py:20
+msgid "object repr"
+msgstr "オブジェクトの文字列表現"
+
+#: contrib/admin/models.py:21
+msgid "action flag"
+msgstr "操作種別"
+
+#: contrib/admin/models.py:22
+msgid "change message"
+msgstr "変更メッセージ"
+
+#: contrib/admin/models.py:25
+msgid "log entry"
+msgstr "ログエントリ"
+
+#: contrib/admin/models.py:26
+msgid "log entries"
+msgstr "ログエントリ"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "ページが見つかりません"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。"
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "ホーム"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "サーバエラー"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "サーバエラー (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "サーバエラー <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"エラーが発生しました。エラーをサイトの管理者にメールで報告しましたので、近い"
+"うちに修正されるはずです。しばらくお待ちください。"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "ようこそ"
+
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Documentation"
+msgstr "ドキュメント"
+
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Change password"
+msgstr "パスワードの変更"
+
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/model_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/comments/templates/comments/form.html:8
+msgid "Log out"
+msgstr "ログアウト"
+
+#: contrib/admin/templates/admin/base_site.html:4