fixes #910, #918 and #922 - updated 'sk', 'ru' and 'zh_CN' translations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
author: Georg Bauer <gb@hugo.westfalen.de> 2005-11-26 17:04:35 +0000
committer: Georg Bauer <gb@hugo.westfalen.de> 2005-11-26 17:04:35 +0000
commit: 46c49a859a07dfcf61e749ed9bded48dbf343c00 (patch)
tree: 12ddb9a2f4a9a6b7b55eb0aeddc8ad6e106aa258
parent: 8128f440ee74dd72f9204f657f6180a128dc8eaf (diff)
6 files changed, 714 insertions, 1128 deletions
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 13e42dcf51..9b2f510342 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
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 <ds@@dial.com.ru>\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"PO-Revision-Date: 2005-11-26 00:00\n"
+"Last-Translator: Dmitry Sorokin <ds@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
@@ -18,16 +18,16 @@ msgstr ""
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 msgid "object ID"
-msgstr ""
+msgstr "ID объекта"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "заголовок"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
 msgid "comment"
-msgstr ""
+msgstr "комментарий"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
@@ -76,13 +76,12 @@ msgid "is public"
 msgstr ""
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
 msgid "IP address"
-msgstr "E-mail адрес:"
+msgstr "IP адрес"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+msgstr "удален"
 
 #: contrib/comments/models/comments.py:27
 msgid ""
@@ -92,11 +91,11 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #: contrib/comments/models/comments.py:32
 msgid "Comments"
-msgstr ""
+msgstr "Комментарии"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
@@ -112,27 +111,31 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Добавил  %(user)s  %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
 msgid "person's name"
-msgstr ""
+msgstr "имя человека"
 
 #: contrib/comments/models/comments.py:166
-#, fuzzy
 msgid "ip address"
-msgstr "E-mail адрес:"
+msgstr "ip адрес:"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr ""
+msgstr "одобрено администрацией"
 
 #: contrib/comments/models/comments.py:172
 msgid "Free comment"
-msgstr ""
+msgstr "Свободный комментарий"
 
 #: contrib/comments/models/comments.py:173
 msgid "Free comments"
-msgstr ""
+msgstr "Свободные комментарии"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
@@ -184,15 +187,15 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:278
 msgid "deletion date"
-msgstr ""
+msgstr "дата удаления"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Удалено модератором"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Удалено модератором"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
@@ -201,15 +204,15 @@ msgstr ""
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Анонимный пользователь не может голосовать"
 
 #: contrib/comments/views/karma.py:22
 msgid "Invalid comment ID"
-msgstr ""
+msgstr "Неверный ID комментария"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Нельзя голосовать за себя"
 
 #: contrib/comments/views/comments.py:25
 msgid ""
@@ -247,7 +250,7 @@ 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 ""
+msgstr "Одно или больше обязательных полей не были заполнены"
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
@@ -266,62 +269,61 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:40
+#: contrib/admin/filterspecs.py:32
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\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"
+msgstr "Администрирование сайта"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Выберите %s"
 
-#: contrib/admin/views/main.py:65
-#, fuzzy, python-format
+#: contrib/admin/views/main.py:66
+#, python-format
 msgid "Select %s to change"
-msgstr "Щелкните для изменения"
+msgstr "Выберите %s для изменения"
 
-#: contrib/admin/views/main.py:412
+#: 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 <em>(500)</em>"
+msgstr "Ошибка сервера <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Произошла ошибка. Отчет об ошибке отправлен администраторам сайта по e-mailи "
+"она должна быть вскоре исправлена. Благодарим вас на терпение и помощь."
+
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -592,26 +643,17 @@ msgstr "Административный сайт Django"
 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/login.html:15
+msgid "Username:"
+msgstr "Имя:"
 
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Ошибка сервера <em>(500)</em>"
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Пароль:"
 
-#: 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/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Вы <a href=\"/password_reset/\">забыли пароль</a>?"
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -622,69 +664,33 @@ msgstr "Страница не найдена"
 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 "Имя:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Пароль:"
-
-#: contrib/admin/templates/admin/login.html:20
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Вы <a href=\"/password_reset/\">забыли пароль</a>?"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-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/base.html:23
-msgid "Change password"
-msgstr "Изменение пароля"
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Выход"
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Порядок:"
 
 #: 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 "
 "types of objects:"
 msgstr ""
-"Удаление обьекта %(object_name)s '%(object)s' приведет к удалению зависимых "
-"но, предоставленных вам прав недостаточно для удаления следующихтипов "
+"Удаление объекта %(object_name)s '%(object)s' приведет к удалению зависимых "
+" элементов, но предоставленных вам прав недостаточно для удаления следующих типов "
 "объектов:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:14
