Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit bfa0bae9a9eb14267ccdf5aa6b142ca1b5a9c314 1 parent b160e1c
Russell Keith-Magee authored May 11, 2010
BIN  django/conf/locale/ru/LC_MESSAGES/django.mo
Binary file not shown
2,474  django/conf/locale/ru/LC_MESSAGES/django.po
1542 additions, 932 deletions not shown
BIN  django/conf/locale/ru/LC_MESSAGES/djangojs.mo
Binary file not shown
90  django/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -7,44 +7,70 @@ msgid ""
7 7
 msgstr ""
8 8
 "Project-Id-Version: Django\n"
9 9
 "Report-Msgid-Bugs-To: \n"
10  
-"POT-Creation-Date: 2008-08-29 20:17+0400\n"
11  
-"PO-Revision-Date: 2008-08-29 20:23+0300\n"
12  
-"Last-Translator: Grigory Fateyev <greg@dial.com.ru>\n"
  10
+"POT-Creation-Date: 2010-05-11 14:57+0400\n"
  11
+"PO-Revision-Date: 2010-05-11 16:27+0300\n"
  12
+"Last-Translator: alexey boriskin <sun.void@gmail.com>\n"
13 13
 "Language-Team: Dialcom Service <greg@dial.com.ru>\n"
14 14
 "MIME-Version: 1.0\n"
15 15
 "Content-Type: text/plain; charset=UTF-8\n"
16 16
 "Content-Transfer-Encoding: 8bit\n"
  17
+"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"
  18
+"X-Poedit-Language: Russian\n"
  19
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
17 20
 
18  
-#: contrib/admin/media/js/SelectFilter2.js:33
  21
+#: contrib/admin/media/js/SelectFilter2.js:37
19 22
 #, perl-format
20 23
 msgid "Available %s"
21 24
 msgstr "Доступные %s"
22 25
 
23  
-#: contrib/admin/media/js/SelectFilter2.js:41
  26
+#: contrib/admin/media/js/SelectFilter2.js:45
24 27
 msgid "Choose all"
25 28
 msgstr "Выбрать все"
26 29
 
27  
-#: contrib/admin/media/js/SelectFilter2.js:46
  30
+#: contrib/admin/media/js/SelectFilter2.js:50
28 31
 msgid "Add"
29 32
 msgstr "Добавить"
30 33
 
31  
-#: contrib/admin/media/js/SelectFilter2.js:48
  34
+#: contrib/admin/media/js/SelectFilter2.js:52
32 35
 msgid "Remove"
33 36
 msgstr "Удалить"
34 37
 
35  
-#: contrib/admin/media/js/SelectFilter2.js:53
  38
+#: contrib/admin/media/js/SelectFilter2.js:57
36 39
 #, perl-format
37 40
 msgid "Chosen %s"
38 41
 msgstr "Выбранные %s"
39 42
 
40  
-#: contrib/admin/media/js/SelectFilter2.js:54
  43
+#: contrib/admin/media/js/SelectFilter2.js:58
41 44
 msgid "Select your choice(s) and click "
42 45
 msgstr "Выберите и нажмите "
43 46
 
44  
-#: contrib/admin/media/js/SelectFilter2.js:59
  47
+#: contrib/admin/media/js/SelectFilter2.js:63
45 48
 msgid "Clear all"
46 49
 msgstr "Очистить всё"
47 50
 
  51
+#: contrib/admin/media/js/actions.js:18
  52
+#: contrib/admin/media/js/actions.min.js:1
  53
+msgid "%(sel)s of %(cnt)s selected"
  54
+msgid_plural "%(sel)s of %(cnt)s selected"
  55
+msgstr[0] "Выбран %(sel)s объект из %(cnt)s"
  56
+msgstr[1] "Выбрано %(sel)s объекта из %(cnt)s"
  57
+msgstr[2] "Выбрано %(sel)s объектов из %(cnt)s"
  58
+
  59
+#: contrib/admin/media/js/actions.js:109
  60
+#: contrib/admin/media/js/actions.min.js:5
  61
+msgid "You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."
  62
+msgstr "Имеются несохраненные изменения в отдельных полях для редактирования. Если вы запустите действие, несохраненные изменения будут потеряны."
  63
+
  64
+#: contrib/admin/media/js/actions.js:121
  65
+#: contrib/admin/media/js/actions.min.js:6
  66
+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."
  67
+msgstr "Вы выбрали действие, но еще не сохранили изменения, внесенные в некоторых полях для редактирования. Нажмите OK, чтобы сохранить изменения. После сохранения вам придется запустить действие еще раз."
  68
+
  69
+#: contrib/admin/media/js/actions.js:123
  70
+#: contrib/admin/media/js/actions.min.js:6
  71
+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."
  72
+msgstr "Вы выбрали действие и не внесли изменений в данные. Возможно, вы хотели воспользоваться кнопкой \"Выполнить\", а не кнопкой \"Сохранить\". Если это так, то нажмите \"Отмена\", чтобы вернуться в интерфейс редактирования. "
  73
+
48 74
 #: contrib/admin/media/js/calendar.js:24
49 75
 #: contrib/admin/media/js/dateparse.js:32
