diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 13e42dcf51..9b2f510342 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 61426e1c43..1befbcf2fb 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
-"PO-Revision-Date: 2005-10-05 00:00\n"
-"Last-Translator: Dmitry Sorokin 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\"). Na inštaláciu zarážok, chyťte a potiahnite linku do vášho "
-"bookmarks\n"
-"toolbar, alebo klik pravou myšou na linku a pridať do vášho bookmarks.\n"
-" Teraz si môžete vyberať zarážky z ľubovoľnej stránky webu.\n"
-"Poznámka: pri tvorbe niektorých zarážok, sa vyžaduje aby ste sa pohybovali\n"
-"po stránke z počítača označeného ako \"internal\" (obrátte sa na vášho \n"
-"systémového administrátora, ak nie ste si istý či váš počítač je \"internal"
-"\").By %s:
\n"
"\n"
msgstr ""
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
msgid "All"
-msgstr ""
+msgstr ""
-#: contrib/admin/filterspecs.py:109
+#: contrib/admin/filterspecs.py:100
msgid "Any date"
-msgstr ""
+msgstr " "
-#: contrib/admin/filterspecs.py:110
+#: contrib/admin/filterspecs.py:101
msgid "Today"
-msgstr ""
+msgstr ""
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:104
msgid "Past 7 days"
-msgstr ""
+msgstr " 7 "
-#: contrib/admin/filterspecs.py:115
+#: contrib/admin/filterspecs.py:106
msgid "This month"
-msgstr ""
+msgstr " "
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:108
msgid "This year"
-msgstr ""
+msgstr " "
-#: contrib/admin/filterspecs.py:143
+#: contrib/admin/filterspecs.py:134
msgid "Yes"
-msgstr ""
+msgstr ""
-#: contrib/admin/filterspecs.py:143
+#: contrib/admin/filterspecs.py:134
msgid "No"
-msgstr ""
+msgstr ""
-#: contrib/admin/filterspecs.py:150
+#: contrib/admin/filterspecs.py:142
msgid "Unknown"
-msgstr ""
+msgstr ""
#: contrib/admin/models/admin.py:6
-#, fuzzy
msgid "action time"
-msgstr "/"
+msgstr " "
#: contrib/admin/models/admin.py:9
msgid "object id"
-msgstr ""
+msgstr "id "
#: contrib/admin/models/admin.py:10
msgid "object repr"
-msgstr ""
+msgstr " "
#: contrib/admin/models/admin.py:11
msgid "action flag"
@@ -333,15 +335,15 @@ msgstr ""
#: contrib/admin/models/admin.py:15
msgid "log entry"
-msgstr ""
+msgstr " "
#: contrib/admin/models/admin.py:16
msgid "log entries"
-msgstr ""
+msgstr " "
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:244
msgid "All dates"
-msgstr ""
+msgstr " "
#: contrib/admin/views/decorators.py:22
#: contrib/admin/templates/admin/login.html:24
@@ -352,182 +354,181 @@ msgstr "
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
-msgstr ""
+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 ""
+", cookies. "
+"cookie, . "
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
-msgstr ""
+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:49
-#, fuzzy
+#: contrib/admin/views/main.py:50
msgid "Site administration"
-msgstr " Django"
-
-#: contrib/admin/views/main.py:64
-#, python-format
-msgid "Select %s"
-msgstr ""
+msgstr " "
#: contrib/admin/views/main.py:65
-#, fuzzy, python-format
-msgid "Select %s to change"
-msgstr " "
+#, python-format
+msgid "Select %s"
+msgstr " %s"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:66
+#, python-format
+msgid "Select %s to change"
+msgstr " %s "
+
+#: contrib/admin/views/main.py:421
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
msgid "You may edit it again below."
-msgstr ""
+msgstr " "
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
#, python-format
msgid "You may add another %s below."
-msgstr ""
+msgstr " % ."
-#: contrib/admin/views/main.py:442
-#, fuzzy, python-format
+#: contrib/admin/views/main.py:451
+#, python-format
msgid "Add %s"
-msgstr ""
+msgstr " %s"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:467
#, python-format
msgid "Added %s."
-msgstr ""
+msgstr " %s"
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
msgid "and"
-msgstr ""
+msgstr ""
-#: contrib/admin/views/main.py:460
-#, fuzzy, python-format
+#: contrib/admin/views/main.py:469
+#, python-format
msgid "Changed %s."
-msgstr ""
+msgstr " %s."
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:471
#, python-format
msgid "Deleted %s."
-msgstr ""
+msgstr " %s."
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:474
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:499
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:508
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
-#, fuzzy, python-format
+#: contrib/admin/views/main.py:546
+#, python-format
msgid "Change %s"
-msgstr ""
+msgstr " %s"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:626
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr " %(fieldname)s %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:631
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr " %(fieldname)s %(name)s:"
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:660
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:663
msgid "Are you sure?"
-msgstr ""
+msgstr " ?"
-#: contrib/admin/views/main.py:667
-#, fuzzy, python-format
+#: contrib/admin/views/main.py:678
+#, python-format
msgid "Change history: %s"
-msgstr " "
+msgstr " : %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 ""
#: contrib/admin/views/doc.py:263
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr " (True False)"
#: contrib/admin/views/doc.py:264
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr " ( %(maxlength)s )"
#: contrib/admin/views/doc.py:265
msgid "Comma-separated integers"
-msgstr ""
+msgstr ", "
#: contrib/admin/views/doc.py:266
-#, fuzzy
msgid "Date (without time)"
-msgstr "/"
+msgstr " ( )"
#: contrib/admin/views/doc.py:267
-#, fuzzy
msgid "Date (with time)"
-msgstr "/"
+msgstr " ( )"
#: contrib/admin/views/doc.py:268
-#, fuzzy
msgid "E-mail address"
-msgstr "E-mail :"
+msgstr "E-mail "
#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
msgid "File path"
-msgstr ""
+msgstr " "
#: contrib/admin/views/doc.py:270
msgid "Decimal number"
-msgstr ""
+msgstr " "
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr " (True, False None)"
#: contrib/admin/views/doc.py:277
msgid "Phone number"
-msgstr ""
+msgstr " "
#: contrib/admin/views/doc.py:280
msgid "String (up to 50)"
-msgstr ""
+msgstr " ( 50 )"
#: contrib/admin/views/doc.py:282
msgid "Text"
-msgstr ""
+msgstr ""
#: contrib/admin/views/doc.py:283
msgid "Time"
-msgstr ""
+msgstr ""
#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
msgid "URL"
@@ -535,17 +536,17 @@ msgstr "URL"
#: contrib/admin/views/doc.py:285
msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr " ( )"
#: contrib/admin/views/doc.py:286
msgid "XML text"
-msgstr ""
+msgstr "XML "
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: 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
@@ -555,6 +556,56 @@ msgstr ""
msgid "Home"
msgstr ""
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr " %(name)s"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr " ."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr " "
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr " "
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr " "
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr " (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr " (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 ""
+" . e-mail "
+" . ."
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
@@ -592,66 +643,6 @@ msgstr "
msgid "Django administration"
msgstr " Django"
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr " (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr " (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr " (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 ""
-" . e-mail "
-" . ."
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr " "
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr " , ."
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr " ."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr " "
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr " "
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr ""
-
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
msgstr ":"
@@ -664,6 +655,57 @@ msgstr "
msgid "Have you forgotten your password?"
msgstr " ?"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr " "
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr " , ."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: 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
+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 "
+"types of objects:"
+msgstr ""
+" %(object_name)s '%(object)s' "
+" , "
+":"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+" , %(object_name)s \"%(object)s\"? "
+" :"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr ", "
+
#: contrib/admin/templates/admin/base.html:23
msgid "Welcome,"
msgstr " ,"
@@ -676,73 +718,31 @@ msgstr "
msgid "Log out"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:7
-#, fuzzy, 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 "
-"types of objects:"
-msgstr ""
-" %(object_name)s '%(object)s' "
-", "
-":"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-" , %(object_name)s \"%(object)s\"? "
-" :"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr " "
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-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
+msgid "Save"
+msgstr ""
#: contrib/admin/templates/admin/filter.html:1
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: 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/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
-msgid "Save"
-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
@@ -753,7 +753,7 @@ msgstr "
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
-msgstr "La password stata cambiata con successo"
+msgstr " "
#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
@@ -761,7 +761,6 @@ msgstr "
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
#: contrib/admin/templates/registration/password_reset_done.html:4
msgid "Password reset"
msgstr " "
@@ -860,7 +859,7 @@ msgstr "
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
-msgstr ""
+msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -868,7 +867,7 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
-msgstr ""
+msgstr " bookmarklets"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
msgid ""
@@ -883,7 +882,7 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
-msgstr ""
+msgstr " "
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
msgid ""
@@ -893,7 +892,7 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
-msgstr ""
+msgstr " ID "
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
msgid ""
@@ -903,7 +902,7 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
-msgstr ""
+msgstr " ( )"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
@@ -911,11 +910,11 @@ msgstr ""
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
-msgstr ""
+msgstr " ( )"
#: contrib/admin/templates/admin_doc/bookmarklets.html:29
msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr " , "
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
@@ -1112,34 +1111,32 @@ msgstr "
#: utils/timesince.py:12
msgid "year"
msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:13
msgid "month"
msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:14
-#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:15
msgid "hour"
msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:16
-#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ""
+msgstr[1] ""
#: models/core.py:7
msgid "domain name"
@@ -1162,9 +1159,8 @@ msgid "label"
msgstr ""
#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
-#, fuzzy
msgid "name"
-msgstr ":"
+msgstr ""
#: models/core.py:31
msgid "package"
@@ -1227,9 +1223,8 @@ msgid "Groups"
msgstr ""
#: models/auth.py:33
-#, fuzzy
msgid "username"
-msgstr ":"
+msgstr " "
#: models/auth.py:34
msgid "first name"
@@ -1240,17 +1235,15 @@ msgid "last name"
msgstr ""
#: models/auth.py:36
-#, fuzzy
msgid "e-mail address"
-msgstr "E-mail :"
+msgstr "e-mail "
#: models/auth.py:37
-#, fuzzy
msgid "password"
-msgstr ":"
+msgstr ""
#: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]'"
+msgid "Use '[algo]$[salt]$[hexdigest]"
msgstr ""
#: models/auth.py:38
@@ -1259,7 +1252,7 @@ msgstr "
#: models/auth.py:38
msgid "Designates whether the user can log into this admin site."
-msgstr ", . ."
+msgstr ", . ."
#: models/auth.py:39
msgid "active"
@@ -1286,13 +1279,12 @@ msgstr ""
" , ."
#: models/auth.py:48
-#, fuzzy
msgid "Users"
-msgstr ""
+msgstr ""
#: models/auth.py:57
msgid "Personal info"
-msgstr " "
+msgstr " "
#: models/auth.py:59
msgid "Important dates"
@@ -1360,7 +1352,7 @@ msgstr ""
#: conf/global_settings.py:51
msgid "Russian"
-msgstr ""
+msgstr ""
#: conf/global_settings.py:52
msgid "Slovak"
@@ -1378,43 +1370,42 @@ msgstr ""
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
-#: core/meta/fields.py:499
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
msgid "This field is required."
-msgstr ""
+msgstr " ."
-#: core/formfields.py:336
+#: core/formfields.py:339
#, python-format
-msgid "Ensure your text is less than %s character."
+msgid "Ensure your text is less than %s character"
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] ""
msgstr[1] ""
-#: core/formfields.py:341
+#: core/formfields.py:344
msgid "Line breaks are not allowed here."
-msgstr ""
+msgstr " ."
-#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:601
+#: core/formfields.py:605
msgid "The submitted file is empty."
-msgstr ""
+msgstr " - ."
-#: core/formfields.py:655
+#: core/formfields.py:659
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:664
-#, fuzzy
+#: core/formfields.py:668
msgid "Enter a positive number."
-msgstr "E-mail :"
+msgstr " ."
-#: core/formfields.py:673
+#: core/formfields.py:677
msgid "Enter a whole number between 0 and 32,767."
-msgstr ""
+msgstr " 0 32767."
#: core/validators.py:62
msgid "This value must contain only letters, numbers and underscores."
@@ -1478,17 +1469,16 @@ msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr " / YYYY-MM-DD HH:MM."
#: core/validators.py:138
-#, fuzzy
msgid "Enter a valid e-mail address."
-msgstr "E-mail :"
+msgstr " e-mail ."
#: core/validators.py:150
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-" . , , "
-" ."
+" . , , "
+" ."
#: core/validators.py:157
#, python-format
@@ -1521,7 +1511,7 @@ msgstr ""
#: core/validators.py:194
#, python-format
msgid "Badly formed XML: %s"
-msgstr " XML: %s"
+msgstr " XML: %s"
#: core/validators.py:204
#, python-format
@@ -1531,41 +1521,41 @@ msgstr "
#: core/validators.py:208 core/validators.py:210
#, python-format
msgid "The URL %s is a broken link."
-msgstr "URL %s ."
+msgstr "URL %s ."
#: core/validators.py:216
msgid "Enter a valid U.S. state abbreviation."
-msgstr " ."
+msgstr " ."
#: core/validators.py:231
#, python-format
msgid "Watch your mouth! The word %s is not allowed here."
msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] " ! %s ."
-msgstr[1] " ! %s ."
+msgstr[0] " ! %s ."
+msgstr[1] " ! %s ."
#: core/validators.py:238
#, python-format
msgid "This field must match the '%s' field."
-msgstr " '%s' ."
+msgstr " '%s'."
#: core/validators.py:257
msgid "Please enter something for at least one field."
-msgstr ", ."
+msgstr ", ."
#: core/validators.py:266 core/validators.py:277
msgid "Please enter both fields or leave them both empty."
-msgstr ", ."
+msgstr ", ."
#: core/validators.py:284
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
-msgstr ""
+msgstr " %(field)s %(value)s"
#: core/validators.py:296
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
-msgstr ""
+msgstr " %(field)s %(value)s"
#: core/validators.py:315
msgid "Duplicate values are not allowed."
@@ -1607,12 +1597,12 @@ msgstr[1] ""
#: core/validators.py:364
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr " , %s ."
+msgstr ", %s ."
#: core/validators.py:365
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr " , %s ."
+msgstr ", %s ."
#: core/validators.py:378
msgid "The format for this field is wrong."
@@ -1625,13 +1615,13 @@ msgstr "
#: core/validators.py:428
#, python-format
msgid "Could not retrieve anything from %s."
-msgstr " %s."
+msgstr " - %s."
#: core/validators.py:431
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "URL %(url) Content-Type '%(contenttype)'."
+msgstr "URL %(url) Content-Type '%(contenttype)'."
#: core/validators.py:464
#, python-format
@@ -1685,27 +1675,26 @@ msgstr ""
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr ""
-#: core/meta/fields.py:129
+#: core/meta/fields.py:131
msgid " Separate multiple IDs with commas."
-msgstr " ID ."
+msgstr " ID ."
-#: core/meta/fields.py:132
+#: core/meta/fields.py:134
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" \"Control\", \"Command\" , "
"."
-#: core/meta/fields.py:508
-#, fuzzy
+#: core/meta/fields.py:511
msgid "Enter a valid filename."
-msgstr "E-mail :"
+msgstr " ."
-#: core/meta/fields.py:777
+#: core/meta/fields.py:780
#, 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."
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
msgstr[0] ""
msgstr[1] ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 212ac9cdff..bf462d4d39 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 7ec3595422..19e39fc2ae 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,18 +8,49 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2005-11-25 14:27-0500\n"
+"PO-Revision-Date: 2005-11-10 23:22-0500\n"
"Last-Translator: Vladimir Labath
By %s:
\n"
-"\n"
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-"
Od %s:
\n"
-"\n"
+"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
+"záverečné lomítka."
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
-msgid "All"
-msgstr "Všetko"
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "názov"
-#: contrib/admin/filterspecs.py:109
-#, fuzzy
-msgid "Any date"
-msgstr "Ľubovoľný dátum"
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "obsah"
-#: contrib/admin/filterspecs.py:110
-#, fuzzy
-msgid "Today"
-msgstr "Dnes"
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "povolené komentáre"
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-msgstr "Posledných 7 dní"
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "meno predlohy"
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-msgstr "Tento mesiac"
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije "
+"'flatpages/default'."
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-msgstr "Tento rok"
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "musíte byť zaregistrovaný"
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr "Áno"
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
-#: contrib/admin/filterspecs.py:143
-#, fuzzy
-msgid "No"
-msgstr "Nie"
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "plochá stránka"
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-msgstr "Neznámy"
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "ploché stránky"
#: contrib/admin/models/admin.py:6
msgid "action time"
@@ -366,10 +390,6 @@ msgstr "záznam priebehu"
msgid "log entries"
msgstr "záznamy priebehu"
-#: contrib/admin/templatetags/admin_list.py:243
-msgid "All dates"
-msgstr "Všetky dátumy"
-
#: contrib/admin/views/decorators.py:22
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
@@ -380,145 +400,42 @@ 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 prihlaste sa znovu, lebo čas vášho sedenia vypršal. Nemajte obavy: "
+"Vaše údaje su uchované."
#: 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 ""
-"Vyzera, že váš prehliadač neakceptuje cookies. Prosím povoľte cookies, "
-"znovu natiahnite túto stránku, a skúste znova."
+"Vyzerá, že váš prehliadač nemá povolené cookies. Prosím povoľte cookies, "
+"znovu načítajte túto stránku a skúste činnosť znovu."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
-msgstr "Meno užívateľa nemôže obsahovať znak '@'."
+msgstr "Meno užívateľa nemože obsahovať znak '@' ."
#: contrib/admin/views/decorators.py:79
-#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Vaša emailová adresa nie je vaším užívateľským menon. Skuste toto '%s' "
-"namiesto nej"
-
-#: contrib/admin/views/main.py:49
-#, fuzzy
-msgid "Site administration"
-msgstr "Spáva webu"
-
-#: contrib/admin/views/main.py:64
-#, python-format
-msgid "Select %s"
-msgstr "Vyber %s"
-
-#: contrib/admin/views/main.py:65
-#, python-format
-msgid "Select %s to change"
-msgstr "Vyber %s na zmenu"
-
-#: contrib/admin/views/main.py:412
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr " %(name)s \"%(obj)s\" bol úspešne pridaný."
-
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
-msgid "You may edit it again below."
-msgstr "Môžete to zmeniť znovu nižšie."
-
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
-#, python-format
-msgid "You may add another %s below."
-msgstr "Môžete pridať ďalší %s nižšie."
-
-#: contrib/admin/views/main.py:442
-#, fuzzy, python-format
-msgid "Add %s"
-msgstr "Pridaj"
-
-#: contrib/admin/views/main.py:458
-#, python-format
-msgid "Added %s."
-msgstr "Pridal %s"
-
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
-msgid "and"
-msgstr "a"
-
-#: contrib/admin/views/main.py:460
-#, fuzzy, python-format
-msgid "Changed %s."
-msgstr "Zmenený"
-
-#: contrib/admin/views/main.py:462
-#, python-format
-msgid "Deleted %s."
-msgstr "Vymazaný"
-
-#: contrib/admin/views/main.py:465
-msgid "No fields changed."
-msgstr "Polia neboli zmenené."
-
-#: contrib/admin/views/main.py:490
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr " %(name)s \"%(obj)s\" bol úspešne zmenený."
-
-#: contrib/admin/views/main.py:499
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-" %(name)s \"%(obj)s\" bol úspešne pridaný. Môžete ho zmeniť zase nižšie."
-
-#: contrib/admin/views/main.py:537
-#, fuzzy, python-format
-msgid "Change %s"
-msgstr "Zmeň"
-
-#: contrib/admin/views/main.py:615
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:620
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "jeden alebo viac %(fieldname)s v %(name)s:"
-
-#: contrib/admin/views/main.py:649
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr " %(name)s \"%(obj)s\" bol úspešne vymazaný."
-
-#: contrib/admin/views/main.py:652
-msgid "Are you sure?"
-msgstr "Ste si istý/á?"
-
-#: contrib/admin/views/main.py:667
-#, fuzzy, python-format
-msgid "Change history: %s"
-msgstr "Zmena histórie:"
+msgstr "Vaša e-mailova adresa nie je vaše užívateľské meno. Skúste '%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 "Integer"
+msgstr "Celočíselná hodnota"
#: contrib/admin/views/doc.py:263
msgid "Boolean (Either True or False)"
-msgstr "Boolean (Buď True alebo False)"
+msgstr "Logická hodnota (buď True alebo False)"
#: contrib/admin/views/doc.py:264
-#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr "Reťazec (maximálne do %(maxlength)s)"
+msgstr "Dĺžka reťazca (maximálne do %(maxlength)s)"
#: contrib/admin/views/doc.py:265
msgid "Comma-separated integers"
-msgstr "Celé čísla oddelené čiarkami"
+msgstr "Čiarka oddeľuje celé čísla"
#: contrib/admin/views/doc.py:266
msgid "Date (without time)"
@@ -526,7 +443,7 @@ msgstr "Dátum (bez času)"
#: contrib/admin/views/doc.py:267
msgid "Date (with time)"
-msgstr "Dátum (a čas)"
+msgstr "Dátum ( a čas)"
#: contrib/admin/views/doc.py:268
msgid "E-mail address"
@@ -542,7 +459,7 @@ msgstr "Desiatkové číslo"
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (Možné hodnoty sú True, False alebo None)"
+msgstr "Logická hodnota (buď True, False alebo None)"
#: contrib/admin/views/doc.py:277
msgid "Phone number"
@@ -550,7 +467,7 @@ msgstr "Číslo telefónu"
#: contrib/admin/views/doc.py:280
msgid "String (up to 50)"
-msgstr "Reťazec (maximálne do 50 znakov)"
+msgstr "Reťazec (do 50 )"
#: contrib/admin/views/doc.py:282
msgid "Text"
@@ -560,13 +477,9 @@ msgstr "Text"
msgid "Time"
msgstr "Čas"
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr ""
-
#: contrib/admin/views/doc.py:285
msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. štát (dve veľké písmená)"
+msgstr "U.S. štát (dve veľké písmena)"
#: contrib/admin/views/doc.py:286
msgid "XML text"
@@ -574,20 +487,16 @@ msgstr "XML text"
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
#: 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 "Začiatok"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "História"
@@ -621,7 +530,7 @@ msgstr "Django web admin"
#: contrib/admin/templates/admin/base_site.html:7
msgid "Django administration"
-msgstr "Spravované Djangom"
+msgstr "Administrácia Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -645,20 +554,14 @@ msgstr ""
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
-#, fuzzy
msgid "Page not found"
-msgstr ""
-"#-#-#-#-# django.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Stránka nebola nájdená\n"
-"#-#-#-#-# django.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Stránka sa nenašla"
+msgstr "Stránka nebola nájdená"
#: contrib/admin/templates/admin/404.html:10
msgid "We're sorry, but the requested page could not be found."
msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Pridaj"
@@ -682,14 +585,9 @@ msgstr "Moje udalosti"
msgid "None available"
msgstr "Nepovolené"
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Pridaj %(name)s"
-
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
-msgstr "Meno užívateľa:"
+msgstr "Meno:"
#: contrib/admin/templates/admin/login.html:18
msgid "Password:"
@@ -712,7 +610,6 @@ msgid "Log out"
msgstr "Odhlásenie"
#: contrib/admin/templates/admin/delete_confirmation.html:7
-#, 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 "
@@ -723,7 +620,6 @@ msgstr ""
"typov objektov:"
#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
"the following related items will be deleted:"
@@ -735,50 +631,6 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ano, som si istý"
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Podľa %(title)s "
-
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pozri tu"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Prosím opravte chybu, je nižšie"
-msgstr[1] "Prosím opravte chyby, sú nižšie"
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávanie"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Objednávka:"
-
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Vymazať"
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Uložiť ako nový"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Uložiť a pridať ďalší"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Uložiť a pokračovať editovať"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
-msgid "Save"
-msgstr "Uložiť"
-
#: 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
@@ -868,12 +720,10 @@ msgid "You're receiving this e-mail because you requested a password reset"
msgstr "Dostali ste túto správu preto, lebo ste požadovali obnoviť vaše heslo"
#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
msgid "for your user account at %(site_name)s"
msgstr "pre váš užívateľský účet na %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
msgid "Your new password is: %(new_password)s"
msgstr "Vaše nové heslo je: %(new_password)s"
@@ -890,161 +740,9 @@ msgid "Thanks for using our site!"
msgstr "Ďakujeme, že používate naše stránky!"
#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
msgid "The %(site_name)s team"
msgstr "Skupina %(site_name)s"
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "Dokumentácia"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Záložky"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Záložky dokumentácie"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"
By %s:
\n"
"\n"
msgstr ""
+"
由 %s:
\n"
+"\n"
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70
+#: contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
-msgstr ""
+msgstr "全部"
#: contrib/admin/filterspecs.py:109
msgid "Any date"
-msgstr ""
+msgstr "任意日期"
#: contrib/admin/filterspecs.py:110
-#, fuzzy
msgid "Today"
-msgstr "星期一"
+msgstr "今天"
#: contrib/admin/filterspecs.py:113
msgid "Past 7 days"
-msgstr ""
+msgstr "前7天"
#: contrib/admin/filterspecs.py:115
msgid "This month"
-msgstr ""
+msgstr "本月"
#: contrib/admin/filterspecs.py:117
msgid "This year"
-msgstr ""
+msgstr "今年"
#: contrib/admin/filterspecs.py:143
msgid "Yes"
-msgstr ""
+msgstr "是"
#: contrib/admin/filterspecs.py:143
-#, fuzzy
msgid "No"
-msgstr "十一月"
+msgstr "否"
#: contrib/admin/filterspecs.py:150
msgid "Unknown"
-msgstr ""
+msgstr "未知"
#: contrib/admin/models/admin.py:6
msgid "action time"
@@ -356,7 +350,7 @@ msgstr "日志记录"
#: contrib/admin/templatetags/admin_list.py:243
msgid "All dates"
-msgstr ""
+msgstr "全有日期"
#: contrib/admin/views/decorators.py:22
#: contrib/admin/templates/admin/login.html:24
@@ -364,199 +358,196 @@ msgid "Log in"
msgstr "登录"
#: 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 ""
+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 ""
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一次。"
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "用户名不能包含 '@' 字符。"
#: contrib/admin/views/decorators.py:79
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
+msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。"
#: contrib/admin/views/main.py:49
-#, fuzzy
msgid "Site administration"
-msgstr "Django管理员"
+msgstr "站点管理员"
#: contrib/admin/views/main.py:64
#, python-format
msgid "Select %s"
-msgstr ""
+msgstr "选择 %s"
#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s to change"
-msgstr ""
+msgstr "选择 %s 来修改"
#: contrib/admin/views/main.py:412
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" 添加成功。"
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:417
+#: contrib/admin/views/main.py:493
msgid "You may edit it again below."
-msgstr ""
+msgstr "你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:425
+#: contrib/admin/views/main.py:502
#, python-format
msgid "You may add another %s below."
-msgstr ""
+msgstr "你可以在下面增加另一个 %s 。"
#: contrib/admin/views/main.py:442
-#, fuzzy, python-format
+#, python-format
msgid "Add %s"
-msgstr "增加"
+msgstr "增加 %s"
#: contrib/admin/views/main.py:458
#, python-format
msgid "Added %s."
-msgstr ""
+msgstr "%s 已增加。"
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
#: contrib/admin/views/main.py:462
msgid "and"
-msgstr ""
+msgstr "和"
#: contrib/admin/views/main.py:460
-#, fuzzy, python-format
+#, python-format
msgid "Changed %s."
-msgstr "修改"
+msgstr "已修改 %s 。"
#: contrib/admin/views/main.py:462
#, python-format
msgid "Deleted %s."
-msgstr ""
+msgstr "%s 已删除。"
#: contrib/admin/views/main.py:465
msgid "No fields changed."
-msgstr ""
+msgstr "没有字段被修改。"
#: contrib/admin/views/main.py:490
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" 修改成功。"
#: contrib/admin/views/main.py:499
#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
#: contrib/admin/views/main.py:537
-#, fuzzy, python-format
+#, python-format
msgid "Change %s"
-msgstr "修改"
+msgstr "修改 %s"
#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s"
#: contrib/admin/views/main.py:620
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
#: contrib/admin/views/main.py:649
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" 删除成功。"
#: contrib/admin/views/main.py:652
msgid "Are you sure?"
-msgstr ""
+msgstr "你确信吗?"
#: contrib/admin/views/main.py:667
-#, fuzzy, python-format
+#, python-format
msgid "Change history: %s"
-msgstr "修改口令"
+msgstr "修改历史: %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
+#: 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 "整数"
#: contrib/admin/views/doc.py:263
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "布尔(True或False)"
#: contrib/admin/views/doc.py:264
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "字符串(最长 %(maxlength)s)"
#: contrib/admin/views/doc.py:265
msgid "Comma-separated integers"
-msgstr ""
+msgstr "逗号分隔的整数"
#: contrib/admin/views/doc.py:266
-#, fuzzy
msgid "Date (without time)"
-msgstr "动作时间"
+msgstr "日期(无时间)"
#: contrib/admin/views/doc.py:267
-#, fuzzy
msgid "Date (with time)"
-msgstr "日期/时间"
+msgstr "日期(带时间)"
#: contrib/admin/views/doc.py:268
-#, fuzzy
msgid "E-mail address"
-msgstr "邮箱地址:"
+msgstr "邮箱地址"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:269
+#: contrib/admin/views/doc.py:272
msgid "File path"
-msgstr ""
+msgstr "文件路径"
#: contrib/admin/views/doc.py:270
-#, fuzzy
msgid "Decimal number"
-msgstr "十二月"
+msgstr "小数"
#: contrib/admin/views/doc.py:276
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "布尔(True, False或None)"
#: contrib/admin/views/doc.py:277
-#, fuzzy
msgid "Phone number"
-msgstr "输入整数。"
+msgstr "电话号码"
#: contrib/admin/views/doc.py:280
msgid "String (up to 50)"
-msgstr ""
+msgstr "整数(最长50)"
#: contrib/admin/views/doc.py:282
msgid "Text"
-msgstr ""
+msgstr "文本"
#: contrib/admin/views/doc.py:283
msgid "Time"
-msgstr ""
+msgstr "时间"
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:284
+#: contrib/flatpages/models/flatpages.py:6
msgid "URL"
-msgstr ""
+msgstr "URL"
#: contrib/admin/views/doc.py:285
msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "美国州名(两个大写字母)"
#: contrib/admin/views/doc.py:286
msgid "XML text"
-msgstr ""
+msgstr "XML文本"
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
@@ -581,7 +572,8 @@ msgstr "历史"
msgid "Date/time"
msgstr "日期/时间"
-#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19
+#: models/auth.py:47
msgid "User"
msgstr "用户"
@@ -594,9 +586,7 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "N j, Y, P"
#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
#: contrib/admin/templates/admin/base_site.html:4
@@ -620,12 +610,8 @@ msgid "Server Error (500)"
msgstr "服务器错误 (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 ""
-"存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢"
-"谢你的关心。"
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢谢你的关心。"
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
@@ -662,9 +648,9 @@ msgid "None available"
msgstr "无可用的"
#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
+#, python-format
msgid "Add %(name)s"
-msgstr "增加"
+msgstr "增加 %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -692,21 +678,13 @@ msgstr "注销"
#: contrib/admin/templates/admin/delete_confirmation.html:7
#, 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 "
-"types of objects:"
-msgstr ""
-"删除 %(object_name)s '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下"
-"列类型的对象:"
+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 types of objects:"
+msgstr "删除 %(object_name)s '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下列类型的对象:"
#: contrib/admin/templates/admin/delete_confirmation.html:14
#, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
+msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
+msgstr "你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
#: contrib/admin/templates/admin/delete_confirmation.html:18
msgid "Yes, I'm sure"
@@ -715,46 +693,44 @@ msgstr "是的,我确定"
#: contrib/admin/templates/admin/filter.html:1
#, python-format
msgid " By %(title)s "
-msgstr ""
+msgstr " 由 %(title)s"
#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
-msgstr ""
+msgstr "在站点上查看"
#: 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] "请改正下面的错误。"
#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
-msgstr ""
+msgstr "排序中"
#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
-msgstr ""
+msgstr "排序:"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
-msgstr ""
+msgstr "删除"
#: contrib/admin/templates/admin/submit_line.html:4
msgid "Save as new"
-msgstr ""
+msgstr "保存为新的"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save and add another"
-msgstr ""
+msgstr "保存并增加另一个"
#: contrib/admin/templates/admin/submit_line.html:6
msgid "Save and continue editing"
-msgstr ""
+msgstr "保存并继续编辑"
#: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
msgid "Save"
-msgstr "活动"
+msgstr "保存"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -780,12 +756,8 @@ msgid "Password reset"
msgstr "口令重设"
#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮"
-"件发送给你。"
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮件发送给你。"
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -809,19 +781,12 @@ msgid "Password reset successful"
msgstr "口令重设成功"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
#: contrib/admin/templates/registration/password_change_form.html:12
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你"
-"输入的是否正确。"
+msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
+msgstr "请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你输入的是否正确。"
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -872,15 +837,15 @@ msgstr "%(site_name)s 小组"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
-msgstr ""
+msgstr "文档"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
-msgstr ""
+msgstr "书签"
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "文档书签"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
msgid ""
@@ -892,52 +857,52 @@ msgid ""
"as \"internal\" (talk to your system administrator if you aren't sure if\n"
"your computer is \"internal\").
为安装书签,拖动链接到你的工具条,\n" +"或右击鼠标,然后增加到你的书签上。现在你可以从这个站\n" +"点的任何页面选择书签。注意一些这样的书签要求你从一个\n" +"被指定为\"内部\"的计算机上来进行查看(如果你不确定是\n" +"否你的计算机是否是\"内部\"的,同你的系统管理员沟通一\n" +"下。
\n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" -msgstr "" +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 "" +msgid "Jumps you from any page to the documentation for the view that generates that page." +msgstr "对于任何页面跳转到生成这个页面的view所在的文件。" #: contrib/admin/templates/admin_doc/bookmarklets.html:22 -#, fuzzy msgid "Show object ID" -msgstr "对象id" +msgstr "显示对象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 "" +msgid "Shows the content-type and unique ID for pages that represent a single object." +msgstr "用于那些表现单个对象的页面显示 content-type 和唯一ID。" #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" -msgstr "" +msgstr "编辑本对象(当前窗口)" #: contrib/admin/templates/admin_doc/bookmarklets.html:26 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "" +msgstr "用于那些表现单个对象的页面跳转到管理页面。" #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "Edit this object (new window)" -msgstr "" +msgstr "编辑本对象(新窗口)" #: contrib/admin/templates/admin_doc/bookmarklets.html:29 msgid "As above, but opens the admin page in a new window." -msgstr "" +msgstr "同上,但在新窗口中打开管理页面。" #: contrib/redirects/models/redirects.py:7 msgid "redirect from" msgstr "重定向自" #: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." +msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." msgstr "应该是一个绝对路径,不包括域名。例如:'/events/search/'。" #: contrib/redirects/models/redirects.py:9 @@ -945,9 +910,7 @@ msgid "redirect to" msgstr "重定向到" #: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." +msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。" #: contrib/redirects/models/redirects.py:12 @@ -959,8 +922,7 @@ msgid "redirects" msgstr "重定向" #: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "例如:'/about/contact/'。请确保前导和结尾的除号。" #: contrib/flatpages/models/flatpages.py:8 @@ -980,11 +942,8 @@ msgid "template name" msgstr "模板名称" #: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。" +msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." +msgstr "例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。" #: contrib/flatpages/models/flatpages.py:13 msgid "registration required" @@ -1004,15 +963,15 @@ msgstr "简单页面" #: utils/translation.py:335 msgid "DATE_FORMAT" -msgstr "" +msgstr "日期格式" #: utils/translation.py:336 msgid "DATETIME_FORMAT" -msgstr "" +msgstr "日期时间格式" #: utils/translation.py:337 msgid "TIME_FORMAT" -msgstr "" +msgstr "时间格式" #: utils/dates.py:6 msgid "Monday" @@ -1050,23 +1009,28 @@ msgstr "一月" msgid "February" msgstr "二月" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:14 +#: utils/dates.py:27 msgid "March" msgstr "三月" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:14 +#: utils/dates.py:27 msgid "April" msgstr "四月" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:14 +#: utils/dates.py:27 msgid "May" msgstr "五月" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:14 +#: utils/dates.py:27 msgid "June" msgstr "六月" -#: utils/dates.py:15 utils/dates.py:27 +#: utils/dates.py:15 +#: utils/dates.py:27 msgid "July" msgstr "七月" @@ -1121,29 +1085,27 @@ msgstr "十二月" #: utils/timesince.py:12 msgid "year" msgid_plural "years" -msgstr[0] "" +msgstr[0] "年" #: utils/timesince.py:13 msgid "month" msgid_plural "months" -msgstr[0] "" +msgstr[0] "月" #: utils/timesince.py:14 -#, fuzzy msgid "day" msgid_plural "days" -msgstr[0] "五月" +msgstr[0] "天" #: utils/timesince.py:15 msgid "hour" msgid_plural "hours" -msgstr[0] "" +msgstr[0] "小时" #: utils/timesince.py:16 -#, fuzzy msgid "minute" msgid_plural "minutes" -msgstr[0] "站点" +msgstr[0] "分钟" #: models/core.py:7 msgid "domain name" @@ -1165,7 +1127,10 @@ msgstr "站点" msgid "label" msgstr "标签" -#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 +#: models/core.py:29 +#: models/core.py:40 +#: models/auth.py:6 +#: models/auth.py:19 msgid "name" msgstr "名称" @@ -1203,11 +1168,11 @@ msgstr "过期日期" #: models/core.py:71 msgid "session" -msgstr "" +msgstr "会话(session)" #: models/core.py:72 msgid "sessions" -msgstr "" +msgstr "会话(session)" #: models/auth.py:8 msgid "codename" @@ -1217,7 +1182,8 @@ msgstr "代码名称" msgid "Permission" msgstr "许可" -#: models/auth.py:11 models/auth.py:58 +#: models/auth.py:11 +#: models/auth.py:58 msgid "Permissions" msgstr "许可" @@ -1225,7 +1191,8 @@ msgstr "许可" msgid "Group" msgstr "组" -#: models/auth.py:23 models/auth.py:60 +#: models/auth.py:23 +#: models/auth.py:60 msgid "Groups" msgstr "组" @@ -1251,7 +1218,7 @@ msgstr "口令" #: models/auth.py:37 msgid "Use '[algo]$[salt]$[hexdigest]'" -msgstr "" +msgstr "使用 '[algo]$[salt]$[hexdigest]'" #: models/auth.py:38 msgid "staff status" @@ -1278,11 +1245,8 @@ msgid "date joined" msgstr "加入日期" #: models/auth.py:44 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "" -"除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。" +msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." +msgstr "除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。" #: models/auth.py:48 msgid "Users" @@ -1354,7 +1318,7 @@ msgstr "巴西语" #: conf/global_settings.py:50 msgid "Romanian" -msgstr "" +msgstr "罗马尼亚语" #: conf/global_settings.py:51 msgid "Russian" @@ -1362,7 +1326,7 @@ msgstr "俄语" #: conf/global_settings.py:52 msgid "Slovak" -msgstr "" +msgstr "斯洛伐克语" #: conf/global_settings.py:53 msgid "Serbian" @@ -1376,46 +1340,45 @@ msgstr "瑞典语" msgid "Simplified Chinese" msgstr "简体中文" -#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488 +#: core/formfields.py:59 +#: core/meta/fields.py:285 +#: core/meta/fields.py:488 #: core/meta/fields.py:499 -#, fuzzy msgid "This field is required." -msgstr "这个字段无效。" +msgstr "这个字段是必输项。" #: core/formfields.py:336 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "" +msgstr[0] "确定你输入的文本少于 %s 个字符。" #: core/formfields.py:341 -#, fuzzy msgid "Line breaks are not allowed here." -msgstr "这里不允许小写字母。" +msgstr "这里不允许换行符。" -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:436 +#: core/formfields.py:507 +#: core/formfields.py:545 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "" +msgstr "选择一个有效的选项: '%(data)s' 不在 %(choices)s 中。" #: core/formfields.py:601 msgid "The submitted file is empty." -msgstr "" +msgstr "所提交的文件为空。" #: core/formfields.py:655 -#, fuzzy msgid "Enter a whole number between -32,768 and 32,767." -msgstr "输入整数。" +msgstr "输入在 -32,768 到 32,767 之间的一个整数。" #: core/formfields.py:664 -#, fuzzy msgid "Enter a positive number." -msgstr "输入整数。" +msgstr "输入正整数。" #: core/formfields.py:673 -#, fuzzy msgid "Enter a whole number between 0 and 32,767." -msgstr "输入整数。" +msgstr "输入在 0 到 32,767 之间的一个整数。" #: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." @@ -1482,9 +1445,7 @@ msgid "Enter a valid e-mail address." msgstr "输入一个有效的邮件地址。" #: core/validators.py:150 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." +msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。" #: core/validators.py:157 @@ -1525,7 +1486,8 @@ msgstr "格式错误的 XML: %s" msgid "Invalid URL: %s" msgstr "无效 URL: %s" -#: core/validators.py:208 core/validators.py:210 +#: core/validators.py:208 +#: core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s 是一个断开的链接。" @@ -1549,7 +1511,8 @@ msgstr "这个字段必须与 '%s' 字段相匹配。" msgid "Please enter something for at least one field." msgstr "请至少在一个字段上输入些什么。" -#: core/validators.py:266 core/validators.py:277 +#: core/validators.py:266 +#: core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "请要么两个字段都输入或者两个字段都空着。" @@ -1579,15 +1542,13 @@ msgstr "请输入一个有效的小数。" #: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "" -"Please enter a valid decimal number with at most %s total digits." +msgid_plural "Please enter a valid decimal number with at most %s total digits." msgstr[0] "请输入一个有效的小数,最多 %s 个数字。 " #: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "" -"Please enter a valid decimal number with at most %s decimal places." +msgid_plural "Please enter a valid decimal number with at most %s decimal places." msgstr[0] "请输入一个有效的小数,最多 %s 个小数位。 " #: core/validators.py:364 @@ -1615,89 +1576,68 @@ msgstr "不能从 %s 得到任何东西。" #: core/validators.py:431 #, python-format -msgid "" -"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。" #: core/validators.py:464 #, python-format -msgid "" -"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " -"\"%(start)s\".)" -msgstr "" -"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" +msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" +msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" #: core/validators.py:468 #, python-format -msgid "" -"Some text starting on line %(line)s is not allowed in that context. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" +msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)" +msgstr "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" #: core/validators.py:473 #, python-format -msgid "" -"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" +msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" +msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" #: core/validators.py:478 #, python-format -msgid "" -"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" +msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" +msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" #: core/validators.py:482 #, python-format -msgid "" -"A tag on line %(line)s is missing one or more required attributes. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" +msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" +msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" #: core/validators.py:487 #, python-format -msgid "" -"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" +msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" +msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" #: core/meta/fields.py:46 -#, fuzzy, python-format +#, python-format msgid "Please enter a valid %s." -msgstr "请输入一个有效的IP地址。" +msgstr "请输入一个有效的 %s 。" #: core/meta/fields.py:60 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "" +msgstr "%(optname)s 带有 %(fieldname)s 已经存在。" #: core/meta/fields.py:129 msgid " Separate multiple IDs with commas." msgstr " 用逗号分隔多个ID。" #: core/meta/fields.py:132 -msgid "" -" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " 按下 \"Control\",或者在Mac上按 \"Command\" 来选择一个或多个值。" #: core/meta/fields.py:508 -#, fuzzy msgid "Enter a valid filename." -msgstr "输入一个有效的邮件地址。" +msgstr "输入一个有效的文件名。" #: core/meta/fields.py:777 #, 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] "" +msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "请输入有效的 %(self)s ID。值 %(value)r 无效。" #, fuzzy #~ msgid "count" #~ msgstr "内容" +