@@ -694,53 +700,47 @@ msgid ""
 "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/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/base.html:23
+msgid "Welcome,"
+msgstr "Добро пожаловать,"
 
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Изменение пароля"
 
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+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
 msgid "Save"
+msgstr "Сохранить"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
 msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -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 "Команда сайта di %(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"
@@ -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 "Неверный URL: %s"
 #: 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
--- a/django/conf/locale/sk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/django.mo
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 <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "presmerovanцҐ z"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Tu by sa mala pouеЎiе╔ absolц╨tna cesta, bez domц╘ny. Napr.: '/events/search/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "presmerovanцҐ na "
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Tu mцЄеЎe byе╔ buд▐ absolц╨tna cesta (ako hore) alebo plnц╘  URL zaд█цґnajц╨ce s "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "presmerovanie"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "presmerovania"
+
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 msgid "object ID"
-msgstr "Ukц║еЎ objekt id"
+msgstr "objekt ID"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
@@ -69,12 +100,12 @@ msgstr "je platnц╘ hodnotenie"
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr "dцґtum/д█as odoslania"
+msgstr "dц║tum/д█as poslania"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr "je zverejnenцҐ"
+msgstr "je zverц╘jnenцҐ"
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
 msgid "IP address"
@@ -89,8 +120,8 @@ msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
-"Oznaд█ tц╨to voдЎbu ak je komentц║r nevhodnцҐ.  \"Tento komentц║r bol vymazanцҐ\" "
-"sa zobrazцґ namiesto neho."
+"Ak je tento komentц║r nevhodnцҐ, tu ho poznaд█te.  \"Tento komentц║r bol vymazanцҐ"
+"\" tц║to sprц║va sa objavцґ namiesto neho."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -103,10 +134,9 @@ msgstr "Komentц║re"
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
 msgid "Content object"
-msgstr "Obsah objectu"
+msgstr "Obsah objektu"
 
 #: contrib/comments/models/comments.py:113
-#, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
 "\n"
@@ -114,7 +144,7 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
-"Poslal %(user)s at %(date)s\n"
+"Od  %(user)s dе┬a %(date)s\n"
 "\n"
 "%(comment)s\n"
 "\n"
@@ -122,7 +152,7 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:163
 msgid "person's name"
-msgstr "meno osoby"
+msgstr "krstnц╘ meno"
 
 #: contrib/comments/models/comments.py:166
 msgid "ip address"
@@ -130,7 +160,7 @@ msgstr "ip adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr "schvalenцҐ za zamestnanca"
+msgstr "je zamestnancom"
 
 #: contrib/comments/models/comments.py:172
 msgid "Free comment"
@@ -150,20 +180,19 @@ msgstr "ц╨daje stavu"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr "Karma stav"
+msgstr "Karma ц╨daj"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr "Karma stavy"
+msgstr "Karma ц╨daje"
 
 #: contrib/comments/models/comments.py:223
-#, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d hodnotil  %(user)s"
+msgstr "%(score)d hodnotiteдЎ %(user)s"
 
 #: contrib/comments/models/comments.py:248
 msgid "flag date"
-msgstr "nц║vestie dц║tumu"
+msgstr "dц║tumovц╘ nц║vestie"
 
 #: contrib/comments/models/comments.py:251
 msgid "User flag"
@@ -174,59 +203,53 @@ msgid "User flags"
 msgstr "Nц║vestia uеЎцґvateдЎa"
 
 #: contrib/comments/models/comments.py:256
-#, python-format
 msgid "Flag by %r"
-msgstr "Nц║vestie %r"
+msgstr " %r nц║vestie"
 
 #: 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 oznaд█enцҐ %(user)s:\n"
+"Tento komentц║r bol oznaд█enцҐ uеЎцґvateдЎom  %(user)s:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/models/comments.py:278
 msgid "deletion date"
-msgstr "vymazanцҐ dц║tum"
+msgstr "odstrц║nenц╘ dц║tumy"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr "Prostrednцґk mazania"
+msgstr "Moderц║tor odstrц║nenia"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr "Prostrednцґk mazanцґ"
+msgstr "Moderц║tor odstrц║nenцґ"
 
 #: contrib/comments/models/comments.py:286
-#, python-format
 msgid "Moderator deletion by %r"
-msgstr "Prostrednцґk mazania bol %r"
+msgstr "Moderц║tor odstrц║nenia %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr "Ak chcete hlasovaе╔, najprv sa musцґte prihlц║siе╔"
+msgstr "Hlasovaе╔ mцЄеЎu len prihlц║senцґ uеЎцґvatelia"
 
 #: contrib/comments/views/karma.py:22
 msgid "Invalid comment ID"
