sync with code

1 files changed, 140 insertions, 114 deletions

diff --git a/po/ru.po b/po/ru.po
index 0c20700..b19c106 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2008-03-17 15:16+0100\n"
+"POT-Creation-Date: 2008-04-02 16:11+0200\n"
 "PO-Revision-Date: 2008-03-19 01:24+0400\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -94,7 +94,7 @@ msgstr "Отмена"
 msgid "Ok"
 msgstr "ОК"
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:359 ../bin/draksambashare:228
+#: ../bin/drakconnect-old:113 ../bin/drakgw:344 ../bin/draksambashare:228
 #: ../bin/drakvpn-old:97 ../bin/drakvpn-old:127
 #: ../lib/network/connection_manager.pm:82
 #: ../lib/network/connection_manager.pm:186
@@ -169,8 +169,7 @@ msgid ""
 "Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "Этот интерфейс ещё не был настроен.\n"
-"Запустите помощника \"%s\" из Центра Управления Mandriva "
-"Linux"
+"Запустите помощника \"%s\" из Центра Управления Mandriva Linux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:68
 #, c-format
@@ -298,7 +297,8 @@ msgstr ""
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
-msgstr "Выберите сетевой адаптер, который будет подключён к вашей локальной сети."
+msgstr ""
+"Выберите сетевой адаптер, который будет подключён к вашей локальной сети."
 
 #: ../bin/drakgw:173
 #, c-format
@@ -441,12 +441,12 @@ msgstr "Порт прокси"
 msgid "Cache size (MB)"
 msgstr "Размер кэша (MB)"
 
-#: ../bin/drakgw:296
+#: ../bin/drakgw:292
 #, c-format
 msgid "Broadcast printer information"
 msgstr "Широковещательная информация о принтере"
 
-#: ../bin/drakgw:307
+#: ../bin/drakgw:303
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -455,17 +455,17 @@ msgstr ""
 "В вашей системе не обнаружен сетевой адаптер. Пожалуйста, запустите утилиту "
 "настройки оборудования."
 
-#: ../bin/drakgw:313
+#: ../bin/drakgw:309
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Общий доступ к Интернету теперь включён."
 
-#: ../bin/drakgw:319
+#: ../bin/drakgw:315
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Общий доступ к Интернету теперь отключён."
 
-#: ../bin/drakgw:325
+#: ../bin/drakgw:321
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -478,17 +478,17 @@ msgstr ""
 "другими компьютерами вашей локальной сети, используя автоматическую\n"
 "настройку сети (DHCP) и кэширующий прокси-сервер (SQUID)."
 
-#: ../bin/drakgw:359
+#: ../bin/drakgw:344
 #, c-format
 msgid "Disabling servers..."
 msgstr "Выключаются серверы..."
 
-#: ../bin/drakgw:373
+#: ../bin/drakgw:358
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Обнаружена конфигурация файервола!"
 
-#: ../bin/drakgw:374
+#: ../bin/drakgw:359
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -497,12 +497,12 @@ msgstr ""
 "Предупреждение! Были обнаружены существующие настройки файервола. Вам может "
 "понадобиться подправить их вручную после установки."
 
-#: ../bin/drakgw:379
+#: ../bin/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Идёт настройка..."
 
-#: ../bin/drakgw:380
+#: ../bin/drakgw:365
 #, c-format
 msgid "Configuring firewall..."
 msgstr "Настраивается файервол..."
@@ -636,8 +636,8 @@ msgstr "Разрешённые адреса"
 #: ../bin/drakids:40 ../bin/drakids:68 ../bin/drakids:187 ../bin/drakids:196
 #: ../bin/drakids:221 ../bin/drakids:230 ../bin/drakids:240 ../bin/drakids:332
 #: ../bin/net_applet:76 ../bin/net_applet:239 ../bin/net_applet:515
-#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:259
-#: ../lib/network/drakfirewall.pm:263
+#: ../bin/net_applet:543 ../lib/network/drakfirewall.pm:262
+#: ../lib/network/drakfirewall.pm:266
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактивный файервол"
@@ -846,7 +846,8 @@ msgstr "Новый профиль..."
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
-msgstr "Название создаваемого профиля (новый профиль создаётся как копия текущего):"
+msgstr ""
+"Название создаваемого профиля (новый профиль создаётся как копия текущего):"
 
 #: ../bin/draknetprofile:113
 #, c-format
