Commit bfa0bae9 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #13523 -- Updated Russian translation. Thanks to Alexey Boriskin. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b160e1c1

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

+1542 −932

File changed.

Preview size limit exceeded, changes collapsed.

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

+59 −31
Original line number Diff line number Diff line
@@ -7,44 +7,70 @@ msgid "" 
msgstr ""

"Project-Id-Version: Django\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2008-08-29 20:17+0400\n"

"PO-Revision-Date: 2008-08-29 20:23+0300\n"

"Last-Translator: Grigory Fateyev <greg@dial.com.ru>\n"

"POT-Creation-Date: 2010-05-11 14:57+0400\n"

"PO-Revision-Date: 2010-05-11 16:27+0300\n"

"Last-Translator: alexey boriskin <sun.void@gmail.com>\n"

"Language-Team: Dialcom Service <greg@dial.com.ru>\n"

"MIME-Version: 1.0\n"

"Content-Type: text/plain; charset=UTF-8\n"

"Content-Transfer-Encoding: 8bit\n"

"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

"X-Poedit-Language: Russian\n"

"X-Poedit-Country: RUSSIAN FEDERATION\n"



#: contrib/admin/media/js/SelectFilter2.js:33

#: contrib/admin/media/js/SelectFilter2.js:37

#, perl-format

msgid "Available %s"

msgstr "Доступные %s"



#: contrib/admin/media/js/SelectFilter2.js:41

#: contrib/admin/media/js/SelectFilter2.js:45

msgid "Choose all"

msgstr "Выбрать все"



#: contrib/admin/media/js/SelectFilter2.js:46

#: contrib/admin/media/js/SelectFilter2.js:50

msgid "Add"

msgstr "Добавить"



#: contrib/admin/media/js/SelectFilter2.js:48

#: contrib/admin/media/js/SelectFilter2.js:52

msgid "Remove"

msgstr "Удалить"



#: contrib/admin/media/js/SelectFilter2.js:53

#: contrib/admin/media/js/SelectFilter2.js:57

#, perl-format

msgid "Chosen %s"

msgstr "Выбранные %s"



#: contrib/admin/media/js/SelectFilter2.js:54

#: contrib/admin/media/js/SelectFilter2.js:58

msgid "Select your choice(s) and click "

msgstr "Выберите и нажмите "



#: contrib/admin/media/js/SelectFilter2.js:59

#: contrib/admin/media/js/SelectFilter2.js:63

msgid "Clear all"

msgstr "Очистить всё"



#: contrib/admin/media/js/actions.js:18

#: contrib/admin/media/js/actions.min.js:1

msgid "%(sel)s of %(cnt)s selected"

msgid_plural "%(sel)s of %(cnt)s selected"

msgstr[0] "Выбран %(sel)s объект из %(cnt)s"

msgstr[1] "Выбрано %(sel)s объекта из %(cnt)s"

msgstr[2] "Выбрано %(sel)s объектов из %(cnt)s"



#: contrib/admin/media/js/actions.js:109

#: contrib/admin/media/js/actions.min.js:5

msgid "You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."

msgstr "Имеются несохраненные изменения в отдельных полях для редактирования. Если вы запустите действие, несохраненные изменения будут потеряны."



#: contrib/admin/media/js/actions.js:121

#: contrib/admin/media/js/actions.min.js:6

msgid "You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action."

msgstr "Вы выбрали действие, но еще не сохранили изменения, внесенные в некоторых полях для редактирования. Нажмите OK, чтобы сохранить изменения. После сохранения вам придется запустить действие еще раз."



#: contrib/admin/media/js/actions.js:123

#: contrib/admin/media/js/actions.min.js:6

msgid "You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."

msgstr "Вы выбрали действие и не внесли изменений в данные. Возможно, вы хотели воспользоваться кнопкой \"Выполнить\", а не кнопкой \"Сохранить\". Если это так, то нажмите \"Отмена\", чтобы вернуться в интерфейс редактирования. "