-msgstr "NeplatnцҐ komentц║r ID"
+msgstr "Chybnц╘ ID komentц║ra"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr "NemoеЎete voliе╔ vlastnцҐ prцґspevok"
+msgstr "NemцЄеЎeе║ hlasovaе╔ za seba"
 
 #: contrib/comments/views/comments.py:25
 msgid ""
 "This rating is required because you've entered at least one other rating."
-msgstr ""
-"Toto hlasovanie je nevyhnutnц╘, lebo sц╨visцґ s predchц║dzjц╨cou voдЎbou.Tц║to "
-"voдЎba je nevyhnutnц║ nakoдЎko je pokraд█ovanцґm vaе║ej predchц║dzajц╨cej."
+msgstr "Toto hlasovanie je nevyhnutnц╘, lebo sц╨visцґ s predchц║dzjц╨cou voдЎbou."
 
 #: 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"
@@ -238,41 +261,40 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Tento komentц║r bol poslanцҐ uеЎцґvateдЎom, ktorцҐ ma menej neеЎ %(count)s "
+"Tento komentц║r je od uеЎцґvateдЎa, ktorцҐ doteraz poslal minimц║lne %(count)s "
 "komentц║r:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Tento komentц║r bol poslanцҐ uеЎцґvateдЎom, ktorцҐ ma menej neеЎ %(count)s "
+"Tento komentц║r je od uеЎцґvateдЎa, ktorцҐ doteraz poslal najmenej %(count)s "
 "komentц║rov:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/views/comments.py:114
-#, python-format
 msgid ""
 "This comment was posted by a sketchy user:\n"
 "\n"
 "%(text)s"
 msgstr ""
-"Tento komentц║r bol poslanцҐ prchkцҐm uzцґvateдЎom:\n"
+"Tento komentц║r je od veдЎmi nц║znakovц╘ho uеЎцґvateдЎa:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr "Sц╨ povolenц╘ len POST metцЁdy"
+msgstr "Dovolenц╘ sц╨ len POST"
 
 #: 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"
+msgstr "Jedno alebo viac povinnцҐch polцґ nebolo vloеЎenцҐch"
 
 #: 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 "
+msgstr "Niekto skц╨е║al manipulovaе╔ s formulц║rom komentц║ra (poruе║enц║ bezpeд█nosе╔)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
@@ -280,63 +302,65 @@ msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
 msgstr ""
-"Formulц║r kometц║ra mц║ chybnцҐ vцҐstupnцҐ parameter -- objectID bol "
-"chybnцҐFormulц║r komentц║ra ma chybnцҐ 'cieдЎovцҐ' parameter  -- the objekt ID bol "
+"Formulц║r komentц║ra ma chybnцҐ 'cieдЎovцҐ' parameter  -- the objekt ID bol "
 "poе║kodenцҐ"
 
 #: 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'"
+msgstr "Formulц║r komentц║ra neposkytuje odpoveд▐ buд▐ 'prezri' alebo 'poе║li'"
 
-#: contrib/admin/filterspecs.py:40
-#, python-format
+#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:284
+msgid "URL"
+msgstr "URL"
+
+#: contrib/flatpages/models/flatpages.py:7
 msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
-"<h3>Od %s:</h3>\n"
-"<ul>\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"
-"<p class=\"help\">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\").</p>\n"
-msgstr ""
-"\n"
-"<p class=\"help\">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"
-"\").</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Dokumentц║cia  tejto strц║nky"
-
-#: 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 "Skoд█ na дЎubovoдЎnц╨ strц║nku dokumentц║cie, z ponuky na tejto strц║nke."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#, fuzzy
-msgid "Show object ID"
-msgstr "Ukц║еЎ 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 ""
-"Ukц║еЎ  content-type a jedineд█nц╘  ID pre strц║nky reprezentovanц╘ jednoduchцҐmi "
-"objektami."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Edituj tento objekt (aktuц║lne okno)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Skoд█ na admin strц║nku z jednoduchцҐch objektov zastupujц╨cich strц║nku."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Edituj tento objekt (novц╘ okno)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Ako hore, ale otvorцґ admin strц║nku v novom okne"
-
-#: contrib/redirects/models/redirects.py:7
-msgid "redirect from"
-msgstr "presmerovanцҐ z"
-
-#: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Tu by sa mala pouеЎiе╔ absolц╨tna cesta, bez domц╘ny. Napr.: '/events/search/'."
-
-#: contrib/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr "presmerovanцҐ na "
-
-#: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Tu mцЄеЎe byе╔ buд▐ absolц╨tna cesta (ako hore) alebo plnц╘  URL zaд█цґnajц╨ce s "
-"'http://'."
-
-#: contrib/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr "presmerovanie"
-
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr "presmerovania"
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Prцґklad: '/about/contact/'. Uistite sa, еЎe mц║te vloеЎenц╘ ako ц╨vodnц╘ tak aj "
-"zц║vereд█nц╘ lomцґtka."
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "nц║zov"
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "obsah"
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "povolenц╘ komentц║re"
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "meno predlohy"
-
-#: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Prцґklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systц╘m pouеЎije  "
-"'flatfiles/default'."
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "musцґte byе╔ zaregistrovanцҐ"
-
-#: 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/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "plochц║ strц║nka"
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "plochц╘ strц║nky"
-
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
 msgstr "DATUM_FORMAT"
