diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index ee64845d81..d806a1107f 100644
Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index 61d89fdc16..29b0848ae6 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:44+0100\n"
"PO-Revision-Date: 2005-11-12 20:05+0530\n"
"Last-Translator: Baishampayan Ghose \n"
"Language-Team: Ankur Bangla \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "বস্তু আই.ডি."
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "অভ্যন্তরস্থ বস্তু"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "ই-মেল ঠিকানা"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "অভ্যন্তরস্থ বস্তু ধরন"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "প্রথম নাম"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "ই-মেল ঠিকানা"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "শেষ তারিখ"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "চ্যাপ্টা পাতা"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "ব্যবহারকারী"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "ব্যবহারকারী"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "অধিবেশন তথ্য"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "মন্তব্য সক্রিয় করুন"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "জ্যাঙ্গো পরিচালনা"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "সোমবার"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "নভে."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "ডিসেম্বর"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "ই-মেল ঠিকানা"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1077,102 +1308,102 @@ msgstr "ওয়েল্শ"
msgid "Danish"
msgstr "স্প্যানিশ"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "জার্মান"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "ইংরেজী"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "স্প্যানিশ"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "ফরাসী"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "গ্যালিসিয়"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "ইতালিয়"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "নরওয়েজিয়"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "ব্রাজিলীয়"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "রোমানীয়"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "রুশ"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "স্লোভাক"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "সার্বিয়ান"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "সরলীকৃত চীনা"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "এই ক্ষেত্রেটি অবৈধ।"
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।"
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "একটি গোটা সংখ্যা ঢোকান।"
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "একটি গোটা সংখ্যা ঢোকান।"
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "একটি গোটা সংখ্যা ঢোকান।"
@@ -1459,12 +1690,12 @@ msgstr ""
"একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে "
"রাখুন।"
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index c660f5beeb..282e10f084 100644
Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 2b7d429519..b1e36415a5 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Czech translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
-"PO-Revision-Date: 2005-10-31 19:42+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
+"PO-Revision-Date: 2005-11-18 14:33+0100\n"
"Last-Translator: Radek Svarz \n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
@@ -19,67 +19,287 @@ msgstr ""
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
-#: contrib/comments/views/karma.py:18
-msgid "Anonymous users cannot vote"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "Ukázat id objektu"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
msgstr ""
-#: contrib/comments/views/karma.py:22
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
#, fuzzy
-msgid "Invalid comment ID"
+msgid "comment"
+msgstr "obsah"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+msgid "IP address"
+msgstr "IP adresa"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
msgstr "povolit komentáře"
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "typ obsahu"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "křestní jméno"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "IP adresa"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "povolit komentáře"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "povolit komentáře"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "datum expirace"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "statická stránka"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Uživatel"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Uživatelé"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, fuzzy, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Tento komentář byl odevzdán povrchním uživatelem:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "data sezení"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "Anonymní uživatelé nemohou hlasovat"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "Neplatné ID komentáře"
+
#: contrib/comments/views/karma.py:24
msgid "No voting for yourself"
-msgstr ""
+msgstr "Nelze hlasovat pro sebe"
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
+"Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné "
+"hodnocení."
-#: contrib/comments/views/comments.py:108
-#, python-format
+#: contrib/comments/views/comments.py:109
+#, fuzzy, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
+msgstr[2] ""
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
+"\n"
+"%(text)s"
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
"\n"
"%(text)s"
msgstr ""
+"Tento komentář byl odevzdán povrchním uživatelem:\n"
+"\n"
+"%(text)s"
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Je povolená pouze metoda POST"
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
-msgid "One or more of the required fields wasn't submitted"
-msgstr ""
-
-#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:190
#: contrib/comments/views/comments.py:281
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Jedno nebo více povinných polí nebylo vyplněné"
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)"
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
+"Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
+msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'"
#: contrib/admin/models/admin.py:6
msgid "action time"
@@ -111,7 +331,7 @@ msgstr "log záznamy"
#: contrib/admin/templatetags/admin_list.py:283
msgid "All dates"
-msgstr ""
+msgstr "Všechna data"
#: contrib/admin/views/decorators.py:22
#: contrib/admin/templates/admin/login.html:24
@@ -123,21 +343,31 @@ msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
+"Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše "
+"podání je uloženo."
#: contrib/admin/views/decorators.py:63
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
+"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, "
+"zapněte cookies, obnovte tuto stránku a zkuste znovu."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Uživatelská jména nemohou obsahovat znak '@'."
#: contrib/admin/views/decorators.py:79
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
+
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django správa"
#: contrib/admin/views/main.py:84
#, python-format
@@ -145,176 +375,201 @@ msgid ""
"By %s:
\n"
"\n"
msgstr ""
+"Od %s:
\n"
+"\n"
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
+msgstr "Vše"
+
+#: contrib/admin/views/main.py:152
+#, fuzzy
+msgid "Any date"
+msgstr "Všechna data"
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Pondělí"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
msgstr ""
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "List."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
-msgstr ""
+msgstr "Neznámé"
#: contrib/admin/views/main.py:208
#, python-format
msgid "Select %s"
-msgstr ""
+msgstr "Vybrat %s"
#: contrib/admin/views/main.py:209
#, python-format
msgid "Select %s to change"
-msgstr ""
+msgstr "Vyberte %s pro změnu"
#: contrib/admin/views/main.py:572
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
msgid "You may edit it again below."
-msgstr ""
+msgstr "Můžete to opět upravit níže."
#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
#, python-format
msgid "You may add another %s below."
-msgstr ""
+msgstr "Můžete přidat další %s níže."
#: contrib/admin/views/main.py:602
-#, fuzzy, python-format
+#, python-format
msgid "Add %s"
-msgstr "Přidat"
+msgstr "%s: přidat"
#: contrib/admin/views/main.py:618
#, python-format
msgid "Added %s."
-msgstr ""
+msgstr "Záznam %s byl přidán."
#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
#: contrib/admin/views/main.py:622
msgid "and"
-msgstr ""
+msgstr "a"
#: contrib/admin/views/main.py:620
-#, fuzzy, python-format
+#, python-format
msgid "Changed %s."
-msgstr "Změnit"
+msgstr "%s: změněno"
#: contrib/admin/views/main.py:622
#, python-format
msgid "Deleted %s."
-msgstr ""
+msgstr "Záznam %s byl smazán."
#: contrib/admin/views/main.py:625
msgid "No fields changed."
-msgstr ""
+msgstr "Nebyly změněny žádné pole."
#: contrib/admin/views/main.py:650
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
#: contrib/admin/views/main.py:659
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
+"The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
#: contrib/admin/views/main.py:697
-#, fuzzy, python-format
+#, python-format
msgid "Change %s"
-msgstr "Změnit"
+msgstr "%s: změnit"
#: contrib/admin/views/main.py:777
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
#: contrib/admin/views/main.py:782
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
#: contrib/admin/views/main.py:811
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
#: contrib/admin/views/main.py:814
msgid "Are you sure?"
-msgstr ""
+msgstr "Jste si jist(á)?"
#: contrib/admin/views/main.py:829
-#, fuzzy, python-format
+#, python-format
msgid "Change history: %s"
-msgstr "Změnit heslo"
+msgstr "Historie změn: %s"
#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
msgid "Integer"
-msgstr ""
+msgstr "Celé číslo"
#: contrib/admin/views/doc.py:263
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (buď Ano (True), nebo Ne (False))"
#: contrib/admin/views/doc.py:264
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Text (maximálně %(maxlength)s znaků)"
#: contrib/admin/views/doc.py:265
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Celá čísla oddělená čárkou"
#: contrib/admin/views/doc.py:266
-#, fuzzy
msgid "Date (without time)"
-msgstr "čas akce"
+msgstr "Datum (bez času)"
#: contrib/admin/views/doc.py:267
-#, fuzzy
msgid "Date (with time)"
-msgstr "Datum/čas"
+msgstr "Datum (s časem)"
#: contrib/admin/views/doc.py:268
-#, fuzzy
msgid "E-mail address"
-msgstr "E-mailová adresa:"
+msgstr "E-mailová adresa"
#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
msgid "File path"
-msgstr ""
+msgstr "Cesta k souboru"
#: contrib/admin/views/doc.py:270
-#, fuzzy
msgid "Decimal number"
-msgstr "Prosinec"
-
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "e-mailová adresa"
+msgstr "Desetiné číslo"
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))"
#: contrib/admin/views/doc.py:277
-#, fuzzy
msgid "Phone number"
-msgstr "Vložte celé číslo."
+msgstr "Telefonní číslo"
#: contrib/admin/views/doc.py:280
msgid "String (up to 50)"
-msgstr ""
+msgstr "Text (max. 50 znaků)"
#: contrib/admin/views/doc.py:282
msgid "Text"
-msgstr ""
+msgstr "Text"
#: contrib/admin/views/doc.py:283
msgid "Time"
-msgstr ""
+msgstr "Čas"
#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
msgid "URL"
@@ -322,15 +577,15 @@ msgstr "URL"
#: contrib/admin/views/doc.py:285
msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Stát US (2 velké znaky)"
#: contrib/admin/views/doc.py:286
msgid "XML text"
-msgstr ""
+msgstr "text XML"
#: contrib/admin/templates/admin/template_debug.html:6
msgid "Error in Template"
-msgstr ""
+msgstr "Chyba v šabloně"
#: contrib/admin/templates/admin/template_debug.html:8
#, python-format
@@ -338,6 +593,8 @@ msgid ""
"\n"
"In template %(name)s, error at line %(line)s:\n"
msgstr ""
+"\n"
+"V šabloně %(name)s, chyba na řádce %(line)s:\n"
#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
@@ -354,9 +611,9 @@ msgid "Home"
msgstr "Domů"
#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
+#, python-format
msgid "Add %(name)s"
-msgstr "Přidat"
+msgstr "%(name)s: přidat"
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -463,24 +720,25 @@ msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
-msgstr ""
+msgstr "Pohled na stránku"
#: contrib/admin/templates/admin/change_form.html:28
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
+msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
+msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
-msgstr ""
+msgstr "Objednávání"
#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
-msgstr ""
+msgstr "Objednávka:"
#: contrib/admin/templates/admin/delete_confirmation.html:7
-#, fuzzy, python-format
+#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
"objects, but your account doesn't have permission to delete the following "
@@ -516,29 +774,28 @@ msgstr "Odhlásit se"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
-msgstr ""
+msgstr "Smazat"
#: contrib/admin/templates/admin/submit_line.html:4
msgid "Save as new"
-msgstr ""
+msgstr "Uložit jako nové"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save and add another"
-msgstr ""
+msgstr "Uložit a přidat další"
#: contrib/admin/templates/admin/submit_line.html:6
msgid "Save and continue editing"
-msgstr ""
+msgstr "Uložit a pokračovat v úpravách"
#: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
msgid "Save"
-msgstr "aktivní"
+msgstr "Uložit"
#: contrib/admin/templates/admin/filter.html:1
#, python-format
msgid " By %(title)s "
-msgstr ""
+msgstr "Od %(title)s"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -656,15 +913,15 @@ msgstr "Tým %(site_name)s"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
-msgstr ""
+msgstr "Dokumentace"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
-msgstr ""
+msgstr "Bookmarklety"
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Dokumentační bookmarklety"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
msgid ""
@@ -676,43 +933,57 @@ msgid ""
"as \"internal\" (talk to your system administrator if you aren't sure if\n"
"your computer is \"internal\").
\n"
msgstr ""
+"\n"
+"Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše "
+"záložky (oblíbené),\n"
+"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám "
+"(oblíbeným). Nyní můžete\n"
+"zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n"
+"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je "
+"nastaven jako\n"
+"\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste jisti,\n"
+"zda je Váš počítač \"interní\").
\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
-msgstr ""
+msgstr "Dokumentace pro tuto stránku"
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
msgstr ""
+"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto "
+"stránku."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#, fuzzy
msgid "Show object ID"
-msgstr "object id"
+msgstr "Ukázat id objektu"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+#, fuzzy
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
+"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden "
+"objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Upravit tento objekt (ve stávajícím okně)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Přepne do admin stránky pro stránky, které reprezentují jeden objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Upravit tento objekt (ve novém okně)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:29
msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr "Jako výše, ale otevře admin stránky v novém okně."
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
@@ -768,7 +1039,6 @@ msgid "template name"
msgstr "jméno šablony"
#: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
msgid ""
"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
"use 'flatpages/default'."
@@ -1019,9 +1289,8 @@ msgid "Use an MD5 hash -- not the raw password."
msgstr "Použije se MD5 hash -- ne čisté heslo."
#: models/auth.py:38
-#, fuzzy
msgid "staff status"
-msgstr "povolí přístup do administrativní aplikace"
+msgstr "administrativní přístup "
#: models/auth.py:38
msgid "Designates whether the user can log into this admin site."
@@ -1080,109 +1349,103 @@ msgid "Welsh"
msgstr "Welšsky"
#: conf/global_settings.py:40
-#, fuzzy
msgid "Danish"
-msgstr "Španělsky"
+msgstr "Dánsky"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Německy"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Anglicky"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Španělsky"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Francouzsky"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galicijsky"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr "Islandština"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italsky"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norsky"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brazilsky"
-#: conf/global_settings.py:49
-msgid "Romanian"
-msgstr ""
-
#: conf/global_settings.py:50
+msgid "Romanian"
+msgstr "Rumunsky"
+
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Rusky"
-#: conf/global_settings.py:51
-msgid "Slovak"
-msgstr ""
-
#: conf/global_settings.py:52
+msgid "Slovak"
+msgstr "Slovensky"
+
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Srbsky"
-#: conf/global_settings.py:53
-msgid "Swedish"
-msgstr ""
-
#: conf/global_settings.py:54
+msgid "Swedish"
+msgstr "Švédsky"
+
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Jednoduchá čínština"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
-#, fuzzy
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
-msgstr "Toto pole není platné."
+msgstr "Toto pole je povinné."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
-msgstr ""
+msgstr "Ujistěte se, že Váš text má méně, než %s znaků."
-#: core/formfields.py:333
-#, fuzzy
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
-msgstr "Malá písmena zde nejsou povolená."
+msgstr "Zalomení řádky zde nenjsou povolená."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr ""
+msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s."
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
-msgstr ""
-
-#: core/formfields.py:648
-#, fuzzy
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Vložte celé číslo."
+msgstr "Odevzdaný soubor je prázdný."
#: core/formfields.py:657
-#, fuzzy
-msgid "Enter a positive number."
-msgstr "Vložte celé číslo."
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Vložte celé číslo mezi -32,768 a 32,767."
#: core/formfields.py:666
-#, fuzzy
+msgid "Enter a positive number."
+msgstr "Vložte celé kladné číslo."
+
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
-msgstr "Vložte celé číslo."
+msgstr "Vložte celé číslo mezi 0 a 32,767."
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
@@ -1455,14 +1718,14 @@ msgstr ""
"\"%(start)s\".)"
#: core/meta/fields.py:46
-#, fuzzy, python-format
+#, python-format
msgid "Please enter a valid %s."
-msgstr "Prosíme, zadejte platnou IP adresu."
+msgstr "Prosíme, zadejte %s správně."
#: core/meta/fields.py:60
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
+msgstr "%(optname)s s tímto %(fieldname)s již existuje."
#: core/meta/fields.py:131
msgid " Separate multiple IDs with commas."
@@ -1475,20 +1738,21 @@ msgstr ""
"Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
"položky."
-#: core/meta/fields.py:502
-#, fuzzy
+#: core/meta/fields.py:504
msgid "Enter a valid filename."
-msgstr "Vložte platnou e-mailovou adresu."
+msgstr "Vložte platný název souboru."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
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"
-msgstr[0] ""
+msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná."
msgstr[1] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
msgstr[2] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
#, fuzzy
#~ msgid "count"
-#~ msgstr "obsah"
+#~ msgstr "počet"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 88941309ce..2c2c44086b 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 3649198542..ded2ebd8da 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:44+0100\n"
"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
"Last-Translator: Jason Davies \n"
"Language-Team: Cymraeg \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "id gwrthrych"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "cynnwys"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "cyfeiriad e-bost"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "galluogi sylwadau"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "math cynnwys"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "enw cyntaf"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "cyfeiriad e-bost"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "galluogi sylwadau"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "galluogi sylwadau"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "dyddiad darfod"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "tudalen fflat"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Defnyddiwr"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Defnyddwyr"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "data sesiwn"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "galluogi sylwadau"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Gweinyddiad Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Dydd Llun"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Tach."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Rhagfyr"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "cyfeiriad e-bost"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1080,102 +1311,102 @@ msgstr "Cymraeg"
msgid "Danish"
msgstr "Spaeneg"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Almaeneg"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Saesneg"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spaeneg"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Ffrangeg"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galisieg"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Eidaleg"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norwyeg"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasileg"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Rwsieg"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Tsieinëeg Symledig"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Mae'r faes yma yn annilydd."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Ni chaniateir lythrennau bach yma."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Rhowch rhif cyfan."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Rhowch rhif cyfan."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Rhowch rhif cyfan."
@@ -1467,12 +1698,12 @@ msgid ""
msgstr ""
"Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Rhowch cyfeiriad e-bost ddilys."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 8fbe645ff2..67f76d02b9 100644
Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 8197e48f6d..8a83c05845 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/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-15 12:41-0600\n"
+"POT-Creation-Date: 2005-11-18 15:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Morten Bagai \n"
"Language-Team: Danish\n"
@@ -16,6 +16,268 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "objekt id"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "indhold"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-mail adresse"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "indholdstype"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "fornavn"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "e-mail adresse"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "udløbsdato"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "flad side"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Bruger"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Brugere"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "sessionsdata"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr ""
+
+#: contrib/comments/views/karma.py:22
+#, fuzzy
+msgid "Invalid comment ID"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr ""
+
+#: contrib/comments/views/comments.py:25
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+
+#: contrib/comments/views/comments.py:109
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr ""
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr ""
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr ""
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr ""
+
#: contrib/admin/models/admin.py:6
msgid "action time"
msgstr "handlingstid"
@@ -44,18 +306,333 @@ msgstr "logmeddelelse"
msgid "log entries"
msgstr "logmeddelelser"
-#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templatetags/admin_list.py:283
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Log ind"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django administration"
+
+#: contrib/admin/views/main.py:84
+#, python-format
+msgid ""
+"By %s:
\n"
+"\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
+msgid "All"
+msgstr ""
+
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Mandag"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/views/main.py:194
+msgid "Unknown"
+msgstr ""
+
+#: contrib/admin/views/main.py:208
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:209
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:572
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:602
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Tilføj"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:622
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Ændre"
+
+#: contrib/admin/views/main.py:622
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:625
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:650
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:659
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:697
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Ændre"
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:782
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:811
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:814
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:829
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Ændre adgangskode"
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "handlingstid"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Dato/tid"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "E-mail adresse:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "December"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Indtast et heltal."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "Internetadresse"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr ""
+
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/admin/base.html:29
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Home"
msgstr "Hjem"
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Tilføj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Ændre"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigehed til at foretage ændringer"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Seneste handlinger"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mine handlinger"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ingen tilgængelige"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfejl"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfejl (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "Serverfejl (500)"
+
+#: 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 ""
+"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
+"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
+
#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historik"
@@ -91,59 +668,6 @@ msgstr "Django site administration"
msgid "Django administration"
msgstr "Django administration"
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfejl"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfejl (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr "Serverfejl (500)"
-
-#: 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 ""
-"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
-"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Siden blev ikke fundet"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
-
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Tilføj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Ændre"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigehed til at foretage ændringer"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Seneste handlinger"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mine handlinger"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ingen tilgængelige"
-
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
msgstr "Brugernavn:"
@@ -156,21 +680,32 @@ msgstr "Adgangskode:"
msgid "Have you forgotten your password?"
msgstr "Har du glemt din adgangskode?"
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Log ind"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Siden blev ikke fundet"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ændre adgangskode"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ud"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
#: contrib/admin/templates/admin/delete_confirmation.html:7
#, python-format
@@ -195,6 +730,44 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ja, jeg er sikker"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Ændre adgangskode"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ud"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktiv"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
+
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_change_form.html:6
@@ -311,6 +884,66 @@ msgstr "Tak, fordi du brugte vores site!"
msgid "The %(site_name)s team"
msgstr "Med venlig hilsen %(site_name)s"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site. Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").
\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "objekt id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "omadresser fra"
@@ -343,10 +976,6 @@ msgstr "omadressering"
msgid "redirects"
msgstr "omaddresseringer"
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "Internetadresse"
-
#: contrib/flatpages/models/flatpages.py:7
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -669,83 +1298,123 @@ msgstr "Vigtige datoer"
msgid "Message"
msgstr "Meddelelse"
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
msgid "Bengali"
msgstr ""
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
msgid "Czech"
msgstr "Tjekkisk"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "Welsh"
msgstr "Walisisk"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
#, fuzzy
msgid "Danish"
msgstr "Spansk"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galicisk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasiliansk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "Rumænsk"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Simpel Kinesisk"
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
+#, fuzzy
+msgid "This field is required."
+msgstr "Dette felt er ugyldigt."
+
+#: core/formfields.py:338
+#, python-format
+msgid "Ensure your text is less than %s characters."
+msgstr ""
+
+#: core/formfields.py:342
+#, fuzzy
+msgid "Line breaks are not allowed here."
+msgstr "Små bogstaver er ikke tilladt her"
+
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr ""
+
+#: core/formfields.py:603
+msgid "The submitted file is empty."
+msgstr ""
+
+#: core/formfields.py:657
+#, fuzzy
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Indtast et heltal."
+
+#: core/formfields.py:666
+#, fuzzy
+msgid "Enter a positive number."
+msgstr "Indtast et heltal."
+
+#: core/formfields.py:675
+#, fuzzy
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Indtast et heltal."
+
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Dette felt må kun indeholde bogstaver, tal og understreger."
@@ -1009,15 +1678,38 @@ msgstr ""
"\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen "
"starter med \"%(start)s\".)"
-#: core/meta/fields.py:111
+#: core/meta/fields.py:46
+#, fuzzy, python-format
+msgid "Please enter a valid %s."
+msgstr "Venlist indtast en gyldig email-adresse."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr ""
+
+#: core/meta/fields.py:131
msgid " Separate multiple IDs with commas."
msgstr "Adskil id'er med kommaer."
-#: core/meta/fields.py:114
+#: core/meta/fields.py:134
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hold \"Kontrol\", eller \"Æbletasten\" på Mac, nede for at vælge mere end en."
+#: core/meta/fields.py:504
+#, fuzzy
+msgid "Enter a valid filename."
+msgstr "Indtast en gyldig email-adresse."
+
+#: core/meta/fields.py:773
+#, python-format
+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"
+msgstr[0] ""
+msgstr[1] ""
+
#~ msgid "Traditional Chinese"
#~ msgstr "Traditionel Kinesisk"
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 7cc6f9379e..2163d3099c 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 6338b9c96a..2184f7831b 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/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: 2005-11-15 18:00+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-08 00:03+0200\n"
"Last-Translator: Georg Bauer \n"
"MIME-Version: 1.0\n"
@@ -216,27 +216,37 @@ msgstr "Ung
msgid "No voting for yourself"
msgstr "Keine Abstimmung bei Dir selber"
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
"Die Abstimmung ist zwangsweise, weil Du an mindestens einer anderen "
"Abstimmung teilnimmst."
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s "
+"Kommentar:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s "
"Kommentaren:\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -247,24 +257,24 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr "Nur POST ist erlaubt"
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr "Eines oder mehrere der erforderlichen Felder fehlt"
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
"Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)"
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
@@ -272,8 +282,8 @@ msgstr ""
"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-"
"ID ist ungltig."
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
"Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
@@ -1332,99 +1342,99 @@ msgstr "Walisisch"
msgid "Danish"
msgstr "Dnisch"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Deutsch"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Englisch"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spanisch"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Franzsisch"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr "Islndisch"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norwegisch"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasilianisch"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "Rumnisch"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "Slowakisch"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr "Schwedisch"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
msgstr "Dieses Feld ist zwingend."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr "Bitte sicherstellen, das der Text weniger als %s Zeichen hat."
-#: core/formfields.py:333
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
msgstr "Zeilenumbrche sind hier nicht erlaubt."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
"Bitte eine gltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s."
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr "Die ausgewhlte Datei ist leer."
-#: core/formfields.py:648
+#: core/formfields.py:657
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben."
-#: core/formfields.py:657
+#: core/formfields.py:666
msgid "Enter a positive number."
msgstr "Bitte eine ganze, positive Zahl eingeben."
-#: core/formfields.py:666
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
@@ -1722,11 +1732,11 @@ msgstr ""
" Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
"\", beim Klicken gedrckt halten."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
msgid "Enter a valid filename."
msgstr "Bitte einen gltigen Dateinamen eingeben"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index da3d9ea973..ee1bcfa67c 100644
Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index a8d0425b5f..e2753f2b58 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/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-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,6 +16,186 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr ""
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+msgid "IP address"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr ""
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr ""
+
+#: contrib/comments/models/comments.py:166
+msgid "ip address"
+msgstr ""
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:251
+msgid "User flag"
+msgstr ""
+
+#: contrib/comments/models/comments.py:252
+msgid "User flags"
+msgstr ""
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -28,21 +208,27 @@ msgstr ""
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -50,30 +236,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -135,6 +321,10 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+msgid "Site administration"
+msgstr ""
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -143,9 +333,38 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "No"
+msgstr ""
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -282,10 +501,6 @@ msgstr ""
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:274
-msgid "IP address"
-msgstr ""
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1045,98 +1260,98 @@ msgstr ""
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr ""
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
msgstr ""
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
msgstr ""
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:657
+#: core/formfields.py:666
msgid "Enter a positive number."
msgstr ""
-#: core/formfields.py:666
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
msgstr ""
@@ -1404,11 +1619,11 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
msgid "Enter a valid filename."
msgstr ""
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 42c2a7e325..2f2cd446a4 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 86a9f1c293..c176f83d7b 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-04 20:59GMT\n"
"Last-Translator: Ricardo Javier Crdenes Medina \n"
@@ -17,6 +17,190 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr ""
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "Direccin de correo:"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr ""
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr ""
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "Direccin de correo:"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Usuario"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Usuario"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +213,27 @@ msgstr ""
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +241,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -137,6 +327,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administracin de Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -145,9 +340,38 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "No"
+msgstr ""
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +511,6 @@ msgstr ""
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "Direccin de correo:"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1073,99 +1292,99 @@ msgstr ""
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr ""
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
msgstr ""
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
msgstr ""
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Direccin de correo:"
-#: core/formfields.py:666
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
msgstr ""
@@ -1435,12 +1654,12 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Direccin de correo:"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 65b208a39e..92aebe0799 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index ab8ffcce4b..464910d03c 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
"Last-Translator: Laurent Rahuel \n"
"Language-Team: franais \n"
@@ -15,6 +15,200 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "id de l'objet"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "contenu"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "courriel"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "autoriser les commentaires"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "type de contenu"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "prnom"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "courriel"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "autoriser les commentaires"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "autoriser les commentaires"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "date d'expiration"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "page plat"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Utilisateur"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Utilisateurs"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "donne de session"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -28,21 +222,27 @@ msgstr "autoriser les commentaires"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -50,30 +250,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -135,6 +335,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administration de Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -143,9 +348,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Lundi"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -286,11 +522,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Dcembre"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "courriel"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1088,104 +1319,104 @@ msgstr ""
msgid "Danish"
msgstr "Espagnol"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Allemand"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Anglais"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Espagnol"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Franais"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
#, fuzzy
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brsilien"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
#, fuzzy
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Ce champ est invalide."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Les lettres minuscules ne sont pas autorises ici."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Entrez un nombre entier."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Entrez un nombre entier."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Entrez un nombre entier."
@@ -1485,12 +1716,12 @@ msgstr ""
"Maintenez \"Control\", or \"Command\" sur un Mac, pour en slectionner plus "
"d'une."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Entrez une adresse de courriel valide."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index e8b7eb8f96..ed741a8665 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index f144e4f0a6..c1e55100e5 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-16 14:29+0100\n"
"Last-Translator: Afonso Fernández Nogueira \n"
"Language-Team: Galego\n"
@@ -17,6 +17,190 @@ msgstr ""
"X-Poedit-Language: Galician\n"
"X-Poedit-SourceCharset: utf-8\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr ""
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "Enderezo de correo electrónico:"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr ""
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr ""
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "Enderezo de correo electrónico:"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Usuario"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Usuario"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +213,27 @@ msgstr ""
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +241,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -137,6 +327,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administración de Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -145,9 +340,38 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "No"
+msgstr ""
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +511,6 @@ msgstr ""
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "Enderezo de correo electrónico:"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1072,99 +1291,99 @@ msgstr ""
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr ""
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
msgstr ""
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
msgstr ""
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Enderezo de correo electrónico:"
-#: core/formfields.py:666
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
msgstr ""
@@ -1434,12 +1653,12 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Enderezo de correo electrónico:"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 939d9cbaab..5cc9c2c176 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 79f57db8f1..ca0104110e 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/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: 2005-11-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:44+0100\n"
"PO-Revision-Date: 2005-11-13 18:08-0000\n"
"Last-Translator: Dagur Páll Ammendrup \n"
"Language-Team: \n"
@@ -18,6 +18,200 @@ msgstr ""
"X-Poedit-Country: ICELAND\n"
"Plural-Forms: nplurals=2; plural=n != 1\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "einkenni hlutar"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "innihald"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "tölvupóstfang"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "efnistag"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "fornafn"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "tölvupóstfang"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "fyrningardagsetning"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "flöt síða"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Notandi"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Notendur"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "setugögn"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -31,21 +225,27 @@ msgstr "virkja athugasemdir"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -53,30 +253,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -138,6 +338,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django vefstjórn"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -146,9 +351,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "mánudagur"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "nóv."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -289,11 +525,6 @@ msgstr ""
msgid "Decimal number"
msgstr "desember"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "tölvupóstfang"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1082,102 +1313,102 @@ msgstr "Velska"
msgid "Danish"
msgstr "Spænska"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Þýska"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Enska"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spænska"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galíska"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Ítalska"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasilíska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "Rúmenska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Rússneska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "Slóvanska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbíska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Einfölduð Kínverska "
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Þessi reitur er ótækur."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Lágstafir eru ekki leyfðir hér."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Settu inn heila tölu."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Settu inn heila tölu."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Settu inn heila tölu."
@@ -1465,12 +1696,12 @@ msgstr ""
"Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en "
"eitt."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Skrifaðu gilt tölvupóstfang."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 16fdfdba96..44896c9671 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index ccf760dfc2..8da49dc7c8 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "id dell'oggetto"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "contenuto"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "indirizzo e-mail"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "abilita commenti"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "tipo di contenuto"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "nome"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "indirizzo e-mail"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "abilita commenti"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "abilita commenti"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "data di scadenza"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "pagina statica"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Utente"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Utenti"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "dati di sessione"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "abilita commenti"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Amministrazione Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Luned"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Dicembre"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "indirizzo e-mail"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1081,103 +1312,103 @@ msgstr ""
msgid "Danish"
msgstr "Spagnolo"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Tedesco"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Inglese"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spagnolo"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Francese"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galiziano"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasiliano"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
#, fuzzy
msgid "Serbian"
msgstr "Serbo"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Il campo non valido."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Non sono ammesse lettere minuscole."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Inserire un numero."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Inserire un numero."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Inserire un numero."
@@ -1465,12 +1696,12 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi di uno."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Inserire un indirizzo e-mail valido."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 1cd66b0679..c7e2e6267d 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 5dcb51f19a..e0c7346189 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug \n"
"Language-Team: Norwegian\n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "objekt id"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "innhold"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-post adresse"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "innholds type"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "fornavn"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "e-post adresse"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "utløpsdato"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "flatside"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Bruker"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Brukere"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "sesjon data"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "tillat kommentarer"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django administrasjon"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Mondag"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Desember"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "e-post adresse"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1082,102 +1313,102 @@ msgstr ""
msgid "Danish"
msgstr "Spansk"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasiliansk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Simpel Kinesisk"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Dette feltet er feil."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Små bokstaver er ikke tillatt her."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Skriv inn et helt nummer."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Skriv inn et helt nummer."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Skriv inn et helt nummer."
@@ -1470,12 +1701,12 @@ msgid ""
msgstr ""
"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Skriv inn en godkjent e-post adresse."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index ae22c43340..34c0bd7d4e 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index a5e7db810c..8950855022 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/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-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
"Last-Translator: João Paulo Farias \n"
"Language-Team: Português do Brasil \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "id do objeto"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "conteúdo"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "endereço de e-mail:"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "habilitar comentários"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "tipo de conteúdo"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "primeiro nome"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "endereço de e-mail:"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "habilitar comentários"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "habilitar comentários"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "data de expiração"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "página plana"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Usuário"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Usuários"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "dados da sessão"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "habilitar comentários"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administração do Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Segunda Feira"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Dezembro"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "endereço de e-mail:"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1085,103 +1316,103 @@ msgstr ""
msgid "Danish"
msgstr "Espanhol"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Alemão"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Inglês"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Espanhol"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galiciano"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brazileiro"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
#, fuzzy
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Este campo é inválido."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Letras em minúsculo não são permitidas aqui."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Informe um número inteiro."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Informe um número inteiro."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Informe um número inteiro."
@@ -1471,12 +1702,12 @@ msgstr ""
" Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar "
"mais de uma opção."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Informe um endereço de email válido."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 307e6fb420..973c552dc4 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 249e9656c1..8237fef2ec 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
"Last-Translator: Tiberiu Micu \n"
"Language-Team: Romanian \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "id obiect"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "conţinut"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "adresa email"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "permite comentarii"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "tip conţinut"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "Prenume"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "adresa email"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "permite comentarii"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "permite comentarii"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "data expirare"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "pagina plată"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Utilizator"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Utilizatori"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "date sesiune"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "permite comentarii"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administrare Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Luni"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Noi."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "Decembrie"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "adresa email"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1082,102 +1313,102 @@ msgstr ""
msgid "Danish"
msgstr "Spaniolă"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Germană"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Engleză"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spaniolă"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Franceză"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galiciană"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italiană"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norvegiană"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Braziliană"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Rusă"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Sîrbă"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Chineză simplificată"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Cîmpul este invalid."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Literele mici nu sînt permise aici."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Introduceţi un număr întreg."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Introduceţi un număr întreg."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Introduceţi un număr întreg."
@@ -1471,12 +1702,12 @@ msgstr ""
" Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
"multe."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Introduceţi o adresă de email validă."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 11e891fe2f..31e979f8ea 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 4fbcc900c5..b405b91950 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-10-05 00:00\n"
"Last-Translator: Dmitry Sorokin \n"
"Language-Team: LANGUAGE \n"
@@ -15,6 +15,190 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+msgid "object ID"
+msgstr ""
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+msgid "comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "E-mail :"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+msgid "Comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+msgid "Content object"
+msgstr ""
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+msgid "person's name"
+msgstr ""
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "E-mail :"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+msgid "Free comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:173
+msgid "Free comments"
+msgstr ""
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+msgid "score date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+msgid "flag date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr ""
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr ""
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+msgid "deletion date"
+msgstr ""
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -27,21 +211,27 @@ msgstr ""
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -49,30 +239,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -135,6 +325,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr " Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -143,9 +338,38 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "No"
+msgstr ""
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -285,11 +509,6 @@ msgstr ""
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "E-mail :"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1070,99 +1289,99 @@ msgstr ""
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr ""
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
msgid "This field is required."
msgstr ""
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
msgid "Line breaks are not allowed here."
msgstr ""
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "E-mail :"
-#: core/formfields.py:666
+#: core/formfields.py:675
msgid "Enter a whole number between 0 and 32,767."
msgstr ""
@@ -1432,12 +1651,12 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "E-mail :"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 0b94552be1..9b04ce9d68 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 18972c33ee..1c688fb30d 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/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-15 17:40+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Vladimir Labath \n"
"Language-Team: Slovak \n"
@@ -16,6 +16,203 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "Ukáž objekt id"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "obsah"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "emailová adresa"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "povolené komentáre"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "typ obsahu"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "meno"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "emailová adresa"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "povolené komentáre"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "povolené komentáre"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "dátum konca platnosti"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "plochá stránka"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Uživateľ"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Užívatelia"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, fuzzy, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Tento komentár bol poslaný rámcovým uzívateľom:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "údaje sedenia"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr "Ak chcete hlasovať, najprv sa musíte prihlásiť"
@@ -29,25 +226,36 @@ msgstr "povolené komentáre"
msgid "No voting for yourself"
msgstr "Nemožete voliť vlastný príspevok"
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
-msgstr "Táto voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
+msgstr ""
+"Táto voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
-#: contrib/comments/views/comments.py:108
-#, python-format
+#: contrib/comments/views/comments.py:109
+#, fuzzy, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+"Tento komentár bol poslaný užívateľom, ktorý ma menej než %(count)s "
+"komentárov:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
"Tento komentár bol poslaný užívateľom, ktorý ma menej než %(count)s "
"komentárov:\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -58,32 +266,30 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr "Sú povolené len POST metódy"
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr "Jedno alebo viac požadovaných polí nebolo postúpených"
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr "Bola zistena neoprávnená manipulácia s formulárom komentára "
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
-msgstr ""
-"Formulár kometára má chybný výstupný parameter -- object"
-"ID bol chybný"
+msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chybný"
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Neprišla ani jedna z možných volieb 'preview' alebo 'post'"
@@ -129,8 +335,8 @@ msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-"Prosím prihláste sa znova, vaše sedenie stratilo platnosť. Žiadne obavy: Všetko "
-"čo ste vložili bolo uchované."
+"Prosím prihláste sa znova, vaše sedenie stratilo platnosť. Žiadne obavy: "
+"Všetko čo ste vložili bolo uchované."
#: contrib/admin/views/decorators.py:63
msgid ""
@@ -147,6 +353,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administrácia Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -155,9 +366,41 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+#, fuzzy
+msgid "Any date"
+msgstr "Všetky dátumy"
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "Pondelok"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -298,11 +541,6 @@ msgstr ""
msgid "Decimal number"
msgstr "December"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "emailová adresa"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -694,10 +932,13 @@ msgid ""
msgstr ""
"\n"
"Na inštaláciu zarážok, ťahajte linku do vášho bookmarks\n"
-"toolbar, alebo klik pravou myšou na linku a pridať do vášho bookmarks. Teraz si môžete\n"
+"toolbar, alebo klik pravou myšou na linku a pridať do vášho bookmarks. "
+"Teraz si môžete\n"
"vyberať zarážky z ľubovoľnej stránky webu. Poznámka: pri tvorbe niektorých\n"
-"zarážok z ních, sa vyžaduje aby ste sa pohybovali po stránke z počítača označeného\n"
-"ako \"internal\" (obrátte sa na vášho systémového administrátora, ak nie ste si istý a ak\n"
+"zarážok z ních, sa vyžaduje aby ste sa pohybovali po stránke z počítača "
+"označeného\n"
+"ako \"internal\" (obrátte sa na vášho systémového administrátora, ak nie ste "
+"si istý a ak\n"
"ak váš počítač je \"internal\").
\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
@@ -708,9 +949,7 @@ msgstr "Dokumentácia tejto stránky"
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
-msgstr ""
-"Skoč na ľubovoľnú stránku dokumentácie, z ponuky "
-"na tejto stránke."
+msgstr "Skoč na ľubovoľnú stránku dokumentácie, z ponuky na tejto stránke."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
#, fuzzy
@@ -1107,101 +1346,106 @@ msgid "Welsh"
msgstr "Waleský"
#: conf/global_settings.py:40
+#, fuzzy
+msgid "Danish"
+msgstr "Španielsky"
+
+#: conf/global_settings.py:41
msgid "German"
msgstr "Nemecký"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Anglický"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Španielsky"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Francúzsky"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galicijský"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr "Islandský"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Taliansky"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Nórsky"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brazílsky"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "Rumúnsky"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Ruský"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "Slovenský"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Srbský"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr "Švédsky"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Zjednodušená činština "
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Toto pole nie je platné."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr "Uistite sa, že text je kratší ako %s znakov."
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Malé písmena tu nie sú povolené."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Určená platná voľba; '%(data)s' sa nenachádza v %(choices)s."
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr "Poslaný súbor je prázdny."
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Vložte celé číslo."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Vložte celé číslo."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Vložte celé číslo."
@@ -1492,16 +1736,15 @@ msgstr ""
" Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej "
"položky."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Vložte platnú e-mail adresu."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
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"
msgstr[0] "Prosím vložte platné %(self)s IDs. Hodnota %(value)r je chybná"
msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú chybné"
-
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 1a44e3f98d..93a76725d4 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index b3ce1232af..24b5456e9f 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Serbian (latin) translation v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-11-03 00:28+0100\n"
"Last-Translator: Petar Marić \n"
"Language-Team: Nesh & Petar \n"
"Language-Team: LANGUAGE \n"
@@ -16,6 +16,200 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "objektets id"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "innehåll"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-postadress"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "aktivera kommentarer"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "innehållstyp"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "förnamn"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "e-postadress"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "aktivera kommentarer"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "aktivera kommentarer"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "bäst före"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "flatsida"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "Användare"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "Användare"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "sessionsdata"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -29,21 +223,27 @@ msgstr "aktivera kommentarer"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -51,30 +251,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -136,6 +336,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Administration för Django"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -144,9 +349,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "måndag"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "nov"
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -287,11 +523,6 @@ msgstr ""
msgid "Decimal number"
msgstr "december"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "e-postadress"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1083,102 +1314,102 @@ msgstr "Walesiska"
msgid "Danish"
msgstr "Spanska"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "Tyska"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "Engelska"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "Spanska"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "Galisiska"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "Italienska"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "Brasilianska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr "Rumänska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "Ryska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr "Slovakiska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "Serbiska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "Förenklad kinesiska"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "Det här fältet är ogiltigt."
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "Små bokstäver är inte tillåtna här."
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Fyll i ett heltal."
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "Fyll i ett heltal."
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "Fyll i ett heltal."
@@ -1469,12 +1700,12 @@ msgid ""
msgstr ""
" Håll ner \"Control\", eller \"Command\" på en Mac, för att välja mer än en."
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "Fyll i en giltig e-postadress."
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 9991755dc8..239ab3869e 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 4dd8c4bffd..55e4870013 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 17:39+0100\n"
+"POT-Creation-Date: 2005-11-18 15:43+0100\n"
"PO-Revision-Date: 2005-11-11 13:55+0800\n"
"Last-Translator: limodou \n"
"Language-Team: Simplified Chinese \n"
@@ -19,6 +19,200 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: contrib/comments/models/comments.py:8
+#: contrib/comments/models/comments.py:161
+#, fuzzy
+msgid "object ID"
+msgstr "对象id"
+
+#: contrib/comments/models/comments.py:9
+msgid "headline"
+msgstr ""
+
+#: contrib/comments/models/comments.py:10
+#: contrib/comments/models/comments.py:162
+#, fuzzy
+msgid "comment"
+msgstr "内容"
+
+#: contrib/comments/models/comments.py:11
+msgid "rating #1"
+msgstr ""
+
+#: contrib/comments/models/comments.py:12
+msgid "rating #2"
+msgstr ""
+
+#: contrib/comments/models/comments.py:13
+msgid "rating #3"
+msgstr ""
+
+#: contrib/comments/models/comments.py:14
+msgid "rating #4"
+msgstr ""
+
+#: contrib/comments/models/comments.py:15
+msgid "rating #5"
+msgstr ""
+
+#: contrib/comments/models/comments.py:16
+msgid "rating #6"
+msgstr ""
+
+#: contrib/comments/models/comments.py:17
+msgid "rating #7"
+msgstr ""
+
+#: contrib/comments/models/comments.py:18
+msgid "rating #8"
+msgstr ""
+
+#: contrib/comments/models/comments.py:23
+msgid "is valid rating"
+msgstr ""
+
+#: contrib/comments/models/comments.py:24
+#: contrib/comments/models/comments.py:164
+msgid "date/time submitted"
+msgstr ""
+
+#: contrib/comments/models/comments.py:25
+#: contrib/comments/models/comments.py:165
+msgid "is public"
+msgstr ""
+
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "邮件地址"
+
+#: contrib/comments/models/comments.py:27
+msgid "is removed"
+msgstr ""
+
+#: contrib/comments/models/comments.py:27
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+
+#: contrib/comments/models/comments.py:31
+msgid "Comment"
+msgstr ""
+
+#: contrib/comments/models/comments.py:32
+#, fuzzy
+msgid "Comments"
+msgstr "允许评论"
+
+#: contrib/comments/models/comments.py:85
+#: contrib/comments/models/comments.py:204
+#, fuzzy
+msgid "Content object"
+msgstr "内容类型"
+
+#: contrib/comments/models/comments.py:113
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:163
+#, fuzzy
+msgid "person's name"
+msgstr "名字"
+
+#: contrib/comments/models/comments.py:166
+#, fuzzy
+msgid "ip address"
+msgstr "邮件地址"
+
+#: contrib/comments/models/comments.py:168
+msgid "approved by staff"
+msgstr ""
+
+#: contrib/comments/models/comments.py:172
+#, fuzzy
+msgid "Free comment"
+msgstr "允许评论"
+
+#: contrib/comments/models/comments.py:173
+#, fuzzy
+msgid "Free comments"
+msgstr "允许评论"
+
+#: contrib/comments/models/comments.py:209
+msgid "score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:210
+#, fuzzy
+msgid "score date"
+msgstr "过期日期"
+
+#: contrib/comments/models/comments.py:213
+msgid "Karma score"
+msgstr ""
+
+#: contrib/comments/models/comments.py:214
+msgid "Karma scores"
+msgstr ""
+
+#: contrib/comments/models/comments.py:223
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:248
+#, fuzzy
+msgid "flag date"
+msgstr "简单页面"
+
+#: contrib/comments/models/comments.py:251
+#, fuzzy
+msgid "User flag"
+msgstr "用户"
+
+#: contrib/comments/models/comments.py:252
+#, fuzzy
+msgid "User flags"
+msgstr "用户"
+
+#: contrib/comments/models/comments.py:256
+#, python-format
+msgid "Flag by %r"
+msgstr ""
+
+#: contrib/comments/models/comments.py:271
+#, python-format
+msgid ""
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
+msgstr ""
+
+#: contrib/comments/models/comments.py:278
+#, fuzzy
+msgid "deletion date"
+msgstr "session数据"
+
+#: contrib/comments/models/comments.py:281
+msgid "Moderator deletion"
+msgstr ""
+
+#: contrib/comments/models/comments.py:282
+msgid "Moderator deletions"
+msgstr ""
+
+#: contrib/comments/models/comments.py:286
+#, python-format
+msgid "Moderator deletion by %r"
+msgstr ""
+
#: contrib/comments/views/karma.py:18
msgid "Anonymous users cannot vote"
msgstr ""
@@ -32,21 +226,26 @@ msgstr "允许评论"
msgid "No voting for yourself"
msgstr ""
-#: contrib/comments/views/comments.py:24
+#: contrib/comments/views/comments.py:25
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-#: contrib/comments/views/comments.py:108
+#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
"comments:\n"
"\n"
"%(text)s"
-msgstr ""
+msgstr[0] ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/views/comments.py:114
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
@@ -54,30 +253,30 @@ msgid ""
"%(text)s"
msgstr ""
-#: contrib/comments/views/comments.py:184
-#: contrib/comments/views/comments.py:275
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
msgid "Only POSTs are allowed"
msgstr ""
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:279
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
msgid "One or more of the required fields wasn't submitted"
msgstr ""
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
-#: contrib/comments/views/comments.py:202
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-#: contrib/comments/views/comments.py:252
-#: contrib/comments/views/comments.py:316
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
@@ -139,6 +338,11 @@ msgstr ""
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
+#: contrib/admin/views/main.py:50
+#, fuzzy
+msgid "Site administration"
+msgstr "Django管理员"
+
#: contrib/admin/views/main.py:84
#, python-format
msgid ""
@@ -147,9 +351,40 @@ msgid ""
msgstr ""
#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
+#: contrib/admin/views/main.py:186
msgid "All"
msgstr ""
+#: contrib/admin/views/main.py:152
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/views/main.py:153
+#, fuzzy
+msgid "Today"
+msgstr "星期一"
+
+#: contrib/admin/views/main.py:156
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/views/main.py:158
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/views/main.py:160
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/views/main.py:186
+#, fuzzy
+msgid "No"
+msgstr "十一月"
+
#: contrib/admin/views/main.py:194
msgid "Unknown"
msgstr ""
@@ -290,11 +525,6 @@ msgstr ""
msgid "Decimal number"
msgstr "十二月"
-#: contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "邮件地址"
-
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
msgstr ""
@@ -1071,102 +1301,102 @@ msgstr "威尔士语"
msgid "Danish"
msgstr "西斑牙语"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "German"
msgstr "德语"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "English"
msgstr "英语"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Spanish"
msgstr "西斑牙语"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "French"
msgstr "法语"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Galician"
msgstr "加利西亚语"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Italian"
msgstr "意大利语"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "Norwegian"
msgstr "挪威语"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Brazilian"
msgstr "巴西语"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
msgid "Russian"
msgstr "俄语"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Serbian"
msgstr "塞尔维亚语"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
msgid "Simplified Chinese"
msgstr "简体中文"
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
-#: core/meta/fields.py:493
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
+#: core/meta/fields.py:495
#, fuzzy
msgid "This field is required."
msgstr "这个字段无效。"
-#: core/formfields.py:329
+#: core/formfields.py:338
#, python-format
msgid "Ensure your text is less than %s characters."
msgstr ""
-#: core/formfields.py:333
+#: core/formfields.py:342
#, fuzzy
msgid "Line breaks are not allowed here."
msgstr "这里不允许小写字母。"
-#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:594
+#: core/formfields.py:603
msgid "The submitted file is empty."
msgstr ""
-#: core/formfields.py:648
+#: core/formfields.py:657
#, fuzzy
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "输入整数。"
-#: core/formfields.py:657
+#: core/formfields.py:666
#, fuzzy
msgid "Enter a positive number."
msgstr "输入整数。"
-#: core/formfields.py:666
+#: core/formfields.py:675
#, fuzzy
msgid "Enter a whole number between 0 and 32,767."
msgstr "输入整数。"
@@ -1440,12 +1670,12 @@ msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr " 按下 \"Control\",或者在Mac上按 \"Command\" 来选择一个或多个值。"
-#: core/meta/fields.py:502
+#: core/meta/fields.py:504
#, fuzzy
msgid "Enter a valid filename."
msgstr "输入一个有效的邮件地址。"
-#: core/meta/fields.py:771
+#: core/meta/fields.py:773
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py
index 537a7fe2f5..5918db7dc8 100644
--- a/django/contrib/comments/views/comments.py
+++ b/django/contrib/comments/views/comments.py
@@ -9,6 +9,7 @@ from django.parts.auth.formfields import AuthenticationForm
from django.utils.httpwrappers import HttpResponseRedirect
from django.utils.text import normalize_newlines
from django.conf.settings import BANNED_IPS, COMMENTS_ALLOW_PROFANITIES, COMMENTS_SKETCHY_USERS_GROUP, COMMENTS_FIRST_FEW, SITE_ID
+from django.utils.translation import ngettext
import base64, datetime
COMMENTS_PER_PAGE = 20
@@ -105,7 +106,8 @@ class PublicCommentManipulator(AuthenticationForm):
# If the commentor has posted fewer than COMMENTS_FIRST_FEW comments,
# send the comment to the managers.
if self.user_cache.get_comments_comment_count() <= COMMENTS_FIRST_FEW:
- message = _('This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s') % \
+ message = ngettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s',
+ 'This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s') % \
{'count': COMMENTS_FIRST_FEW, 'text': c.get_as_text()}
mail_managers("Comment posted by rookie user", message)
if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]: