Author: minton
Date: 2015-08-30 20:09:08 +0200 (Sun, 30 Aug 2015)
New Revision: 92399
Modified:
trunk/yast/ru/po/country.ru.po
Log:
Merged country.pot for ru
Modified: trunk/yast/ru/po/country.ru.po
===================================================================
--- trunk/yast/ru/po/country.ru.po 2015-08-30 18:09:07 UTC (rev 92398)
+++ trunk/yast/ru/po/country.ru.po 2015-08-30 18:09:08 UTC (rev 92399)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: country.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-26 23:39+0400\n"
"Last-Translator: Alexander Melentev \n"
"Language-Team: Russian \n"
@@ -26,38 +26,38 @@
"X-Generator: Lokalize 1.5\n"
#. translators: command line help text for Securoty module
-#: keyboard/src/clients/keyboard.rb:58
+#: keyboard/src/clients/keyboard.rb:59
msgid "Keyboard configuration."
msgstr "Настройка клавиатуры."
#. command line help text for 'summary' action
-#: keyboard/src/clients/keyboard.rb:71
+#: keyboard/src/clients/keyboard.rb:72
msgid "Keyboard configuration summary."
msgstr "Итоговые настройки клавиатуры."
#. command line help text for 'set' action
-#: keyboard/src/clients/keyboard.rb:78
+#: keyboard/src/clients/keyboard.rb:79
msgid "Set new values for keyboard configuration."
msgstr "Задать новые значения параметров клавиатуры."
#. command line help text for 'list' action
-#: keyboard/src/clients/keyboard.rb:85
+#: keyboard/src/clients/keyboard.rb:86
msgid "List all available keyboard layouts."
msgstr "Список всех доступных раскладок клавиатуры."
#. command line help text for 'set layout' option
-#: keyboard/src/clients/keyboard.rb:93
+#: keyboard/src/clients/keyboard.rb:94
msgid "New keyboard layout"
msgstr "Новая раскладка клавиатуры"
#. summary label
#. summary label
-#: keyboard/src/clients/keyboard.rb:155 keyboard/src/modules/Keyboard.rb:1390
+#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402
msgid "Current Keyboard Layout: %1"
msgstr "Текущая раскладка клавиатуры: %1"
#. error message (%1 is given layout); do not translate 'list'
-#: keyboard/src/clients/keyboard.rb:179
+#: keyboard/src/clients/keyboard.rb:184
msgid "Keyboard layout '%1' is invalid. Use a 'list' command to see possible values."
msgstr "Раскладка клавиатуры '%1' неверна. Используйте команду 'list', чтобы просмотреть возможные значения."
@@ -218,7 +218,7 @@
#. 2 radio-buttons follow this label.
#. Such keyboard layout is used only for the time of the update,
#. it is not saved to the system.
-#: keyboard/src/modules/Keyboard.rb:1315
+#: keyboard/src/modules/Keyboard.rb:1313
msgid ""
"You are currently using a keyboard layout\n"
"different from the one in the system to update.\n"
@@ -228,6 +228,12 @@
"отличную от используемой в обновляемой системе.\n"
"Выберите раскладку, используемую во время обновления:"
+#. Executes the command to set the keyboard in X11, reporting
+#. any error to the user
+#: keyboard/src/modules/Keyboard.rb:1513
+msgid "Failed to set X11 keyboard to '%s'"
+msgstr ""
+
#. summary label <%1>-<%2> are HTML tags, leave untouched
#: language/src/clients/country_simple_proposal.rb:45
msgid "<%1>Keyboard Layout<%2>: %3"
@@ -321,24 +327,24 @@
msgstr "Обновление переводов в меню загрузчика..."
#. help for write dialog
-#: language/src/clients/language.rb:235
+#: language/src/clients/language.rb:233
msgid "<p><b>Saving Configuration</b><br>Please wait...</p>"
msgstr "<P><B>Сохранение настроек</B><BR>Пожалуйста, подождите...</P>"
#. summary label
-#: language/src/clients/language.rb:254
+#: language/src/clients/language.rb:252
msgid "Current Language: %1 (%2)"
msgstr "Текущий язык: %1 (%2)"
#. summary label
#. summary label
-#: language/src/clients/language.rb:268 language/src/modules/Language.rb:793
+#: language/src/clients/language.rb:266 language/src/modules/Language.rb:793
#: language/src/modules/Language.rb:827
msgid "Additional Languages: %1"
msgstr "Дополнительные языки: %1"
#. error message (%1 is given layout); do not translate 'list'
-#: language/src/clients/language.rb:303
+#: language/src/clients/language.rb:301
msgid "%1 is not a valid language. Use the list command to see possible values."
msgstr "%1 не является верным языком. Используйте команду 'list', чтобы просмотреть доступные значения."
@@ -679,8 +685,8 @@
#. label text (Clock setting)
#. AutoYaST interface function: Return the summary of Timezone configuration as a map.
#. @return summary string (html)
-#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:732
-#: timezone/src/modules/Timezone.rb:968
+#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733
+#: timezone/src/modules/Timezone.rb:969
msgid "UTC"
msgstr "UTC"
@@ -695,7 +701,7 @@
msgstr "Текущее время и дата:\t%1"
#. error text, %1 is output of 'date' command
-#: timezone/src/clients/timezone_proposal.rb:49
+#: timezone/src/clients/timezone_proposal.rb:39
msgid ""
"Time %1 is in the past.\n"
"Set a correct time before starting installation."
@@ -704,12 +710,12 @@
"Установите правильное время перед началом установки."
#. summary item
-#: timezone/src/clients/timezone_proposal.rb:95
+#: timezone/src/clients/timezone_proposal.rb:85
msgid "Time Zone"
msgstr "Часовой пояс"
#. menue label text
-#: timezone/src/clients/timezone_proposal.rb:97
+#: timezone/src/clients/timezone_proposal.rb:87
msgid "&Time Zone"
msgstr "&Часовой пояс"
@@ -857,15 +863,15 @@
#. frame label
#. frame label
#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:930
+#: timezone/src/include/timezone/dialogs.rb:910
msgid "Date and Time (NTP is configured)"
msgstr "Дата и время (NTP настроен)"
#. frame label
#. frame label
#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:701
-#: timezone/src/include/timezone/dialogs.rb:932
+#: timezone/src/include/timezone/dialogs.rb:693
+#: timezone/src/include/timezone/dialogs.rb:912
msgid "Date and Time"
msgstr "Дата и время"
@@ -877,27 +883,21 @@
#. label text
#. label text
#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:684
msgid "&Region"
msgstr "&Регион"
-#. title for combo box 'timezone'
-#. title for selection box 'timezone'
-#. label text
-#. label text
-#: timezone/src/include/timezone/dialogs.rb:660
-#: timezone/src/include/timezone/dialogs.rb:695
-#: timezone/src/include/timezone/dialogs.rb:768
-#: timezone/src/include/timezone/dialogs.rb:775
+#: timezone/src/include/timezone/dialogs.rb:657
+#: timezone/src/include/timezone/dialogs.rb:688
msgid "Time &Zone"
msgstr "Часовой &пояс"
-#: timezone/src/include/timezone/dialogs.rb:673
+#: timezone/src/include/timezone/dialogs.rb:669
msgid "Date and Time:"
msgstr "Дата и время:"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:812
+#: timezone/src/include/timezone/dialogs.rb:791
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -906,7 +906,7 @@
"<p><b><big>Настройки часового пояса и часов</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:814
+#: timezone/src/include/timezone/dialogs.rb:793
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -921,7 +921,7 @@
"</p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:831
+#: timezone/src/include/timezone/dialogs.rb:810
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -932,34 +932,34 @@
" </p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:841
+#: timezone/src/include/timezone/dialogs.rb:820
msgid "Clock and Time Zone"
msgstr "Часы и Часовой пояс"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:965
+#: timezone/src/include/timezone/dialogs.rb:945
msgid "Select a valid time zone."
msgstr "Выберите ваш часовой пояс"
#. label text, Clock setting: local time (not UTC)
#. label text, Clock setting: local time (not UTC)
-#: timezone/src/modules/Timezone.rb:736 timezone/src/modules/Timezone.rb:972
+#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973
msgid "Local Time"
msgstr "Локальное время"
#. label text
#. label text
-#: timezone/src/modules/Timezone.rb:740 timezone/src/modules/Timezone.rb:976
+#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977
msgid "Hardware Clock Set To"
msgstr "Установить системные часы"
#. summary label
-#: timezone/src/modules/Timezone.rb:754
+#: timezone/src/modules/Timezone.rb:755
msgid "NTP configured"
msgstr "NTP настроен"
#. summary label
-#: timezone/src/modules/Timezone.rb:980
+#: timezone/src/modules/Timezone.rb:981
msgid "Current Time Zone: %1"
msgstr "Текущий часовой пояс: %1"
@@ -1009,197 +1009,197 @@
msgstr "Канадский (Многоязычный)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:146
+#: keyboard/src/data/keyboard_raw.ycp:145
msgid "Spanish"
msgstr "Испанский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:158
+#: keyboard/src/data/keyboard_raw.ycp:157
msgid "Spanish (Latin America)"
msgstr "Испанский (Латинская Америка)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:170
+#: keyboard/src/data/keyboard_raw.ycp:169
msgid "Spanish (CP 850)"
msgstr "Испанский (CP 850)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:182
+#: keyboard/src/data/keyboard_raw.ycp:181
msgid "Italian"
msgstr "Итальянский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:194
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Portuguese"
msgstr "Португальский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:206
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese (Brazil)"
msgstr "Португальский (Бразилия)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:218
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil -- US accents)"
msgstr "Португальский (Бразилия- США акцент)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:230
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Greek"
msgstr "Греческий"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:242
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Dutch"
msgstr "Голландский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:254
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Danish"
msgstr "Датский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:266
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Norwegian"
msgstr "Норвежский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:278
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Swedish"
msgstr "Шведский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:290
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Finnish"
msgstr "Финский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:302
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Czech"
msgstr "Чешский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:317
+#: keyboard/src/data/keyboard_raw.ycp:316
msgid "Czech (qwerty)"
msgstr "Чешский (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:332
+#: keyboard/src/data/keyboard_raw.ycp:331
msgid "Slovak"
msgstr "Словакский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:347
+#: keyboard/src/data/keyboard_raw.ycp:346
msgid "Slovak (qwerty)"
msgstr "Словакский (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:362
+#: keyboard/src/data/keyboard_raw.ycp:361
msgid "Slovene"
msgstr "Словакский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:377
+#: keyboard/src/data/keyboard_raw.ycp:375
msgid "Hungarian"
msgstr "Венгерский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:392
+#: keyboard/src/data/keyboard_raw.ycp:389
msgid "Polish"
msgstr "Польский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:407
+#: keyboard/src/data/keyboard_raw.ycp:403
msgid "Russian"
msgstr "Русский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:421
+#: keyboard/src/data/keyboard_raw.ycp:417
msgid "Serbian"
msgstr "Сербский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:433
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Estonian"
msgstr "Эстонский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:445
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Lithuanian"
msgstr "Литовский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:457
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Turkish"
msgstr "Турецкий"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:468
+#: keyboard/src/data/keyboard_raw.ycp:464
msgid "Croatian"
msgstr "Хорватский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:491
+#: keyboard/src/data/keyboard_raw.ycp:486
msgid "Japanese"
msgstr "Японский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:503
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Belgian"
msgstr "Бельгийский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:515
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Dvorak"
msgstr "Дворак"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:527
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Icelandic"
msgstr "Исландский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:539
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Ukrainian"
msgstr "Украинский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:561
+#: keyboard/src/data/keyboard_raw.ycp:556
msgid "Khmer"
msgstr "Кхмерский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:583
+#: keyboard/src/data/keyboard_raw.ycp:578
msgid "Korean"
msgstr "Корейский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:605
+#: keyboard/src/data/keyboard_raw.ycp:600
msgid "Arabic"
msgstr "Арабский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:626
+#: keyboard/src/data/keyboard_raw.ycp:621
msgid "Tajik"
msgstr "Таджикский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:640
+#: keyboard/src/data/keyboard_raw.ycp:635
msgid "Traditional Chinese"
msgstr "Традиционный китайский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:662
+#: keyboard/src/data/keyboard_raw.ycp:657
msgid "Simplified Chinese"
msgstr "Упрощенный китайский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:684
+#: keyboard/src/data/keyboard_raw.ycp:679
msgid "Romanian"
msgstr "Румынский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:705
+#: keyboard/src/data/keyboard_raw.ycp:700
msgid "US International"
msgstr "US международная"