@@ -1162,24 +860,22 @@ msgid "Dec."
 msgstr "Dec."
 
 #: utils/timesince.py:12
-#, fuzzy
 msgid "year"
 msgid_plural "years"
-msgstr[0] "Tento rok"
-msgstr[1] "Tento rok"
+msgstr[0] "rok"
+msgstr[1] "rokov"
 
 #: utils/timesince.py:13
-#, fuzzy
 msgid "month"
 msgid_plural "months"
-msgstr[0] "Tento mesiac"
-msgstr[1] "Tento mesiac"
+msgstr[0] "mesiac"
+msgstr[1] "mesiacov"
 
 #: utils/timesince.py:14
 msgid "day"
 msgid_plural "days"
-msgstr[0] "Dnes"
-msgstr[1] "Dnes"
+msgstr[0] "д▐eе┬"
+msgstr[1] "dnцґ"
 
 #: utils/timesince.py:15
 msgid "hour"
@@ -1299,7 +995,7 @@ msgstr "heslo"
 
 #: models/auth.py:37
 msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr ""
+msgstr "PouеЎi '[algo]$[salt]$[hexdigest]'"
 
 #: models/auth.py:38
 msgid "staff status"
@@ -1425,47 +1121,40 @@ msgstr "е═vц╘dsky"
 msgid "Simplified Chinese"
 msgstr "Zjednoduе║enц║ д█inе║tina "
 
-#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
-#: core/meta/fields.py:499
-#, fuzzy
+#: core/formfields.py:59 core/meta/fields.py:267 core/meta/fields.py:421
+#: core/meta/fields.py:432
 msgid "This field is required."
-msgstr "Toto pole nie je platnц╘."
+msgstr "Toto pole  je nevyhnutnц╘."
 
-#: core/formfields.py:336
-#, fuzzy, python-format
+#: core/formfields.py:241
 msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Uistite sa, еЎe text je kratе║цґ ako %s znakov."
-msgstr[1] "Uistite sa, еЎe text je kratе║цґ ako %s znakov."
+msgstr[0] "Zabezpeд█te aby vц║е║ text bol menе║цґ ako %s znak."
+msgstr[1] "Zabezpeд█te aby vц║е║ text bol menе║цґ ako %s znakov."
 
-#: core/formfields.py:341
-#, fuzzy
+#: core/formfields.py:246
 msgid "Line breaks are not allowed here."
-msgstr "Malц╘ pцґsmena tu nie sц╨ povolenц╘."
+msgstr "NovцҐ riadok tu nieje povolenцҐ."
 
-#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
-#, python-format
+#: core/formfields.py:339 core/formfields.py:408 core/formfields.py:446
 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."
+msgstr "Vyberte si platnц╨ voдЎbu; '%(data)s' nie je v %(choices)s."
 
-#: core/formfields.py:601
+#: core/formfields.py:502
 msgid "The submitted file is empty."
-msgstr "PoslanцҐ sц╨bor je prц║zdny."
+msgstr "PoslanцҐ sц╨bor je prц║zdnцҐ."
 
-#: core/formfields.py:655
-#, fuzzy
+#: core/formfields.py:554
 msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "VloеЎte celц╘ д█цґslo s hodnotou medzi -32,768 a 32,767."
+msgstr "VloеЎte celц╘ д█цґslo s hodnotou medzi -32768 a 32767."
 
-#: core/formfields.py:664
-#, fuzzy
+#: core/formfields.py:563
 msgid "Enter a positive number."
 msgstr "VloеЎte celц╘ kladnц╘ д█цґslo."
 
-#: core/formfields.py:673
-#, fuzzy
+#: core/formfields.py:572
 msgid "Enter a whole number between 0 and 32,767."
-msgstr "VloеЎte celц╘ д█цґslo s hodnotou medzi 0 a 32,767."
+msgstr "VloеЎte celц╘ д█цґslo s hodnotou medzi 0 a 32767."
 
 #: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
@@ -1540,45 +1229,38 @@ msgstr ""
 "nahratцҐ poе║kodenцҐ obrц║zok."
 
 #: core/validators.py:157