50 76
 msgid "January February March April May June July August September October November December"
@@ -54,63 +80,65 @@ msgstr "Январь Февраль Март Апрель Май Июнь Июл
54 80
 msgid "S M T W T F S"
55 81
 msgstr "В П В С Ч П С"
56 82
 
57  
-#: contrib/admin/media/js/dateparse.js:33
58  
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
59  
-msgstr "Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота"
60  
-
61  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
62  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
  83
+#: contrib/admin/media/js/collapse.js:9
  84
+#: contrib/admin/media/js/collapse.js:21
  85
+#: contrib/admin/media/js/collapse.min.js:1
63 86
 msgid "Show"
64 87
 msgstr "Показать"
65 88
 
66  
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
  89
+#: contrib/admin/media/js/collapse.js:16
  90
+#: contrib/admin/media/js/collapse.min.js:1
67 91
 msgid "Hide"
68 92
 msgstr "Скрыть"
69 93
 
70  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
71  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
  94
+#: contrib/admin/media/js/dateparse.js:33
  95
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
  96
+msgstr "Воскресенье Понедельник Вторник Среда Четверг Пятница Суббота"
  97
+
  98
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:49
  99
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
72 100
 msgid "Now"
73 101
 msgstr "Сейчас"
74 102
 
75  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
  103
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:53
76 104
 msgid "Clock"
77 105
 msgstr "Часы"
78 106
 
79  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
  107
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
80 108
 msgid "Choose a time"
81 109
 msgstr "Выберите время"
82 110
 
83  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
  111
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
84 112
 msgid "Midnight"
85 113
 msgstr "Полночь"
86 114
 
87  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
  115
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86
88 116
 msgid "6 a.m."
89 117
 msgstr "6 часов"
90 118
 
91  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
  119
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
92 120
 msgid "Noon"
93 121
 msgstr "Полдень"
94 122
 
95  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
96  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
  123
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:91
  124
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:188
97 125
 msgid "Cancel"
98 126
 msgstr "Отмена"
99 127
 
100  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
101  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
  128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
  129
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:182
102 130
 msgid "Today"
103 131
 msgstr "Сегодня"
104 132
 
105  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
  133
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:137
106 134
 msgid "Calendar"
107 135
 msgstr "Календарь"
108 136
 
109  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
  137
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
110 138
 msgid "Yesterday"
111 139
 msgstr "Вчера"
112 140
 
113  
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
  141
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
114 142
 msgid "Tomorrow"
115 143
 msgstr "Завтра"
116 144
 
35  django/conf/locale/ru/formats.py
@@ -4,15 +4,32 @@
4 4
 
5 5
 DATE_FORMAT = 'j F Y г.'
6 6
 TIME_FORMAT = 'G:i:s'
7  
-# DATETIME_FORMAT = 
8  
-YEAR_MONTH_FORMAT = 'F Y'
  7
+DATETIME_FORMAT = 'j F Y г. G:i:s'  
  8
+YEAR_MONTH_FORMAT = 'F Y г.'
9 9
 MONTH_DAY_FORMAT = 'j F'
10 10
 SHORT_DATE_FORMAT = 'd.m.Y'
11  
-# SHORT_DATETIME_FORMAT = 
12  
-# FIRST_DAY_OF_WEEK = 
13  
-# DATE_INPUT_FORMATS = 
14  
-# TIME_INPUT_FORMATS = 
15  
-# DATETIME_INPUT_FORMATS = 
  11
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i'     
  12
+FIRST_DAY_OF_WEEK = 1  # Monday
  13
+DATE_INPUT_FORMATS = (
  14
+    '%d.%m.%Y',  # '25.10.2006'
  15
+    '%d.%m.%y',  # '25.10.06'
  16
+    '%Y-%m-%d',  # '2006-10-25'
  17
+)
  18
+TIME_INPUT_FORMATS = (
  19
+    '%H:%M:%S',  # '14:30:59'
  20
+    '%H:%M',     # '14:30'
  21
+) 
  22
+DATETIME_INPUT_FORMATS = (
  23
+    '%d.%m.%Y %H:%M:%S',  # '25.10.2006 14:30:59'
  24
+    '%d.%m.%Y %H:%M',     # '25.10.2006 14:30'
  25
+    '%d.%m.%Y',           # '25.10.2006'
  26
+    '%d.%m.%y %H:%M:%S',  # '25.10.06 14:30:59'
  27
+    '%d.%m.%y %H:%M',     # '25.10.06 14:30'
  28
+    '%d.%m.%y',           # '25.10.06'
  29
+    '%Y-%m-%d %H:%M:%S',  # '2006-10-25 14:30:59'
  30
+    '%Y-%m-%d %H:%M',     # '2006-10-25 14:30'
  31
+    '%Y-%m-%d',           # '2006-10-25'
  32
+)
16 33
 DECIMAL_SEPARATOR = ','
17  
-THOUSAND_SEPARATOR = ' '
18  
-# NUMBER_GROUPING = 
  34
+THOUSAND_SEPARATOR = ' '
  35
+NUMBER_GROUPING = 3

0 notes on commit bfa0bae

Please sign in to comment.
Something went wrong with that request. Please try again.