#: contrib/admin/media/js/calendar.js:24

#: contrib/admin/media/js/dateparse.js:32

msgid "January February March April May June July August September October November December"
@@ -54,63 +80,65 @@ msgstr "Январь Февраль Март Апрель Май Июнь Июл 
msgid "S M T W T F S"

msgstr "В П В С Ч П С"



#: contrib/admin/media/js/dateparse.js:33

msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"

msgstr "Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота"



#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34

#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72

#: contrib/admin/media/js/collapse.js:9

#: contrib/admin/media/js/collapse.js:21

#: contrib/admin/media/js/collapse.min.js:1

msgid "Show"

msgstr "Показать"



#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63

#: contrib/admin/media/js/collapse.js:16

#: contrib/admin/media/js/collapse.min.js:1

msgid "Hide"

msgstr "Скрыть"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81

#: contrib/admin/media/js/dateparse.js:33

msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"

msgstr "Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:49

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84

msgid "Now"

msgstr "Сейчас"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:53

msgid "Clock"

msgstr "Часы"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80

msgid "Choose a time"

msgstr "Выберите время"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85

msgid "Midnight"

msgstr "Полночь"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86

msgid "6 a.m."

msgstr "6 часов"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87

msgid "Noon"

msgstr "Полдень"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:188

msgid "Cancel"

msgstr "Отмена"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:182

msgid "Today"

msgstr "Сегодня"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:137

msgid "Calendar"

msgstr "Календарь"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180

msgid "Yesterday"

msgstr "Вчера"



#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179

#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184

msgid "Tomorrow"

msgstr "Завтра"

django/conf/locale/ru/formats.py

+26 −9
Original line number Diff line number Diff line
@@ -4,15 +4,32 @@ 


DATE_FORMAT = 'j F Y г.'

TIME_FORMAT = 'G:i:s'

# DATETIME_FORMAT = 

YEAR_MONTH_FORMAT = 'F Y'

DATETIME_FORMAT = 'j F Y г. G:i:s'  

YEAR_MONTH_FORMAT = 'F Y г.'

MONTH_DAY_FORMAT = 'j F'

SHORT_DATE_FORMAT = 'd.m.Y'

# SHORT_DATETIME_FORMAT = 

# FIRST_DAY_OF_WEEK = 

# DATE_INPUT_FORMATS = 

# TIME_INPUT_FORMATS = 

# DATETIME_INPUT_FORMATS = 

SHORT_DATETIME_FORMAT = 'd.m.Y H:i'     

FIRST_DAY_OF_WEEK = 1  # Monday

DATE_INPUT_FORMATS = (

    '%d.%m.%Y',  # '25.10.2006'

    '%d.%m.%y',  # '25.10.06'

    '%Y-%m-%d',  # '2006-10-25'

)

TIME_INPUT_FORMATS = (

    '%H:%M:%S',  # '14:30:59'

    '%H:%M',     # '14:30'

) 

DATETIME_INPUT_FORMATS = (

    '%d.%m.%Y %H:%M:%S',  # '25.10.2006 14:30:59'

    '%d.%m.%Y %H:%M',     # '25.10.2006 14:30'

    '%d.%m.%Y',           # '25.10.2006'

    '%d.%m.%y %H:%M:%S',  # '25.10.06 14:30:59'

    '%d.%m.%y %H:%M',     # '25.10.06 14:30'

    '%d.%m.%y',           # '25.10.06'

    '%Y-%m-%d %H:%M:%S',  # '2006-10-25 14:30:59'

    '%Y-%m-%d %H:%M',     # '2006-10-25 14:30'

    '%Y-%m-%d',           # '2006-10-25'

)

DECIMAL_SEPARATOR = ','

THOUSAND_SEPARATOR = ' '

# NUMBER_GROUPING = 
THOUSAND_SEPARATOR = ' '

NUMBER_GROUPING = 3