-#, python-format
 msgid "The URL %s does not point to a valid image."
-msgstr "URL %s neodkazuje na platnцҐ obrц║zok."
+msgstr "URL %s neukazuje na platnцҐ obrц║zok."
 
 #: core/validators.py:161
-#, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "TelefцЁnne д█цґslo musцґ maе╔ formц║t XXX-XXX-XXXX. \"%s\" je neplatnц╘."
+msgstr "TelefцЁnne д█цґslo musцґ maе╔ formц║t XXX-XXX-XXXX. д▄цґslo \"%s\" je neplatnц╘."
 
 #: core/validators.py:169
-#, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "URL %s neodkazuje na platnц╘ QuickTime video."
+msgstr "URL %s neukazuje na platnц╘ QuickTime video."
 
 #: core/validators.py:173
 msgid "A valid URL is required."
 msgstr "Platnц╘ URL je poеЎadovanц╘."
 
 #: core/validators.py:187
-#, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
 "%s"
 msgstr ""
-"Platnц║ HTML je poеЎadovanц║. Konkrц╘tne chyby sц╨:\n"
+"Je poеЎadovanц║ bezchybnц║ strц║nka  HTML. Zistenц╘ chyby sц╨:\n"
 "%s"
 
 #: core/validators.py:194
-#, python-format
 msgid "Badly formed XML: %s"
-msgstr "Zle formovanц╘ XML: %s"
+msgstr "Chybne formovanц╘ XML: %s"
 
 #: core/validators.py:204
-#, python-format
 msgid "Invalid URL: %s"
-msgstr "NeplatnцҐ URL %s"
+msgstr "Neplatnц╘ URL: %s"
 
 #: core/validators.py:208 core/validators.py:210
-#, python-format
 msgid "The URL %s is a broken link."
 msgstr "Odkaz na URL %s je neplatnцҐ."
 
@@ -1587,14 +1269,12 @@ msgid "Enter a valid U.S. state abbreviation."
 msgstr "VloеЎte platnц╨ skratku U.S. е║tц║tu."
 
 #: 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] "Vyjadrujte sa sluе║ne! Slovo %s tu nie je dovolenц╘ pouеЎivaе╔."
 msgstr[1] "Vyjadrujte sa sluе║ne! Slovц║ %s tu nie je dovolenц╘ pouеЎivaе╔."
 
 #: core/validators.py:238
-#, python-format
 msgid "This field must match the '%s' field."
 msgstr "Toto pole sa musцґ zhodovaе╔ s poдЎom '%s'. "
 
@@ -1607,12 +1287,10 @@ msgid "Please enter both fields or leave them both empty."
 msgstr "Prosцґm vloеЎte obidve polia, alebo nechajte ich obe prц║zdne. "
 
 #: core/validators.py:284
-#, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Toto pole musцґ byе╔ vyplnenц╘ tak, еЎe %(field)s obsahuje %(value)s"
 
 #: core/validators.py:296
-#, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "Toto pole musцґ byе╔ vyplnenц╘ tak, еЎe %(field)s nesmie obsahovaе╔ %(value)s"
@@ -1622,7 +1300,6 @@ msgid "Duplicate values are not allowed."
 msgstr "Duplicitnц╘ hodnoty nie sц╨ povolenц╘."
 
 #: core/validators.py:338
-#, python-format
 msgid "This value must be a power of %s."
 msgstr "Tц║to hodnota musцґ byе╔ mocninou  %s."
 
@@ -1631,7 +1308,6 @@ msgid "Please enter a valid decimal number."
 msgstr "Prosцґm vloеЎte platnц╘ desiatkovц╘ д█цґslo. "
 
 #: 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."
@@ -1639,7 +1315,6 @@ msgstr[0] "Prosцґm vloеЎte platnц╘ desiatkovц╘ д█цґslo s najviac %s д█цґslicou."
 msgstr[1] "Prosцґm vloеЎte platnц╘ desiatkovц╘ д█цґslo s najviac %s д█цґslicami."
 
 #: 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."
@@ -1649,12 +1324,10 @@ msgstr[1] ""
 "Prosцґm vloеЎte platnц╘ desatinnц╘ д█цґslo s najviac %s desatinnцҐmi miestami."
 
 #: core/validators.py:364
-#, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Presvedд█te sa, еЎe posielanцҐ sц╨bor nemц║ menej ako %s bytov."
 
 #: core/validators.py:365
-#, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Presvedд█te sa, еЎe posielanцҐ sц╨bor nemц║ viac ako %s bytov."
 
@@ -1667,19 +1340,16 @@ msgid "This field is invalid."
 msgstr "Toto pole nie je platnц╘."
 
 #: core/validators.py:428