@@ -1599,7 +1600,8 @@ msgstr "Добавить специальный ресурс печати"
 
 #: ../bin/draksambashare:447
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 "Целью этого мастера является простое создание нового специального ресурса "
 "печати Samba."
@@ -1736,7 +1738,8 @@ msgstr "Общедоступный:"
 
 #: ../bin/draksambashare:796
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 "Маска создания, режим создания и маска каталога должны быть числами. Пример: "
 "0755."
@@ -1811,7 +1814,8 @@ msgstr ""
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 "В случае установки единственного сервера для работы с паролями можно "
 "использовать утилиты smbpasswd или tdbsam."
@@ -3769,7 +3773,7 @@ msgid "Address settings"
 msgstr "Настройки адреса"
 
 #: ../lib/network/connection.pm:192 ../lib/network/connection/cable.pm:41
-#: ../lib/network/connection/wireless.pm:40 ../lib/network/vpn/openvpn.pm:127
+#: ../lib/network/connection/wireless.pm:42 ../lib/network/vpn/openvpn.pm:127
 #: ../lib/network/vpn/openvpn.pm:171 ../lib/network/vpn/openvpn.pm:339
 #, c-format
 msgid "None"
@@ -4454,32 +4458,32 @@ msgstr "Беспроводная связь"
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr "Использовать драйвер Windows (с ndiswrapper)"
 
-#: ../lib/network/connection/wireless.pm:41
+#: ../lib/network/connection/wireless.pm:43
 #, c-format
 msgid "Open WEP"
 msgstr "Открытый WEP"
 
-#: ../lib/network/connection/wireless.pm:42
+#: ../lib/network/connection/wireless.pm:44
 #, c-format
 msgid "Restricted WEP"
 msgstr "Закрытый WEP"
 
-#: ../lib/network/connection/wireless.pm:43
+#: ../lib/network/connection/wireless.pm:45
 #, c-format
 msgid "WPA/WPA2 Pre-Shared Key"
 msgstr "Ключ WPA/WPA2"
 
-#: ../lib/network/connection/wireless.pm:44
+#: ../lib/network/connection/wireless.pm:46
 #, c-format
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:231
+#: ../lib/network/connection/wireless.pm:234
 #, c-format
 msgid "Windows driver"
 msgstr "Драйвер Windows"
 
-#: ../lib/network/connection/wireless.pm:298
+#: ../lib/network/connection/wireless.pm:301
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4488,68 +4492,73 @@ msgstr ""
 "Ваша карта беспроводной связи отключена. Включите её сначала (переключатель "
 "RF)."
 
-#: ../lib/network/connection/wireless.pm:361
+#: ../lib/network/connection/wireless.pm:366
 #, c-format
 msgid "Wireless settings"
 msgstr "Параметры беспроводного соединения"
 
-#: ../lib/network/connection/wireless.pm:366
+#: ../lib/network/connection/wireless.pm:371
 #: ../lib/network/connection_manager.pm:243
 #, c-format
 msgid "Operating Mode"
 msgstr "Режим управления"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Managed"
 msgstr "Управляемый"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Master"
 msgstr "Мастер"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Repeater"
 msgstr "Повторитель"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Secondary"
 msgstr "Вторичный"
 
