[l10n-russian CVS] debian-installer ru.po,1.265,1.266
Nikolai Prokoschenko
pronik-guest at alioth.debian.org
Tue Jul 26 06:16:40 UTC 2005
Update of /cvsroot/l10n-russian/debian-installer
In directory haydn:/tmp/cvs-serv11980
Modified Files:
ru.po
Log Message:
Автоматическая синхронизация шаблонов
Index: ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/debian-installer/ru.po,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- ru.po 25 Jul 2005 18:16:20 -0000 1.265
+++ ru.po 26 Jul 2005 06:16:37 -0000 1.266
@@ -364,14 +364,14 @@
#. Type: text
#. Description
-#: ../kbd-chooser.templates-in:24
+#: ../kbd-chooser.templates-in:29 ../kbd-chooser.templates-in:24
msgid "No keyboard to configure"
msgstr "Настраиваемая клавиатура отсутствует"
#. Type: text
#. Description
#. Prebaseconfig progress bar item
-#: ../kbd-chooser.templates-in:29
+#: ../kbd-chooser.templates-in:34 ../kbd-chooser.templates-in:29
msgid "Configuring keyboard ..."
msgstr "Настройка клавиатуры..."
@@ -6975,987 +6975,783 @@
#. Type: select
#. Choices
-#. Timezones for US. Translate to timezone names.
-#. Corresponding English timezone names are:
-#. Eastern, Central, Mountain, Pacific, Alaska, Hawaii, Aleutian, Arizona, East Indiana, Indiana Starke, Michigan, Samoa
-#: ../common.templates:12
-msgid "US/Eastern"
-msgstr "США/Восточная часть"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Central"
-msgstr "США/Центральная часть"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Mountain"
-msgstr "США/Mountain"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Pacific"
-msgstr "США/Pacific"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Alaska"
-msgstr "США/Аляска"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Hawaii"
-msgstr "США/Гаваи"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Aleutian"
-msgstr "США/Aleutian"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Arizona"
-msgstr "США/Аризона"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/East-Indiana"
-msgstr "США/Восточна Индиана"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Indiana-Starke"
-msgstr "США/Indiana-Starke"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Michigan"
-msgstr "США/Мичиган"
-
-#. Type: select
-#. Choices
-#: ../common.templates:12
-msgid "US/Samoa"
-msgstr "США/Самоа"
-
-#. Type: select
-#. Choices
-#. Timezones for CA. Translate to timezone names.
-#. Corresponding English timezone names are:
-#. Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon
-#: ../common.templates:22
-msgid "Canada/Newfoundland"
-msgstr "Канада/Newfoundland"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Atlantic"
-msgstr "Канада/Atlantic"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Eastern"
-msgstr "Канада/Восточная часть"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Central"
-msgstr "Канада/Центральная часть"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/East-Saskatchewan"
-msgstr "Канада/East-Saskatchewan"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Saskatchewan"
-msgstr "Канада/Saskatchewan"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Mountain"
-msgstr "Канада/Mountain"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Pacific"
-msgstr "Канада/Pacific"
-
-#. Type: select
-#. Choices
-#: ../common.templates:22
-msgid "Canada/Yukon"
-msgstr "Канада/Yukon"
-
-#. Type: select
-#. Choices
-#. Timezones for AR. Translate to timezone names.
-#. Corresponding English timezone names are: America/Argentina/Buenos_Aires, America/Argentina/Cordoba, America/Argentina/Jujuy, America/Argentina/Tucuman, America/Argentina/Catamarca, America/Argentina/La_Rioja, America/Argentina/San_Juan, America/Argentina/Mendoza, America/Argentina/ComodRivadavia (Chubut), America/Argentina/Rio_Gallegos (Santa Cruz), America/Argentina/Ushuaia (Tierra del Fuego)
-#: ../common.templates:30
-msgid "America/Argentina/Buenos_Aires"
-msgstr "Америка/Аргентина/Буэнос_Айрес"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Cordoba"
-msgstr "Америка/Аргентина/Кордоба"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Jujuy"
-msgstr "Америка/Аргентина/Jujuy"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Tucuman"
-msgstr "Америка/Аргентина/Tucuman"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Catamarca"
-msgstr "Америка/Аргентина/Катамарка"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/La_Rioja"
-msgstr "Америка/Аргентина/La_Rioja"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/San_Juan"
-msgstr "Америка/Аргентина/Сан_Хуан"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Mendoza"
-msgstr "Америка/Аргентина/Мендоза"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/ComodRivadavia"
-msgstr "Америка/Аргентина/ComodRivadavia"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Rio_Gallegos"
-msgstr "Америка/Аргентина/Rio_Gallegos"
-
-#. Type: select
-#. Choices
-#: ../common.templates:30
-msgid "America/Argentina/Ushuaia"
-msgstr "Америка/Аргентина/Ushuaia"
-
-#. Type: select
-#. Choices
#. Timezones for AQ. Translate to timezone names.
-#. Corresponding English timezone names are: Antarctica/McMurdo (McMurdo Station\, Ross Island), Antarctica/South_Pole (Amundsen-Scott Station\, South Pole), Antarctica/Rothera (Rothera Station\, Adelaide Island), Antarctica/Palmer (Palmer Station\, Anvers Island), Antarctica/Mawson (Mawson Station\, Holme Bay), Antarctica/Davis (Davis Station\, Vestfold Hills), Antarctica/Casey (Casey Station\, Bailey Peninsula), Antarctica/Vostok (Vostok Station\, S Magnetic Pole), Antarctica/DumontDUrville (Dumont-d'Urville Base\, Terre Adelie), Antarctica/Syowa (Syowa Station\, E Ongul I)
-#: ../common.templates:38
+#. Corresponding English timezone names are: McMurdo, south pole, Rothera, Palmer, Mawson, Davis, Casey, Vostok, Dumont-d'Urville, Syowa
+#: ../common.templates:10
msgid "Antarctica/McMurdo"
msgstr "Антарктида/McMurdo"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/South_Pole"
msgstr "Антарктида/Южный_полюс"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Rothera"
msgstr "Антарктида/Rothera"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Palmer"
msgstr "Антарктида/Palmer"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Mawson"
msgstr "Антарктида/Mawson"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Davis"
msgstr "Антарктида/Davis"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Casey"
msgstr "Антарктида/Casey"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Vostok"
msgstr "Антарктида/Восток"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/DumontDUrville"
msgstr "Антарктида/DumontDUrville"
#. Type: select
#. Choices
-#: ../common.templates:38
+#: ../common.templates:10
msgid "Antarctica/Syowa"
msgstr "Антарктида/Syowa"
#. Type: select
#. Choices
#. Timezones for AU. Translate to timezone names.
-#. Corresponding English timezone names are: Australia/Lord_Howe (Lord Howe Island), Australia/Hobart (Tasmania), Australia/Melbourne (Victoria), Australia/Sydney (New South Wales - most locations), Australia/Broken_Hill (New South Wales - Yancowinna), Australia/Brisbane (Queensland - most locations), Australia/Lindeman (Queensland - Holiday Islands), Australia/Adelaide (South Australia), Australia/Darwin (Northern Territory), Australia/Perth (Western Australia)
-#: ../common.templates:46
+#. Corresponding English timezone names are: Lord Howe Island, Hobart (Tasmania), Melbourne (Victoria), Sydney (New South Wales - most locations), Broken Hill (New South Wales - Yancowinna), Brisbane (Queensland - most locations), Lindeman (Queensland - Holiday Islands), Adelaide (South Australia), Darwin (Northern Territory), Perth (Western Australia)
+#: ../common.templates:18
msgid "Australia/Lord_Howe"
msgstr "Австралия/Lord_Howe"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Hobart"
msgstr "Австралия/Hobart"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Melbourne"
msgstr "Австралия/Мельбурн"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Sydney"
msgstr "Австралия/Сидней"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Broken_Hill"
msgstr "Австралия/Broken_Hill"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Brisbane"
msgstr "Австралия/Brisbane"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Lindeman"
msgstr "Австралия/Lindeman"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Adelaide"
msgstr "Австралия/Аделаида"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Darwin"
msgstr "Австралия/Darwin"
#. Type: select
#. Choices
-#: ../common.templates:46
+#: ../common.templates:18
msgid "Australia/Perth"
msgstr "Австралия/Perth"
#. Type: select
#. Choices
#. Timezones for BR. Translate to timezone names.
-#. Corresponding English timezone names are: America/Noronha (Atlantic islands), America/Belem (Amapa\, E Para), America/Fortaleza (NE Brazil (MA\, PI\, CE\, RN\, PB)), America/Recife (Pernambuco), America/Araguaina (Tocantins), America/Maceio (Alagoas\, Sergipe), America/Bahia (Bahia), America/Sao_Paulo (S & SE Brazil (GO\, DF\, MG\, ES\, RJ\, SP\, PR\, SC\, RS)), America/Campo_Grande (Mato Grosso do Sul), America/Cuiaba (Mato Grosso), America/Porto_Velho (W Para\, Rondonia), America/Boa_Vista (Roraima), America/Manaus (E Amazonas), America/Eirunepe (W Amazonas), America/Rio_Branco (Acre)
-#: ../common.templates:54
+#. Corresponding English timezone names are: Noronha (Atlantic islands), Belem (Amapa\, E Para), Fortaleza (NE Brazil), Recife (Pernambuco), Araguaina (Tocantins), Maceio (Alagoas\, Sergipe), Bahia, Sao Paulo (S & SE Brazil), Campo Grande (Mato Grosso do Sul), Cuiaba (Mato Grosso), Porto_Velho (W Para\, Rondonia), Boa Vista (Roraima), Manaus (E Amazonas), Eirunepe (W Amazonas), Rio Branco (Acre)
+#: ../common.templates:26
msgid "America/Noronha"
msgstr "Америка/Noronha"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Belem"
msgstr "Америка/Belem"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Fortaleza"
msgstr "Америка/Fortaleza"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Recife"
msgstr "Америка/Recife"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Araguaina"
msgstr "Америка/Araguaina"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Maceio"
msgstr "Америка/Maceio"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Bahia"
msgstr "Америка/Bahia"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Sao_Paulo"
msgstr "Америка/Sao_Paulo"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Campo_Grande"
msgstr "Америка/Кампо_Гранде"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Cuiaba"
msgstr "Америка/Cuiaba"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Porto_Velho"
msgstr "Америка/Porto_Velho"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Boa_Vista"
msgstr "Америка/Boa_Vista"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Manaus"
msgstr "Америка/Manaus"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Eirunepe"
msgstr "Америка/Eirunepe"
#. Type: select
#. Choices
-#: ../common.templates:54
+#: ../common.templates:26
msgid "America/Rio_Branco"
msgstr "Америка/Rio_Branco"
#. Type: select
#. Choices
+#. Timezones for CA. Translate to timezone names.
+#. Corresponding English timezone names are: Newfoundland, Atlantic, Eastern, Central, East Saskatchewan, Saskatchewan, Mountain, Pacific, Yukon
+#: ../common.templates:35
+msgid "Canada/Newfoundland"
+msgstr "Канада/Newfoundland"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Atlantic"
+msgstr "Канада/Atlantic"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Eastern"
+msgstr "Канада/Восточная часть"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Central"
+msgstr "Канада/Центральная часть"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/East-Saskatchewan"
+msgstr "Канада/East-Saskatchewan"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Saskatchewan"
+msgstr "Канада/Saskatchewan"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Mountain"
+msgstr "Канада/Mountain"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Pacific"
+msgstr "Канада/Pacific"
+
+#. Type: select
+#. Choices
+#: ../common.templates:35
+msgid "Canada/Yukon"
+msgstr "Канада/Yukon"
+
+#. Type: select
+#. Choices
#. Timezones for CD. Translate to timezone names.
-#. Corresponding English timezone names are: Africa/Kinshasa (west Dem. Rep. of Congo), Africa/Lubumbashi (east Dem. Rep. of Congo)
-#: ../common.templates:62
+#. Corresponding English timezone names are: Kinshasa, Lubumbashi
+#: ../common.templates:43
msgid "Africa/Kinshasa"
msgstr "Африка/Киншаса"
#. Type: select
#. Choices
-#: ../common.templates:62
+#: ../common.templates:43
msgid "Africa/Lubumbashi"
msgstr "Африка/Lubumbashi"
#. Type: select
#. Choices
#. Timezones for CL. Translate to timezone names.
-#. Corresponding English timezone names are: America/Santiago (most locations), Pacific/Easter (Easter Island & Sala y Gomez)
-#: ../common.templates:70
+#. Corresponding English timezone names are: Santiago, Easter Island \, Sala y Gomez
+#: ../common.templates:51
msgid "America/Santiago"
msgstr "Африка/Сантьяго"
#. Type: select
#. Choices
-#: ../common.templates:70
+#: ../common.templates:51
msgid "Pacific/Easter"
msgstr "Pacific/Восточная часть"
#. Type: select
#. Choices
#. Timezones for CN. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Shanghai (east China - Beijing\, Guangdong\, Shanghai\, etc.), Asia/Harbin (Heilongjiang), Asia/Chongqing (central China - Gansu\, Guizhou\, Sichuan\, Yunnan\, etc.), Asia/Urumqi (Tibet & most of Xinjiang Uyghur), Asia/Kashgar (southwest Xinjiang Uyghur)
-#: ../common.templates:78
+#. Corresponding English timezone names are: Shanghai (east China - Beijing\, Guangdong\, Shanghai\, etc.), Harbin (Heilongjiang), Chongqing (central China - Gansu\, Guizhou\, Sichuan\, Yunnan\, etc.), Urumqi (Tibet & most of Xinjiang Uyghur), Kashgar (southwest Xinjiang Uyghur)
+#: ../common.templates:59
msgid "Asia/Shanghai"
msgstr "Азия/Шанхай"
#. Type: select
#. Choices
-#: ../common.templates:78
+#: ../common.templates:59
msgid "Asia/Harbin"
msgstr "Азия/Harbin"
#. Type: select
#. Choices
-#: ../common.templates:78
+#: ../common.templates:59
msgid "Asia/Chongqing"
msgstr "Азия/Chongqing"
#. Type: select
#. Choices
-#: ../common.templates:78
+#: ../common.templates:59
msgid "Asia/Urumqi"
msgstr "Азия/Urumqi"
#. Type: select
#. Choices
-#: ../common.templates:78
+#: ../common.templates:59
msgid "Asia/Kashgar"
msgstr "Азия/Кашгар"
#. Type: select
#. Choices
#. Timezones for EC. Translate to timezone names.
-#. Corresponding English timezone names are: America/Guayaquil (mainland), Pacific/Galapagos (Galapagos Islands)
-#: ../common.templates:86
+#. Corresponding English timezone names are: Guayaquil (mainland), Galapagos (Galapagos Islands)
+#: ../common.templates:67
msgid "America/Guayaquil"
msgstr "Америка/Guayaquil"
#. Type: select
#. Choices
-#: ../common.templates:86
+#: ../common.templates:67
msgid "Pacific/Galapagos"
msgstr "Pacific/Galapagos"
#. Type: select
#. Choices
#. Timezones for ES. Translate to timezone names.
-#. Corresponding English timezone names are: Europe/Madrid (mainland), Africa/Ceuta (Ceuta & Melilla), Atlantic/Canary (Canary Islands)
-#: ../common.templates:94
+#. Corresponding English timezone names are: Madrid (mainland), Ceuta \, Melilla, Canary Islands
+#: ../common.templates:75
msgid "Europe/Madrid"
msgstr "Европа/Мадрид"
#. Type: select
#. Choices
-#: ../common.templates:94
+#: ../common.templates:75
msgid "Africa/Ceuta"
msgstr "Африка/Ceuta"
#. Type: select
#. Choices
-#: ../common.templates:94
+#: ../common.templates:75
msgid "Atlantic/Canary"
msgstr "Atlantic/Canary"
#. Type: select
#. Choices
#. Timezones for FM. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Yap (Yap), Pacific/Truk (Truk (Chuuk)), Pacific/Ponape (Ponape (Pohnpei)), Pacific/Kosrae (Kosrae)
-#: ../common.templates:102
+#. Corresponding English timezone names are: Yap, Truk, Ponape, Kosrae
+#: ../common.templates:83
msgid "Pacific/Yap"
msgstr "Pacific/Yap"
#. Type: select
#. Choices
-#: ../common.templates:102
+#: ../common.templates:83
msgid "Pacific/Truk"
msgstr "Pacific/Truk"
#. Type: select
#. Choices
-#: ../common.templates:102
+#: ../common.templates:83
msgid "Pacific/Ponape"
msgstr "Pacific/Ponape"
#. Type: select
#. Choices
-#: ../common.templates:102
+#: ../common.templates:83
msgid "Pacific/Kosrae"
msgstr "Pacific/Kosrae"
#. Type: select
#. Choices
-#. Timezones for GB. Translate to timezone names.
-#. Corresponding English timezone names are: Europe/London (Great Britain), Europe/Belfast (Northern Ireland)
-#: ../common.templates:110
-msgid "Europe/London"
-msgstr "Европа/Лондон"
-
-#. Type: select
-#. Choices
-#: ../common.templates:110
-msgid "Europe/Belfast"
-msgstr "Европа/Белфаст"
-
-#. Type: select
-#. Choices
#. Timezones for GL. Translate to timezone names.
-#. Corresponding English timezone names are: America/Godthab (most locations), America/Danmarkshavn (east coast\, north of Scoresbysund), America/Scoresbysund (Scoresbysund / Ittoqqortoormiit), America/Thule (Thule / Pituffik)
-#: ../common.templates:118
+#. Corresponding English timezone names are: Godthab (most locations), Danmarkshavn (east coast\, north of Scoresbysund), Scoresbysund (Scoresbysund / Ittoqqortoormiit), Thule (Thule / Pituffik)
+#: ../common.templates:91
msgid "America/Godthab"
msgstr "Америка/Godthab"
#. Type: select
#. Choices
-#: ../common.templates:118
+#: ../common.templates:91
msgid "America/Danmarkshavn"
msgstr "Америка/Danmarkshavn"
#. Type: select
#. Choices
-#: ../common.templates:118
+#: ../common.templates:91
msgid "America/Scoresbysund"
msgstr "Америка/Scoresbysund"
#. Type: select
#. Choices
-#: ../common.templates:118
+#: ../common.templates:91
msgid "America/Thule"
msgstr "Америка/Thule"
#. Type: select
#. Choices
#. Timezones for ID. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Jakarta (Java & Sumatra), Asia/Pontianak (west & central Borneo), Asia/Makassar (east & south Borneo\, Celebes\, Bali\, Nusa Tengarra\, west Timor), Asia/Jayapura (Irian Jaya & the Moluccas)
-#: ../common.templates:126
+#. Corresponding English timezone names are: Jakarta (Java & Sumatra), Pontianak (west & central Borneo), Makassar (east & south Borneo\, Celebes\, Bali\, Nusa Tengarra\, west Timor), Jayapura (Irian Jaya & the Moluccas)
+#: ../common.templates:99
msgid "Asia/Jakarta"
msgstr "Азия/Джакарта"
#. Type: select
#. Choices
-#: ../common.templates:126
+#: ../common.templates:99
msgid "Asia/Pontianak"
msgstr "Азия/Pontianak"
#. Type: select
#. Choices
-#: ../common.templates:126
+#: ../common.templates:99
msgid "Asia/Makassar"
msgstr "Азия/Makassar"
#. Type: select
#. Choices
-#: ../common.templates:126
+#: ../common.templates:99
msgid "Asia/Jayapura"
msgstr "Азия/Jayapura"
#. Type: select
#. Choices
#. Timezones for KI. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Tarawa (Gilbert Islands), Pacific/Enderbury (Phoenix Islands), Pacific/Kiritimati (Line Islands)
-#: ../common.templates:134
+#. Corresponding English timezone names are: Tarawa (Gilbert Islands), Enderbury (Phoenix Islands), Kiritimati (Line Islands)
+#: ../common.templates:107
msgid "Pacific/Tarawa"
msgstr "Pacific/Tarawa"
#. Type: select
#. Choices
-#: ../common.templates:134
+#: ../common.templates:107
msgid "Pacific/Enderbury"
msgstr "Pacific/Enderbury"
#. Type: select
#. Choices
-#: ../common.templates:134
+#: ../common.templates:107
msgid "Pacific/Kiritimati"
msgstr "Pacific/Kiritimati"
#. Type: select
#. Choices
#. Timezones for KZ. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Almaty (most locations), Asia/Qyzylorda (Qyzylorda (Kyzylorda\, Kzyl-Orda)), Asia/Aqtobe (Aqtobe (Aktobe)), Asia/Aqtau (Atyrau (Atirau\, Gur'yev)\, Mangghystau (Mankistau)), Asia/Oral (West Kazakhstan)
-#: ../common.templates:142
+#. Corresponding English timezone names are: Almaty (most locations), Qyzylorda (Kyzylorda\, Kzyl-Orda), Aqtobe (Aktobe), Atyrau (Atirau\, Gur'yev)\, Mangghystau (Mankistau), Oral (West Kazakhstan)
+#: ../common.templates:115
msgid "Asia/Almaty"
msgstr "Азия/Almaty"
#. Type: select
#. Choices
-#: ../common.templates:142
+#: ../common.templates:115
msgid "Asia/Qyzylorda"
msgstr "Азия/Qyzylorda"
#. Type: select
#. Choices
-#: ../common.templates:142
+#: ../common.templates:115
msgid "Asia/Aqtobe"
msgstr "Азия/Aqtobe"
#. Type: select
#. Choices
-#: ../common.templates:142
+#: ../common.templates:115
msgid "Asia/Aqtau"
msgstr "Азия/Aqtau"
#. Type: select
#. Choices
-#: ../common.templates:142
+#: ../common.templates:115
msgid "Asia/Oral"
msgstr "Азия/Oral"
#. Type: select
#. Choices
-#. Timezones for MH. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Majuro (most locations), Pacific/Kwajalein (Kwajalein)
-#: ../common.templates:150
-msgid "Pacific/Majuro"
-msgstr "Pacific/Majuro"
-
-#. Type: select
-#. Choices
-#: ../common.templates:150
-msgid "Pacific/Kwajalein"
-msgstr "Pacific/Kwajalein"
-
-#. Type: select
-#. Choices
-#. Timezones for ML. Translate to timezone names.
-#. Corresponding English timezone names are: Africa/Bamako (southwest Mali), Africa/Timbuktu (northeast Mali)
-#: ../common.templates:158
-msgid "Africa/Bamako"
-msgstr "Африка/Bamako"
-
-#. Type: select
-#. Choices
-#: ../common.templates:158
-msgid "Africa/Timbuktu"
-msgstr "Африка/Тимбукту"
-
-#. Type: select
-#. Choices
#. Timezones for MN. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Ulaanbaatar (most locations), Asia/Hovd (Bayan-Olgiy\, Govi-Altai\, Hovd\, Uvs\, Zavkhan), Asia/Choibalsan (Dornod\, Sukhbaatar)
-#: ../common.templates:166
+#. Corresponding English timezone names are: Ulaanbaatar (most locations), Hovd (Bayan-Olgiy\, Govi-Altai\, Hovd\, Uvs\, Zavkhan), Choibalsan (Dornod\, Sukhbaatar)
+#: ../common.templates:123
msgid "Asia/Ulaanbaatar"
msgstr "Азия/Ulaanbaatar"
#. Type: select
#. Choices
-#: ../common.templates:166
+#: ../common.templates:123
msgid "Asia/Hovd"
msgstr "Азия/Hovd"
#. Type: select
#. Choices
-#: ../common.templates:166
+#: ../common.templates:123
msgid "Asia/Choibalsan"
msgstr "Азия/Choibalsan"
#. Type: select
#. Choices
#. Timezones for MX. Translate to timezone names.
-#. Corresponding English timezone names are: America/Mexico_City (Central Time - most locations), America/Cancun (Central Time - Quintana Roo), America/Merida (Central Time - Campeche\, Yucatan), America/Monterrey (Central Time - Coahuila\, Durango\, Nuevo Leon\, Tamaulipas), America/Mazatlan (Mountain Time - S Baja\, Nayarit\, Sinaloa), America/Chihuahua (Mountain Time - Chihuahua), America/Hermosillo (Mountain Standard Time - Sonora), America/Tijuana (Pacific Time)
-#: ../common.templates:174
+#. Corresponding English timezone names are: Mexico City (Central Time - most locations), Cancun (Central Time - Quintana Roo), Merida (Central Time - Campeche\, Yucatan), Monterrey (Central Time - Coahuila\, Durango\, Nuevo Leon\, Tamaulipas), Mazatlan (Mountain Time - S Baja\, Nayarit\, Sinaloa), Chihuahua (Mountain Time - Chihuahua), Hermosillo (Mountain Standard Time - Sonora), Tijuana (Pacific Time)
+#: ../common.templates:131
msgid "America/Mexico_City"
msgstr "Америка/Мексика_Сити"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Cancun"
msgstr "Америка/Cancun"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Merida"
msgstr "Америка/Merida"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Monterrey"
msgstr "Америка/Монтеррей"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Mazatlan"
msgstr "Америка/Mazatlan"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Chihuahua"
msgstr "Америка/Chihuahua"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Hermosillo"
msgstr "Америка/Hermosillo"
#. Type: select
#. Choices
-#: ../common.templates:174
+#: ../common.templates:131
msgid "America/Tijuana"
msgstr "Америка/Tijuana"
#. Type: select
#. Choices
-#. Timezones for MY. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Kuala_Lumpur (peninsular Malaysia), Asia/Kuching (Sabah & Sarawak)
-#: ../common.templates:182
-msgid "Asia/Kuala_Lumpur"
-msgstr "Азия/Куала_Лумпур"
-
-#. Type: select
-#. Choices
-#: ../common.templates:182
-msgid "Asia/Kuching"
-msgstr "Азия/Kuching"
-
-#. Type: select
-#. Choices
#. Timezones for NZ. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Auckland (most locations), Pacific/Chatham (Chatham Islands)
-#: ../common.templates:190
+#. Corresponding English timezone names are: Auckland (most locations), Chatham Islands
+#: ../common.templates:139
msgid "Pacific/Auckland"
msgstr "Pacific/Auckland"
#. Type: select
#. Choices
-#: ../common.templates:190
+#: ../common.templates:139
msgid "Pacific/Chatham"
msgstr "Pacific/Chatham"
#. Type: select
#. Choices
#. Timezones for PF. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Tahiti (Society Islands), Pacific/Marquesas (Marquesas Islands), Pacific/Gambier (Gambier Islands)
-#: ../common.templates:198
+#. Corresponding English timezone names are: Tahiti (Society Islands), Marquesas Islands, Gambier Islands
+#: ../common.templates:147
msgid "Pacific/Tahiti"
msgstr "Pacific/Tahiti"
#. Type: select
#. Choices
-#: ../common.templates:198
+#: ../common.templates:147
msgid "Pacific/Marquesas"
msgstr "Pacific/Marquesas"
#. Type: select
#. Choices
-#: ../common.templates:198
+#: ../common.templates:147
msgid "Pacific/Gambier"
msgstr "Pacific/Gambier"
#. Type: select
#. Choices
#. Timezones for PT. Translate to timezone names.
-#. Corresponding English timezone names are: Europe/Lisbon (mainland), Atlantic/Madeira (Madeira Islands), Atlantic/Azores (Azores)
-#: ../common.templates:206
+#. Corresponding English timezone names are: Lisbon, Madeira Islands, Azores
+#: ../common.templates:155
msgid "Europe/Lisbon"
msgstr "Европа/Лиссабон"
#. Type: select
#. Choices
-#: ../common.templates:206
+#: ../common.templates:155
msgid "Atlantic/Madeira"
msgstr "Atlantic/Madeira"
#. Type: select
#. Choices
-#: ../common.templates:206
+#: ../common.templates:155
msgid "Atlantic/Azores"
msgstr "Atlantic/Azores"
#. Type: select
#. Choices
#. Timezones for RU. Translate to timezone names.
-#. Corresponding English timezone names are: Europe/Kaliningrad (Moscow-01 - Kaliningrad), Europe/Moscow (Moscow+00 - west Russia), Europe/Samara (Moscow+01 - Caspian Sea), Asia/Yekaterinburg (Moscow+02 - Urals), Asia/Omsk (Moscow+03 - west Siberia), Asia/Novosibirsk (Moscow+03 - Novosibirsk), Asia/Krasnoyarsk (Moscow+04 - Yenisei River), Asia/Irkutsk (Moscow+05 - Lake Baikal), Asia/Yakutsk (Moscow+06 - Lena River), Asia/Vladivostok (Moscow+07 - Amur River), Asia/Sakhalin (Moscow+07 - Sakhalin Island), Asia/Magadan (Moscow+08 - Magadan), Asia/Kamchatka (Moscow+09 - Kamchatka), Asia/Anadyr (Moscow+10 - Bering Sea)
-#: ../common.templates:214
+#. Corresponding English timezone names are: Moscow-01 - Kaliningrad, Moscow+00 - west Russia, Moscow+01 - Caspian Sea, Moscow+02 - Urals, Moscow+03 - west Siberia, Moscow+03 - Novosibirsk, Moscow+04 - Yenisei River, Moscow+05 - Lake Baikal, Moscow+06 - Lena River, Moscow+07 - Amur River, Moscow+07 - Sakhalin Island, Moscow+08 - Magadan, Moscow+09 - Kamchatka, Moscow+10 - Bering Sea
+#: ../common.templates:163
msgid "Europe/Kaliningrad"
msgstr "Европа/Калининград"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Europe/Moscow"
msgstr "Европа/Москва"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Europe/Samara"
msgstr "Европа/Самара"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Yekaterinburg"
msgstr "Азия/Екатеринбург"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Omsk"
msgstr "Азия/Омск"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Novosibirsk"
msgstr "Азия/Новосибирск"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Krasnoyarsk"
msgstr "Азия/Красноярск"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Irkutsk"
msgstr "Азия/Иркутск"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Yakutsk"
msgstr "Азия/Якутск"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Vladivostok"
msgstr "Азия/Владивосток"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Sakhalin"
msgstr "Азия/Сахалин"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Magadan"
msgstr "Азия/Магадан"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Kamchatka"
msgstr "Азия/Камчатка"
#. Type: select
#. Choices
-#: ../common.templates:214
+#: ../common.templates:163
msgid "Asia/Anadyr"
msgstr "Азия/Анадырь"
#. Type: select
#. Choices
-#. Timezones for SJ. Translate to timezone names.
-#. Corresponding English timezone names are: Arctic/Longyearbyen (Svalbard), Atlantic/Jan_Mayen (Jan Mayen)
-#: ../common.templates:222
-msgid "Arctic/Longyearbyen"
-msgstr "Arctic/Longyearbyen"
+#. Timezones for UM. Translate to timezone names.
+#. Corresponding English timezone names are: Johnston Atoll, Midway Islands, Wake Island
+#: ../common.templates:171
+msgid "Pacific/Johnston"
+msgstr "Pacific/Johnston"
#. Type: select
#. Choices
-#: ../common.templates:222
-msgid "Atlantic/Jan_Mayen"
-msgstr "Atlantic/Jan_Mayen"
+#: ../common.templates:171
+msgid "Pacific/Midway"
+msgstr "Pacific/Midway"
#. Type: select
#. Choices
-#. Timezones for UA. Translate to timezone names.
-#. Corresponding English timezone names are: Europe/Kiev (most locations), Europe/Uzhgorod (Ruthenia), Europe/Zaporozhye (Zaporozh'ye\, E Lugansk), Europe/Simferopol (central Crimea)
-#: ../common.templates:230
-msgid "Europe/Kiev"
-msgstr "Европа/Киев"
+#: ../common.templates:171
+msgid "Pacific/Wake"
+msgstr "Pacific/Wake"
#. Type: select
#. Choices
-#: ../common.templates:230
-msgid "Europe/Uzhgorod"
-msgstr "Европа/Ужгород"
+#. Timezones for US. Translate to timezone names.
+#. Corresponding English timezone names are: Eastern, Central, Mountain, Pacific, Alaska, Hawaii, East Indiana, Samoa
+#: ../common.templates:180
+msgid "US/Eastern"
+msgstr "США/Восточная часть"
#. Type: select
#. Choices
-#: ../common.templates:230
-msgid "Europe/Zaporozhye"
-msgstr "Европа/Запорожье"
+#: ../common.templates:180
+msgid "US/Central"
+msgstr "США/Центральная часть"
#. Type: select
#. Choices
-#: ../common.templates:230
-msgid "Europe/Simferopol"
-msgstr "Европа/Симферополь"
+#: ../common.templates:180
+msgid "US/Mountain"
+msgstr "США/Mountain"
#. Type: select
#. Choices
-#. Timezones for UM. Translate to timezone names.
-#. Corresponding English timezone names are: Pacific/Johnston (Johnston Atoll), Pacific/Midway (Midway Islands), Pacific/Wake (Wake Island)
-#: ../common.templates:238
-msgid "Pacific/Johnston"
-msgstr "Pacific/Johnston"
+#: ../common.templates:180
+msgid "US/Pacific"
+msgstr "США/Pacific"
#. Type: select
#. Choices
-#: ../common.templates:238
-msgid "Pacific/Midway"
-msgstr "Pacific/Midway"
+#: ../common.templates:180
+msgid "US/Alaska"
+msgstr "США/Аляска"
#. Type: select
#. Choices
-#: ../common.templates:238
-msgid "Pacific/Wake"
-msgstr "Pacific/Wake"
+#: ../common.templates:180
+msgid "US/Hawaii"
+msgstr "США/Гаваи"
#. Type: select
#. Choices
-#. Timezones for UZ. Translate to timezone names.
-#. Corresponding English timezone names are: Asia/Samarkand (west Uzbekistan), Asia/Tashkent (east Uzbekistan)
-#: ../common.templates:246
-msgid "Asia/Samarkand"
-msgstr "Азия/Самарканд"
+#: ../common.templates:180
+msgid "US/East-Indiana"
+msgstr "США/Восточна Индиана"
#. Type: select
#. Choices
-#: ../common.templates:246
-msgid "Asia/Tashkent"
-msgstr "Азия/Ташкент"
+#: ../common.templates:180
+msgid "US/Samoa"
+msgstr "США/Самоа"
#. Type: select
#. Description
-#: ../common.templates:248
+#: ../common.templates:182
msgid "Select your time zone:"
msgstr "Выберите часовой пояс:"
@@ -11002,10 +10798,11 @@
#. Type: select
#. Description
#: ../mountfloppy.templates:4
+#, fuzzy
msgid ""
"No standard floppy drive was found. If you have a USB floppy drive or some "
"other unusual type of floppy drive, select it from the list. Note that the "
-"list may also include drives that are not floppy drives."
+"list may also include devices that are not floppy drives."
msgstr ""
"Стандартный дисковод не обнаружен. Если у вас \"необычный\" дисковод "
"(например внешний на шине USB), то выберите его из списка. Обратите внимание "
@@ -12042,3 +11839,96 @@
"на то, что в списке могут быть устройства, которые не являются дисководами "
"как таковыми. С указанного устройства будут лишь считаны данные, запись "
"производиться не будет!"
+
+#~ msgid "US/Aleutian"
+#~ msgstr "США/Aleutian"
+
+#~ msgid "US/Arizona"
+#~ msgstr "США/Аризона"
+
+#~ msgid "US/Indiana-Starke"
+#~ msgstr "США/Indiana-Starke"
+
+#~ msgid "US/Michigan"
+#~ msgstr "США/Мичиган"
+
+#~ msgid "America/Argentina/Buenos_Aires"
+#~ msgstr "Америка/Аргентина/Буэнос_Айрес"
+
+#~ msgid "America/Argentina/Cordoba"
+#~ msgstr "Америка/Аргентина/Кордоба"
+
+#~ msgid "America/Argentina/Jujuy"
+#~ msgstr "Америка/Аргентина/Jujuy"
+
+#~ msgid "America/Argentina/Tucuman"
+#~ msgstr "Америка/Аргентина/Tucuman"
+
+#~ msgid "America/Argentina/Catamarca"
+#~ msgstr "Америка/Аргентина/Катамарка"
+
+#~ msgid "America/Argentina/La_Rioja"
+#~ msgstr "Америка/Аргентина/La_Rioja"
+
+#~ msgid "America/Argentina/San_Juan"
+#~ msgstr "Америка/Аргентина/Сан_Хуан"
+
+#~ msgid "America/Argentina/Mendoza"
+#~ msgstr "Америка/Аргентина/Мендоза"
+
+#~ msgid "America/Argentina/ComodRivadavia"
+#~ msgstr "Америка/Аргентина/ComodRivadavia"
+
+#~ msgid "America/Argentina/Rio_Gallegos"
+#~ msgstr "Америка/Аргентина/Rio_Gallegos"
+
+#~ msgid "America/Argentina/Ushuaia"
+#~ msgstr "Америка/Аргентина/Ushuaia"
+
+#~ msgid "Europe/London"
+#~ msgstr "Европа/Лондон"
+
+#~ msgid "Europe/Belfast"
+#~ msgstr "Европа/Белфаст"
+
+#~ msgid "Pacific/Majuro"
+#~ msgstr "Pacific/Majuro"
+
+#~ msgid "Pacific/Kwajalein"
+#~ msgstr "Pacific/Kwajalein"
+
+#~ msgid "Africa/Bamako"
+#~ msgstr "Африка/Bamako"
+
+#~ msgid "Africa/Timbuktu"
+#~ msgstr "Африка/Тимбукту"
+
+#~ msgid "Asia/Kuala_Lumpur"
+#~ msgstr "Азия/Куала_Лумпур"
+
+#~ msgid "Asia/Kuching"
+#~ msgstr "Азия/Kuching"
+
+#~ msgid "Arctic/Longyearbyen"
+#~ msgstr "Arctic/Longyearbyen"
+
+#~ msgid "Atlantic/Jan_Mayen"
+#~ msgstr "Atlantic/Jan_Mayen"
+
+#~ msgid "Europe/Kiev"
+#~ msgstr "Европа/Киев"
+
+#~ msgid "Europe/Uzhgorod"
+#~ msgstr "Европа/Ужгород"
+
+#~ msgid "Europe/Zaporozhye"
+#~ msgstr "Европа/Запорожье"
+
+#~ msgid "Europe/Simferopol"
+#~ msgstr "Европа/Симферополь"
+
+#~ msgid "Asia/Samarkand"
+#~ msgstr "Азия/Самарканд"
+
+#~ msgid "Asia/Tashkent"
+#~ msgstr "Азия/Ташкент"
More information about the l10n-russian-cvs-commits
mailing list