-#, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Niд█ som nemohol zцґskaе╔ z %s."
 
 #: core/validators.py:431
-#, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 " URL %(url)s vrц║tilo neplatnц╨ hlaviд█ku  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\".)"
@@ -1688,7 +1358,6 @@ msgstr ""
 "zaд█цґna 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\".)"
@@ -1697,7 +1366,6 @@ msgstr ""
 "(Riadok zaд█цґna 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\".)"
@@ -1706,7 +1374,6 @@ msgstr ""
 "(start)s\".)"
 
 #: core/validators.py:478
-#, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
@@ -1715,7 +1382,6 @@ msgstr ""
 "(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\".)"
@@ -1724,7 +1390,6 @@ msgstr ""
 "zaд█цґna 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\".)"
@@ -1733,39 +1398,31 @@ msgstr ""
 "s \"%(start)s\".)"
 
 #: core/meta/fields.py:46
-#, fuzzy, python-format
 msgid "Please enter a valid %s."
 msgstr "Prosцґm vloеЎte platnц╘ %s."
 
 #: core/meta/fields.py:60
-#, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s s tцҐmto %(fieldname)s uеЎ existuje."
+msgstr "%(optname)s s %(fieldname)s uеЎ existuje."
 
-#: core/meta/fields.py:129
+#: core/meta/fields.py:111
 msgid " Separate multiple IDs with commas."
 msgstr "Identifikц║tory oddeдЎte  д█iarkami."
 
-#: core/meta/fields.py:132
+#: core/meta/fields.py:114
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " PodrеЎte \"Control\", alebo \"Command\" na  Mac_u, na vцҐber viac ako jednej "
 "poloеЎky."
 
-#: core/meta/fields.py:508
-#, fuzzy
+#: core/meta/fields.py:441
 msgid "Enter a valid filename."
 msgstr "VloеЎte platnц╘ meno sц╨boru."
 
-#: core/meta/fields.py:777
-#, python-format
+#: core/meta/fields.py:685
 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ц╘"
-
-#~ msgid "Use an MD5 hash -- not the raw password."
-#~ msgstr ""
-#~ "VloеЎte takц╨ hodnotu hesla , ako vц║m ju vrц║ti MD5, nevkladajte ho priamo. "
+msgstr[0] "Prosцґm vloеЎte platnц╘ %(self)s IDs. Hodnota  %(value)r je neplatnц║."
+msgstr[1] "Prosцґm vloеЎte platnц╘ %(self)s IDs. Hodnoty  %(value)r sц╨ neplatnц╘."
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 05b11942c2..525585b7b7 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 1b66e0a9d7..293ea1ce2e 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-11-25 17:26-0600\n"
-"PO-Revision-Date: 2005-11-16 12:55+0800\n"
+"PO-Revision-Date: 2005-11-26 23:02+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -21,95 +21,89 @@ msgstr ""
 
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
-#, fuzzy
 msgid "object ID"
-msgstr "Е╞╧Х╠║id"
+msgstr "Е╞╧Х╠║ID"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "ЕєїЕґ≈Ф═┤И╒≤"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
-#, fuzzy
 msgid "comment"
-msgstr "Е├┘Еў╧"
+msgstr "Х╞└Хў╨"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
-msgstr ""
+msgstr "Гґ┴Г╨ї #1"
 
 #: contrib/comments/models/comments.py:12
 msgid "rating #2"
-msgstr ""
+msgstr "Гґ┴Г╨ї #2"
 
 #: contrib/comments/models/comments.py:13
 msgid "rating #3"
-msgstr ""
+msgstr "Гґ┴Г╨ї #3"
 
 #: contrib/comments/models/comments.py:14
 msgid "rating #4"
-msgstr ""
+msgstr "Гґ┴Г╨ї #4"
 
 #: contrib/comments/models/comments.py:15
 msgid "rating #5"
-msgstr ""
+msgstr "Гґ┴Г╨ї #5"
 
 #: contrib/comments/models/comments.py:16
 msgid "rating #6"
-msgstr ""
+msgstr "Гґ┴Г╨ї #6"
 
 #: contrib/comments/models/comments.py:17
 msgid "rating #7"
-msgstr ""
+msgstr "Гґ┴Г╨ї #7"
 
 #: contrib/comments/models/comments.py:18
 msgid "rating #8"
-msgstr ""
+msgstr "Гґ┴Г╨ї #8"
 
 #: contrib/comments/models/comments.py:23
 msgid "is valid rating"