-#: ../lib/network/connection/wireless.pm:367
+#: ../lib/network/connection/wireless.pm:372
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: ../lib/network/connection/wireless.pm:370
+#: ../lib/network/connection/wireless.pm:375
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Сетевое имя (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:372
+#: ../lib/network/connection/wireless.pm:377
 #, c-format
 msgid "Encryption mode"
 msgstr "Режим шифрования"
 
-#: ../lib/network/connection/wireless.pm:374
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid "Encryption key"
 msgstr "Ключ шифрования"
 
-#: ../lib/network/connection/wireless.pm:376
+#: ../lib/network/connection/wireless.pm:381
+#, c-format
+msgid "Force using this key as ASCII string (e.g. for Livebox)"
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:388
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Логин EAP (имя пользователя)"
 
-#: ../lib/network/connection/wireless.pm:378
+#: ../lib/network/connection/wireless.pm:390
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4561,12 +4570,12 @@ msgstr ""
 "ещё непроверенным синтаксисом\n"
 "  ДОМЕН\\имя_пользователя"
 
-#: ../lib/network/connection/wireless.pm:381
+#: ../lib/network/connection/wireless.pm:393
 #, c-format
 msgid "EAP Password"
 msgstr "Пароль EAP"
 
-#: ../lib/network/connection/wireless.pm:383
+#: ../lib/network/connection/wireless.pm:395
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4602,12 +4611,12 @@ msgstr ""
 "него могут игнорироваться указанные здесь имя пользователя\n"
 "и пароль."
 
-#: ../lib/network/connection/wireless.pm:397
+#: ../lib/network/connection/wireless.pm:409
 #, c-format
 msgid "EAP client certificate"
 msgstr "Сертификат клиента EAP"
 
-#: ../lib/network/connection/wireless.pm:399
+#: ../lib/network/connection/wireless.pm:411
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4622,32 +4631,32 @@ msgstr ""
 "Замечание: на странице дополнительной настройки доступны\n"
 "другие параметры."
 
-#: ../lib/network/connection/wireless.pm:403
+#: ../lib/network/connection/wireless.pm:415
 #, c-format
 msgid "Network ID"
 msgstr "Сетевой ID"
 
-#: ../lib/network/connection/wireless.pm:404
+#: ../lib/network/connection/wireless.pm:416
 #, c-format
 msgid "Operating frequency"
 msgstr "Рабочая частота"
 
-#: ../lib/network/connection/wireless.pm:405
+#: ../lib/network/connection/wireless.pm:417
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Порог чувствительности"
 
-#: ../lib/network/connection/wireless.pm:406
+#: ../lib/network/connection/wireless.pm:418
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:407
+#: ../lib/network/connection/wireless.pm:419
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:408
+#: ../lib/network/connection/wireless.pm:420
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4668,17 +4677,17 @@ msgstr ""
 "посылает RTS, значение равное максимальному размеру пакета отключает схему.\n"
 " Вы также можете установить значение этого параметра в auto, fixed или off."
 
-#: ../lib/network/connection/wireless.pm:415
+#: ../lib/network/connection/wireless.pm:427
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментация"
 
-#: ../lib/network/connection/wireless.pm:416
+#: ../lib/network/connection/wireless.pm:428
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Дополнительные аргументы команды iwconfig"
 
-#: ../lib/network/connection/wireless.pm:417
+#: ../lib/network/connection/wireless.pm:429
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4694,12 +4703,12 @@ msgstr ""
 "Читайте iwconfig(8) man страницу для получения подробной информации."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:424
+#: ../lib/network/connection/wireless.pm:436
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Дополнительные аргументы команды iwspy"
 
-#: ../lib/network/connection/wireless.pm:425
+#: ../lib/network/connection/wireless.pm:437
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4719,12 +4728,12 @@ msgstr ""
 "\n"
 "Читайте iwpspy(8) man страницу для получения подробной информации."
 
-#: ../lib/network/connection/wireless.pm:433
+#: ../lib/network/connection/wireless.pm:445
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Дополнительные аргументы команды iwpriv"
 
-#: ../lib/network/connection/wireless.pm:435
+#: ../lib/network/connection/wireless.pm:447
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4755,28 +4764,28 @@ msgstr ""
 "\n"
 "Читайте iwpriv(8) man страницу для получения подробной информации."
 
-#: ../lib/network/connection/wireless.pm:446
+#: ../lib/network/connection/wireless.pm:458
 #, c-format
 msgid "EAP Protocol"
 msgstr "Протокол EAP"
 
-#: ../lib/network/connection/wireless.pm:447
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "Auto Detect"
 msgstr "Автоопределение"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:447
+#: ../lib/network/connection/wireless.pm:459
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:449
+#: ../lib/network/connection/wireless.pm:461
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4786,67 +4795,67 @@ msgstr ""
 "сначала выполняется попытка задействовать WPA версии 2,\n"
 "а затем WPA версии 1."
 
-#: ../lib/network/connection/wireless.pm:451
+#: ../lib/network/connection/wireless.pm:463
 #, c-format
 msgid "EAP Mode"
 msgstr "Режим EAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:452
+#: ../lib/network/connection/wireless.pm:464
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:454
+#: ../lib/network/connection/wireless.pm:466
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "Управление ключами EAP"
 
-#: ../lib/network/connection/wireless.pm:456
+#: ../lib/network/connection/wireless.pm:468
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4856,12 +4865,12 @@ msgstr ""
 "аутентификации.\n"
 "Возможные значения: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:458
+#: ../lib/network/connection/wireless.pm:470
 #, c-format
 msgid "EAP outer identity"
 msgstr "Внешний идентификатор EAP"
 
-#: ../lib/network/connection/wireless.pm:460
+#: ../lib/network/connection/wireless.pm:472
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4873,12 +4882,12 @@ msgstr ""
 "вместе с типами EAP, которые поддерживают различные\n"
 "виды туннелирования, например, TTLS"
 
-#: ../lib/network/connection/wireless.pm:463
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "EAP phase2"
 msgstr "Вторая фаза EAP"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:477
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4892,12 +4901,12 @@ msgstr ""
 "auth=MSCHAPV2 для PEAP или\n"
 "autheap=MSCHAPV2 autheap=MD5 для TTLS"
 
-#: ../lib/network/connection/wireless.pm:469
+#: ../lib/network/connection/wireless.pm:481
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Центр сертификации EAP"
 
-#: ../lib/network/connection/wireless.pm:471
+#: ../lib/network/connection/wireless.pm:483
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4913,12 +4922,12 @@ msgstr ""
 "доверенный сертификат всегда нужно настраивать при\n"
 "использовании вместе с TLS or TTLS или PEAP."
 
-#: ../lib/network/connection/wireless.pm:476
+#: ../lib/network/connection/wireless.pm:488
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Соответствие описания сертификата EAP"
 
-#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/connection/wireless.pm:490
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4934,12 +4943,12 @@ msgstr ""
 "Строка описания имеет следующий формат:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:483
+#: ../lib/network/connection/wireless.pm:495
 #, c-format
 msgid "EAP extra directives"
 msgstr "Дополнительные директивы EAP"
 
-#: ../lib/network/connection/wireless.pm:485
+#: ../lib/network/connection/wireless.pm:497
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4974,12 +4983,26 @@ msgstr ""
 "значений параметров, отличных от тех, что указываются \n"
 "в графическом инерфейсе."
 
-#: ../lib/network/connection/wireless.pm:505
+#: ../lib/network/connection/wireless.pm:517
 #, c-format
 msgid "An encryption key is required."
 msgstr "Требуется ключ шифрования."
 
-#: ../lib/network/connection/wireless.pm:511
+#: ../lib/network/connection/wireless.pm:524
+#, c-format
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:530
+#, c-format
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+
+#: ../lib/network/connection/wireless.pm:537
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4988,7 +5011,7 @@ msgstr ""
 "Freq (частота) должна иметь суффикс k, M или G (например, \"2.46G\" для "
 "частоты 2.46 ГГц), или добавьте нужное количество '0' (нулей)."
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:543
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4997,17 +5020,17 @@ msgstr ""
 "Rate должна иметь суффикс k, M или G (например, \"11M\" для 11M), или "
 "добавьте нужное количество '0' (нулей)."
 
-#: ../lib/network/connection/wireless.pm:529
+#: ../lib/network/connection/wireless.pm:555
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Разрешить роуминг точки доступа"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:665
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Установлена связь с беспроводной сетью \"%s\" на интерфейсе %s"
 
-#: ../lib/network/connection/wireless.pm:640
+#: ../lib/network/connection/wireless.pm:666
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Потеряна связь с беспроводной сетью на интерфейсе %s"
@@ -5208,13 +5231,13 @@ msgstr "BitTorrent"
 msgid "Port scan detection"
 msgstr "Обнаружение сканирования портов"
 
-#: ../lib/network/drakfirewall.pm:166 ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:169 ../lib/network/drakfirewall.pm:175
 #: ../lib/network/shorewall.pm:63
 #, c-format
 msgid "Firewall configuration"
 msgstr "Настройка файервола"
 
-#: ../lib/network/drakfirewall.pm:166
+#: ../lib/network/drakfirewall.pm:169
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -5229,7 +5252,7 @@ msgstr ""
 "Для создания специализированного мощного файервола, пожалуйста, загляните\n"
 "в специализированный дистрибутив Mandriva Security Firewall."
 
-#: ../lib/network/drakfirewall.pm:172
+#: ../lib/network/drakfirewall.pm:175
 #, c-format
 msgid ""
 "drakfirewall configurator\n"
@@ -5242,18 +5265,18 @@ msgstr ""
 "Перед тем, как продолжить, убедитесь, что вы настроили свой доступ к\n"
 "Интернету/локальной сети при помощи drakconnect."
 
-#: ../lib/network/drakfirewall.pm:189
+#: ../lib/network/drakfirewall.pm:192
 #, c-format
 msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "К каким службам вы хотите разрешить доступ из Интернета?"
 
-#: ../lib/network/drakfirewall.pm:190 ../lib/network/drakfirewall.pm:192
-#: ../lib/network/shorewall.pm:150
+#: ../lib/network/drakfirewall.pm:193 ../lib/network/drakfirewall.pm:195
+#: ../lib/network/shorewall.pm:152
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
 
-#: ../lib/network/drakfirewall.pm:193
+#: ../lib/network/drakfirewall.pm:196
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
@@ -5264,7 +5287,7 @@ msgstr ""
 "Действительные примеры: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Информацию можно найти в /etc/services."
 
-#: ../lib/network/drakfirewall.pm:199
+#: ../lib/network/drakfirewall.pm:202
 #, c-format
 msgid ""
 "Invalid port given: %s.\n"
@@ -5279,22 +5302,22 @@ msgstr ""
 "\n"
 "Вы можете также задать диапазон портов (типа: 24300:24350/udp)"
 
-#: ../lib/network/drakfirewall.pm:209
+#: ../lib/network/drakfirewall.pm:212
 #, c-format
 msgid "Everything (no firewall)"
 msgstr "Ко всем (файервол отключен)"
 
-#: ../lib/network/drakfirewall.pm:211
+#: ../lib/network/drakfirewall.pm:214
 #, c-format
 msgid "Other ports"
 msgstr "Другие порты"
 
-#: ../lib/network/drakfirewall.pm:212
+#: ../lib/network/drakfirewall.pm:215
 #, c-format
 msgid "Log firewall messages in system logs"
 msgstr "Записывать сообщения файерола в системный журнал"
 
-#: ../lib/network/drakfirewall.pm:261
+#: ../lib/network/drakfirewall.pm:264
 #, c-format
 msgid ""
 "You can be warned when someone accesses to a service or tries to intrude "
@@ -5305,7 +5328,7 @@ msgstr ""
 "пытается проникнуть в ваш компьютер.\n"
 "Выберите, за какой сетевой активностью нужно следить."
 
-#: ../lib/network/drakfirewall.pm:266
+#: ../lib/network/drakfirewall.pm:269
 #, c-format
 msgid "Use Interactive Firewall"
 msgstr "Использовать интерактивный файервол"
@@ -5353,7 +5376,8 @@ msgstr "Выберите тип VPN"
 #: ../lib/network/drakvpn.pm:49
 #, c-format
 msgid "Initializing tools and detecting devices for %s..."
-msgstr "Выполняется инициализация инструментов и определение устройств для %s..."
+msgstr ""
+"Выполняется инициализация инструментов и определение устройств для %s..."
 
 #: ../lib/network/drakvpn.pm:52
 #, c-format
@@ -5827,7 +5851,8 @@ msgstr "Модем"
 #: ../lib/network/netconnect.pm:540
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Пожалуйста, выберите, к какому последовательному порту подключен ваш модем."
+msgstr ""
+"Пожалуйста, выберите, к какому последовательному порту подключен ваш модем."
 
 #: ../lib/network/netconnect.pm:569
 #, c-format
@@ -6265,17 +6290,17 @@ msgstr ""
 "\n"
 "Какие интерфейсы следует защитить?\n"
 
-#: ../lib/network/shorewall.pm:141
+#: ../lib/network/shorewall.pm:143
 #, c-format
 msgid "Keep custom rules"
 msgstr "Сохранить свои правила"
 
-#: ../lib/network/shorewall.pm:142
+#: ../lib/network/shorewall.pm:144
 #, c-format
 msgid "Drop custom rules"
 msgstr "Сбросить свои правила"
 
-#: ../lib/network/shorewall.pm:147
+#: ../lib/network/shorewall.pm:149
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"
@@ -6289,7 +6314,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Отсутствуют некоторые компоненты (%s), необходимые для оборудования %s."
+msgstr ""
+"Отсутствуют некоторые компоненты (%s), необходимые для оборудования %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -6300,7 +6326,8 @@ msgstr "Отсутствуют некоторые необходимые пак�
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
 msgstr ""
 "Данные пакеты можно найти в Клубе Mandriva или в коммерческих релизах "
 "Mandriva."
@@ -6518,4 +6545,3 @@ msgstr "Использовать инкапсуляцию Cisco-UDP"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Использовать определённый порт UDP"
-