-msgstr ""
+msgstr "Ф≤╞Ф≈═Ф∙┬Гґ┴Г╨ї"
 
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr ""
+msgstr "Ф≈╔Ф°÷/Ф≈ІИ≈ЄЕЇ╡Ф▐░Д╨є"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr ""
+msgstr "Е┘╛Е╪─"
 
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
+#: contrib/comments/models/comments.py:26
+#: contrib/admin/views/doc.py:274
 msgid "IP address"
-msgstr "И┌ўД╩ІЕ°╟Е²─"
+msgstr "IPЕ°╟Е²─"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+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 ""
+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 ""
+msgstr "Х╞└Хў╨"
 
 #: contrib/comments/models/comments.py:32
-#, fuzzy
 msgid "Comments"
-msgstr "Е┘│Хў╦Х╞└Хў╨"
+msgstr "Х╞└Хў╨"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
-#, fuzzy
 msgid "Content object"
-msgstr "Е├┘Еў╧Г╠╩Е·▀"
+msgstr "Е├┘Еў╧Е╞╧Х╠║"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -120,72 +114,69 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Г■╠ %(user)s Е°╗ %(date)s Е╪═ХЄЄ\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
-#, fuzzy
 msgid "person's name"
-msgstr "Е░█Еґ≈"
+msgstr "Д╨╨Е░█"
 
 #: contrib/comments/models/comments.py:166
-#, fuzzy
 msgid "ip address"
-msgstr "И┌ўД╩ІЕ°╟Е²─"
+msgstr "IPЕ°╟Е²─"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr ""
+msgstr "Г■╠Е⌡╒И≤÷Ф┴╧Е┤├"
 
 #: contrib/comments/models/comments.py:172
-#, fuzzy
 msgid "Free comment"
-msgstr "Е┘│Хў╦Х╞└Хў╨"
+msgstr "Х┤╙Г■╠Х╞└Хў╨"
 
 #: contrib/comments/models/comments.py:173
-#, fuzzy
 msgid "Free comments"
-msgstr "Е┘│Хў╦Х╞└Хў╨"
+msgstr "Х┤╙Г■╠Х╞└Хў╨"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
-msgstr ""
+msgstr "ЕЎ≈Е┬├"
 
 #: contrib/comments/models/comments.py:210
-#, fuzzy
 msgid "score date"
-msgstr "Х©┤Ф°÷Ф≈╔Ф°÷"
+msgstr "ЕЎ≈Е┬├Ф≈╔Ф°÷"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr ""
+msgstr "KarmaЕЎ≈Е┬├"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr ""
+msgstr "KarmaЕЎ≈Е┬├"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "Х╒╚ %(user)s Еў Г╨їД╦╨ %(score)d"
 
 #: contrib/comments/models/comments.py:248
-#, fuzzy
 msgid "flag date"
-msgstr "Гў─Е█∙И║╣И²╒"
+msgstr "Ф═┤Хў╟Ф≈╔Ф°÷"
 
 #: contrib/comments/models/comments.py:251
-#, fuzzy
 msgid "User flag"
-msgstr "Г■╗Ф┬Ї"
+msgstr "Г■╗Ф┬ЇФ═┤Е©≈"
 
 #: contrib/comments/models/comments.py:252
-#, fuzzy
 msgid "User flags"
-msgstr "Г■╗Ф┬Ї"
+msgstr "Г■╗Ф┬ЇФ═┤Е©≈"
 
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr ""
+msgstr "Г■╠ %r Ф═┤Хў╟"
 
 #: contrib/comments/models/comments.py:271
 #, python-format
@@ -194,56 +185,57 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"ФґєХ╞└Хў╨Г■╠ %(user)s Ф═┤Хў╟:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/models/comments.py:278
-#, fuzzy
 msgid "deletion date"
-msgstr "sessionФ∙╟Ф█ў"
+msgstr "Е┬═И≥єФ≈╔Ф°÷"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Д╩╡Хё│Е┬═И≥є"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Д╩╡Хё│Е┬═И≥є"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Х╒╚ %r Д╩╡Хё│Е┬═И≥є"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Е▄©Е░█Г■╗Ф┬ЇД╦█Х┐ҐФ┼∙Г╔╗"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "Е┘│Хў╦Х╞└Хў╨"
+msgstr "Ф≈═Ф∙┬Х╞└Хў╨ID"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Д╦█Х┐ҐГ╩≥Х┤╙ЕЇ╡Ф┼∙Г╔╗"
 
 #: contrib/comments/views/comments.py:25
-msgid ""
-"This rating is required because you've entered at least one other rating."
-msgstr ""
+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"
+"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"
+"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
 "\n"
 "%(text)s"
 msgstr[0] ""
+"ФґєХ╞└Хў╨Г■╠Д╦─Д╦╙Е▐▒Х║╗Х©┤Е╟▒Д╨▌ %(count)s Ф²║Х╞└Хў╨Г └Г■╗Ф┬ЇЕ╪═ХЄЄ:\n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:114
 #, python-format
@@ -252,33 +244,34 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
+"ФґєХ╞└Хў╨Г■╠Д╦─Д╦╙Х┌єФ╣┘Г └Г■╗Ф┬ЇЕ╪═ХЄЄО╪ \n"
+"\n"
+"%(text)s"
 
 #: contrib/comments/views/comments.py:186
 #: contrib/comments/views/comments.py:277
 msgid "Only POSTs are allowed"
-msgstr ""
+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 ""
+msgstr "Д╦─Д╦╙Ф┬√Еє Д╦╙Е©┘ХЎ⌠Еґ≈Фў╣Ф╡║Ф°┴Х╒╚Ф▐░Д╨є"
 
 #: contrib/comments/views/comments.py:194
 #: contrib/comments/views/comments.py:283
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+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 ""
+msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgstr "Х╞└Хў╨Х║╗Ф═╪Ф°┴Д╦─Д╦╙Ф≈═Ф∙┬Г └ 'target' Е▐┌Ф∙╟ -- Е╞╧Х╠║ ID Ф≈═Ф∙┬"
 
 #: 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 "Х╞└Хў╨Х║╗Ф═╪Ф≈═ФЁ∙Ф▐░ДЎ⌡ 'И╒└Хї┬' Ф┬√ 'Е╪═ХЄЄ' Е┼÷Х┐Ґ"
 
 #: contrib/admin/filterspecs.py:40
 #, python-format
@@ -286,45 +279,46 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
+"<h3>Г■╠ %s:</h3>\n"
+"<ul>\n"
 
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py: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 <em>(500)</em>"
 msgstr "Ф°█Е┼║Е≥╗И■≥Х╞╞ <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Еґ≤Е°╗Д╦─Д╦╙И■≥Х╞╞Ц─┌Еў┐ЕЇ╡Г╩▐И─ Х©┤Г■╣Еґ░И┌ўД╩ІХ╒╚Ф┼╔Е▒┼Г╩≥Г╚≥Г┌╧Гў║Г░├Е▒≤Д╨├О╪▄Е╧ІД╦■Е╨■Х╞╔ЕЎ┬Е©╚Х╒╚Ф■╧ФґёЦ─┌Х╟╒"
-"Х╟╒ДҐ═Г └Е┘ЁЕ©┐Ц─┌"
+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\").</p>\n"
 msgstr ""
+"\n"
+"<p class=\"help\">Д╦╨Еў┴Хё┘Д╧іГґЎО╪▄Ф▀√Е┼╗И⌠ЎФ▌╔Е┬╟ДҐ═Г └ЕЇ╔Е┘ЇФ²║О╪▄\n"
+"Ф┬√Е▐ЁЕ┤╩И╪═Ф═┤О╪▄Г└ІЕ░▌Е╒·Е┼═Е┬╟ДҐ═Г └Д╧іГґЎД╦┼Ц─┌Г▌╟Е°╗ДҐ═Е▐╞Д╩╔Д╩▌Х©≥Д╦╙Г╚≥\n"
+"Г┌╧Г └Д╩╩ДҐ∙И║╣И²╒И─┴Ф▀╘Д╧іГґЎЦ─┌ФЁ╗Ф└▐Д╦─Д╨⌡Х©≥Ф═ЇГ └Д╧іГґЎХі│Ф╠┌ДҐ═Д╩▌Д╦─Д╦╙\n"
+"Х╒╚Ф▄┤Еў Д╦╨\"Е├┘И┐╗\"Г └Хў║Гў≈Ф°╨Д╦┼Ф²╔Х©⌡Х║▄Ф÷╔Г°▀О╪┬Еі┌Ф·°ДҐ═Д╦█Г║ўЕў Ф≤╞\n"
+"Е░іДҐ═Г └Хў║Гў≈Ф°╨Ф≤╞Е░іФ≤╞\"Е├┘И┐╗\"Г └О╪▄Е░▄ДҐ═Г └ГЁ╩Г╩÷Гў║Г░├Е▒≤Ф╡÷И─ Д╦─\n"
+"Д╦▀Ц─┌</p>\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 "Е├┘Еў╧"
+
author	Georg Bauer <gb@hugo.westfalen.de>	2005-11-26 17:04:35 +0000
committer	Georg Bauer <gb@hugo.westfalen.de>	2005-11-26 17:04:35 +0000
commit	46c49a859a07dfcf61e749ed9bded48dbf343c00 (patch)
tree	12ddb9a2f4a9a6b7b55eb0aeddc8ad6e106aa258
parent	8128f440ee74dd72f9204f657f6180a128dc8eaf (diff)