sync with code

1 files changed, 661 insertions, 763 deletions

diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 0b64600..e151645 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
-"POT-Creation-Date: 2013-11-21 18:54+0000\n"
+"POT-Creation-Date: 2014-11-19 20:45+0100\n"
 "PO-Revision-Date: 2010-01-12 19:12+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <mavnur@gmail.com>\n"
@@ -18,196 +18,6 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../bin/drakconnect-old:47
-#, c-format
-msgid "Network configuration (%d adapters)"
-msgstr "Тармоқни созлаш (%d адаптер)"
-
-#: ../bin/drakconnect-old:66 ../bin/drakinvictus:107
-#, c-format
-msgid "Interface"
-msgstr "Интерфейс"
-
-#: ../bin/drakconnect-old:66 ../bin/drakconnect-old:210 ../bin/drakhosts:183
-#: ../lib/network/connection/ethernet.pm:142
-#: ../lib/network/drakconnect/edit.pm:152 ../lib/network/netconnect.pm:633
-#: ../lib/network/vpn/openvpn.pm:224
-#, c-format
-msgid "IP address"
-msgstr "IP рақами"
-
-#: ../bin/drakconnect-old:66 ../bin/drakids:261
-#: ../lib/network/drakconnect/edit.pm:136
-#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:477
-#, c-format
-msgid "Protocol"
-msgstr "Протокол"
-
-#: ../bin/drakconnect-old:66 ../lib/network/netconnect.pm:463
-#, c-format
-msgid "Driver"
-msgstr "Драйвер"
-
-#: ../bin/drakconnect-old:66
-#, c-format
-msgid "State"
-msgstr "Ҳолати"
-
-#: ../bin/drakconnect-old:81
-#, c-format
-msgid "Hostname: "
-msgstr "Компьютернинг номи: "
-
-#: ../bin/drakconnect-old:83
-#, c-format
-msgid "Configure hostname..."
-msgstr "Компьютер номини мослаш..."
-
-#: ../bin/drakconnect-old:97 ../bin/drakconnect-old:173
-#, c-format
-msgid "LAN configuration"
-msgstr "Локал тармоқни созлаш"
-
-#: ../bin/drakconnect-old:102
-#, c-format
-msgid "Configure Local Area Network..."
-msgstr "Локал тармоқни созлаш..."
-
-#: ../bin/drakconnect-old:108 ../bin/draknfs:196 ../bin/net_applet:215
-#: ../bin/net_applet~:215 ../lib/network/drakconnect/edit.pm:72
-#, c-format
-msgid "Help"
-msgstr "Ёрдам"
-
-#: ../bin/drakconnect-old:110 ../bin/drakinvictus:142
-#: ../lib/network/drakconnect/edit.pm:73 ../lib/network/drakconnect/edit.pm:77
-#, c-format
-msgid "Apply"
-msgstr "Қўллаш"
-
-#: ../bin/drakconnect-old:112 ../bin/drakconnect-old:265
-#: ../bin/draknetprofile:166 ../bin/net_monitor:388
-#: ../lib/network/drakconnect/global.pm:89
-#, c-format
-msgid "Cancel"
-msgstr "Бекор қилиш"
-
-#: ../bin/drakconnect-old:113 ../bin/drakconnect-old:180
-#: ../bin/drakconnect-old:267 ../bin/draknetprofile:168 ../bin/net_monitor:389
-#: ../lib/network/drakconnect/global.pm:90
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../bin/drakconnect-old:115 ../bin/drakgw:353 ../bin/draknfs:588
-#: ../bin/draksambashare:231 ../lib/network/connection_manager.pm:58
-#: ../lib/network/connection_manager.pm:73
-#: ../lib/network/connection_manager.pm:190
-#: ../lib/network/connection_manager.pm:217
-#: ../lib/network/connection_manager.pm:253
-#: ../lib/network/drakconnect/edit.pm:467 ../lib/network/drakvpn.pm:52
-#: ../lib/network/netcenter.pm:151 ../lib/network/netconnect.pm:187
-#: ../lib/network/netconnect.pm:209 ../lib/network/netconnect.pm:306
-#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:353
-#: ../lib/network/thirdparty.pm:368
-#, c-format
-msgid "Please wait"
-msgstr "Илтимос кутиб туринг"
-
-#: ../bin/drakconnect-old:117 ../lib/network/drakconnect/edit.pm:469
-#, c-format
-msgid "Please Wait... Applying the configuration"
-msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
-
-#: ../bin/drakconnect-old:143
-#, c-format
-msgid "Deactivate now"
-msgstr "Ўчириш"
-
-#: ../bin/drakconnect-old:143
-#, c-format
-msgid "Activate now"
-msgstr "Ёқиш"
-
-#: ../bin/drakconnect-old:177
-#, c-format
-msgid ""
-"You do not have any configured interface.\n"
-"Configure them first by clicking on 'Configure'"
-msgstr ""
-"Сизда созланган интерфейс йўқ.\n"
-"Аввало, уларни \"Созлаш\"ни босиб созланг."
-
-#: ../bin/drakconnect-old:191
-#, c-format
-msgid "LAN Configuration"
-msgstr "Локал тармоқни созлаш"
-
-#: ../bin/drakconnect-old:203
-#, c-format
-msgid "Adapter %s: %s"
-msgstr "Адаптер %s: %s"
-
-#: ../bin/drakconnect-old:211 ../bin/drakgw:183
-#: ../lib/network/connection/ethernet.pm:149
-#: ../lib/network/drakconnect/edit.pm:157
-#, c-format
-msgid "Netmask"
-msgstr "Тармоқ маскаси"
-
-#: ../bin/drakconnect-old:212
-#, c-format
-msgid "Boot Protocol"
-msgstr "Юклаш протоколи"
-
-#: ../bin/drakconnect-old:213
-#, c-format
-msgid "Started on boot"
-msgstr "Тизим юкланганда ишга туширилган"
-
-#: ../bin/drakconnect-old:214 ../lib/network/connection/ethernet.pm:160
-#: ../lib/network/drakconnect/edit.pm:200
-#, c-format
-msgid "DHCP client"
-msgstr "DHCP клиенти"
-
-#: ../bin/drakconnect-old:249
-#, fuzzy, c-format
-msgid ""
-"This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mageia Linux Control Center"
-msgstr ""
-"Бу интерфейс ҳали мослангани йўқ.\n"
-"Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
-
-#: ../bin/drakconnect-old:249 ../bin/net_applet:101 ../bin/net_applet~:101
-#: ../lib/network/drakconnect/global.pm:37
-#, c-format
-msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
-msgstr "Янги тармоқ интерфейсини ўрнатиш ва мослаш (LAN, ISDN, ADSL, ...)"
-
-#: ../bin/drakconnect-old:275 ../bin/drakconnect-old:307
-#: ../lib/network/drakconnect.pm:17 ../lib/network/drakconnect/edit.pm:516
-#, c-format
-msgid "No IP"
-msgstr "IP рақами кўрсатилмаган"
-
-#: ../bin/drakconnect-old:308 ../lib/network/drakconnect.pm:18
-#: ../lib/network/drakconnect/edit.pm:517
-#, c-format
-msgid "No Mask"
-msgstr "Маскасиз"
-
-#: ../bin/drakconnect-old:309 ../lib/network/drakconnect.pm:19
-#, c-format
-msgid "up"
-msgstr "ишлаяпти"
-
-#: ../bin/drakconnect-old:309 ../lib/network/drakconnect.pm:19
-#, c-format
-msgid "down"
-msgstr "ишламаяпти"
-
 #: ../bin/drakgw:73
 #, c-format
 msgid "Internet Connection Sharing"
@@ -291,7 +101,7 @@ msgstr ""
 msgid "Net Device"
 msgstr "Тармоқ ускунаси"
 
-#: ../bin/drakgw:143
+#: ../bin/drakgw:145
 #, c-format
 msgid ""
 "There is only one network adapter on your system configured for LAN "
@@ -315,45 +125,51 @@ msgstr ""
 "алоқасини бўлишишни созлашдан аввал drakfirewall ёрдамида у адаптер\n"
 "учун мосланган файерволни ўчириб қўйинг."
 
-#: ../bin/drakgw:158
+#: ../bin/drakgw:160
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Илтимос локал тармоғингизга уланадиган тармоқ адаптерини танланг."
 
-#: ../bin/drakgw:179
+#: ../bin/drakgw:181
 #, c-format
 msgid "Local Area Network settings"
 msgstr "Локал тармоқнинг мосламалари"
 
-#: ../bin/drakgw:182 ../lib/network/vpn/openvpn.pm:230
+#: ../bin/drakgw:184 ../lib/network/vpn/openvpn.pm:230
 #, c-format
 msgid "Local IP address"
 msgstr "Локал IP рақами"
 
-#: ../bin/drakgw:184
+#: ../bin/drakgw:185 ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:157
+#, c-format
+msgid "Netmask"
+msgstr "Тармоқ маскаси"
+
+#: ../bin/drakgw:186
 #, c-format
 msgid "The internal domain name"
 msgstr "Ички домен номи"
 
-#: ../bin/drakgw:190 ../bin/drakhosts:98 ../bin/drakhosts:232
+#: ../bin/drakgw:192 ../bin/drakhosts:98 ../bin/drakhosts:232
 #: ../bin/drakhosts:239 ../bin/drakhosts:246 ../bin/drakinvictus:74
-#: ../bin/draknetprofile:173 ../bin/draknetprofile:193 ../bin/draknfs:96
-#: ../bin/draknfs:286 ../bin/draknfs:433 ../bin/draknfs:435 ../bin/draknfs:438
-#: ../bin/draknfs:530 ../bin/draknfs:537 ../bin/draknfs:609 ../bin/draknfs:616
-#: ../bin/draknfs:623 ../bin/draksambashare:396 ../bin/draksambashare:403
-#: ../bin/draksambashare:406 ../bin/draksambashare:458
-#: ../bin/draksambashare:482 ../bin/draksambashare:555
-#: ../bin/draksambashare:632 ../bin/draksambashare:698
-#: ../bin/draksambashare:798 ../bin/draksambashare:806
-#: ../bin/draksambashare:945 ../bin/draksambashare:1100
-#: ../bin/draksambashare:1119 ../bin/draksambashare:1151
-#: ../bin/draksambashare:1278 ../bin/draksambashare:1380
-#: ../bin/draksambashare:1389 ../bin/draksambashare:1411
-#: ../bin/draksambashare:1420 ../bin/draksambashare:1439
-#: ../bin/draksambashare:1448 ../bin/draksambashare:1460
-#: ../lib/network/connection/xdsl.pm:362
+#: ../bin/draknetprofile:173 ../bin/draknetprofile:193 ../bin/draknfs:82
+#: ../bin/draknfs:271 ../bin/draknfs:418 ../bin/draknfs:420 ../bin/draknfs:423
+#: ../bin/draknfs:515 ../bin/draknfs:522 ../bin/draknfs:616 ../bin/draknfs:623
+#: ../bin/draknfs:630 ../bin/draksambashare:374 ../bin/draksambashare:381
+#: ../bin/draksambashare:384 ../bin/draksambashare:436
+#: ../bin/draksambashare:460 ../bin/draksambashare:533
+#: ../bin/draksambashare:610 ../bin/draksambashare:659
+#: ../bin/draksambashare:680 ../bin/draksambashare:776
+#: ../bin/draksambashare:784 ../bin/draksambashare:923
+#: ../bin/draksambashare:1078 ../bin/draksambashare:1097
+#: ../bin/draksambashare:1129 ../bin/draksambashare:1256
+#: ../bin/draksambashare:1393 ../bin/draksambashare:1402
+#: ../bin/draksambashare:1424 ../bin/draksambashare:1433
+#: ../bin/draksambashare:1452 ../bin/draksambashare:1461
+#: ../bin/draksambashare:1473 ../lib/network/connection/xdsl.pm:362
 #: ../lib/network/connection_manager.pm:46
 #: ../lib/network/connection_manager.pm:52
 #: ../lib/network/connection_manager.pm:68
@@ -378,29 +194,29 @@ msgstr "Ички домен номи"
 msgid "Error"
 msgstr "Хато"
 
-#: ../bin/drakgw:190
+#: ../bin/drakgw:192
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "%s нинг жорий мослама файлида локал тармоқ манзили номутаносиблиги "
 "аниқланди!\n"
 
-#: ../bin/drakgw:206
+#: ../bin/drakgw:208
 #, c-format
 msgid "Domain Name Server (DNS) configuration"
 msgstr "Domain Name Server (DNS) мосламаси"
 
-#: ../bin/drakgw:210
+#: ../bin/drakgw:212
 #, c-format
 msgid "Use this gateway as domain name server"
 msgstr "Ушбу гэйтвэйдан домен номи сервери сифатида фойдаланиш"
 
-#: ../bin/drakgw:211
+#: ../bin/drakgw:213
 #, c-format
 msgid "The DNS Server IP"
 msgstr "DNS серверининг IP рақами"
 
-#: ../bin/drakgw:238
+#: ../bin/drakgw:240
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -413,67 +229,67 @@ msgstr ""
 "Бу ерда DHCP серверини мослаш учун турли мосламаларни танлашингиз мумкин.\n"
 "Агар бирор мосламанинг маъносини билмасангиз, уни шундай қолдиринг."
 
-#: ../bin/drakgw:245
+#: ../bin/drakgw:247
 #, c-format
 msgid "Use automatic configuration (DHCP)"
 msgstr "Авто-мослашдан фойдаланиш (DHCP)"
 
-#: ../bin/drakgw:246
+#: ../bin/drakgw:248
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP бошланғич чегараси"
 
-#: ../bin/drakgw:247
+#: ../bin/drakgw:249
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP қуйи чегараси"
 
-#: ../bin/drakgw:248
+#: ../bin/drakgw:250
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: ../bin/drakgw:249
+#: ../bin/drakgw:251
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: ../bin/drakgw:272
+#: ../bin/drakgw:274
 #, c-format
 msgid "Proxy caching server (SQUID)"
 msgstr "Кэшловчи прокси сервер (SQUID)"
 
-#: ../bin/drakgw:276
+#: ../bin/drakgw:278
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr "Ушбу гэйтвэйтдан кэшловчи прокси сервер сифатида фойдаланиш"
 
-#: ../bin/drakgw:277
+#: ../bin/drakgw:279
 #, c-format
 msgid "Admin mail"
 msgstr "Администратор почтаси"
 
-#: ../bin/drakgw:278
+#: ../bin/drakgw:280
 #, c-format
 msgid "Visible hostname"
 msgstr "Кўринадиган хост номи"
 
-#: ../bin/drakgw:279
+#: ../bin/drakgw:281
 #, c-format
 msgid "Proxy port"
 msgstr "Прокси порти"
 
-#: ../bin/drakgw:280
+#: ../bin/drakgw:282
 #, c-format
 msgid "Cache size (MB)"
 msgstr "Кэшнинг ҳажми (Мб)"
 
-#: ../bin/drakgw:299
+#: ../bin/drakgw:301
 #, c-format
 msgid "Broadcast printer information"
 msgstr ""
 
-#: ../bin/drakgw:310
+#: ../bin/drakgw:312
 #, c-format
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your "
@@ -488,17 +304,17 @@ msgstr ""
 "Илтимос ускуналарни созлаш воситасидан фойдаланиб уни созланг ва Mageia "
 "файерволи ушбу адаптер учун ўчирилганлигини текширинг."
 
-#: ../bin/drakgw:318
+#: ../bin/drakgw:320
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Интернет билан бўлишиш ёқилди."
 
-#: ../bin/drakgw:324
+#: ../bin/drakgw:326
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Интернет билан бўлишиш ўчирилди."
 
-#: ../bin/drakgw:330
+#: ../bin/drakgw:332
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -507,29 +323,44 @@ msgid ""
 " a Transparent Proxy Cache server (SQUID)."
 msgstr ""
 
-#: ../bin/drakgw:353
+#: ../bin/drakgw:355 ../bin/draknfs:595 ../bin/draksambashare:209
+#: ../lib/network/connection_manager.pm:58
+#: ../lib/network/connection_manager.pm:73
+#: ../lib/network/connection_manager.pm:190
+#: ../lib/network/connection_manager.pm:217
+#: ../lib/network/connection_manager.pm:253
+#: ../lib/network/drakconnect/edit.pm:467 ../lib/network/drakvpn.pm:52
+#: ../lib/network/netcenter.pm:151 ../lib/network/netconnect.pm:187
+#: ../lib/network/netconnect.pm:209 ../lib/network/netconnect.pm:306
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:353
+#: ../lib/network/thirdparty.pm:368
+#, c-format
+msgid "Please wait"
+msgstr "Илтимос кутиб туринг"
+
+#: ../bin/drakgw:355
 #, c-format
 msgid "Disabling servers..."
 msgstr "Серверлар ўчирилмоқда..."
 
-#: ../bin/drakgw:367
+#: ../bin/drakgw:369
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr ""
 
-#: ../bin/drakgw:368
+#: ../bin/drakgw:370
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
 
-#: ../bin/drakgw:373
+#: ../bin/drakgw:375
 #, c-format
 msgid "Configuring..."
 msgstr "Мосланмоқда..."
 
-#: ../bin/drakgw:374
+#: ../bin/drakgw:376
 #, c-format
 msgid "Configuring firewall..."
 msgstr "Файервол мосланмоқда..."
@@ -569,9 +400,9 @@ msgstr "Компьютер номи:"
 msgid "Host Aliases:"
 msgstr ""
 
-#: ../bin/drakhosts:119 ../bin/draknfs:120 ../bin/draksambashare:232
-#: ../bin/draksambashare:256 ../bin/draksambashare:400
-#: ../bin/draksambashare:628 ../bin/draksambashare:794
+#: ../bin/drakhosts:119 ../bin/draknfs:106 ../bin/draksambashare:210
+#: ../bin/draksambashare:234 ../bin/draksambashare:378
+#: ../bin/draksambashare:606 ../bin/draksambashare:772
 #, c-format
 msgid "Error!"
 msgstr "Хато!"
@@ -581,6 +412,13 @@ msgstr "Хато!"
 msgid "Please enter a valid IP address."
 msgstr "Илтимос тўғри IP рақамни киритинг."
 
+#: ../bin/drakhosts:183 ../lib/network/connection/ethernet.pm:142
+#: ../lib/network/drakconnect/edit.pm:152 ../lib/network/netconnect.pm:633
+#: ../lib/network/vpn/openvpn.pm:224
+#, c-format
+msgid "IP address"
+msgstr "IP рақами"
+
 #: ../bin/drakhosts:183 ../lib/network/connection/ethernet.pm:226
 #, c-format
 msgid "Host name"
@@ -596,13 +434,13 @@ msgstr ""
 msgid "Manage hosts definitions"
 msgstr "Шу компьютерга маълум бўлган хост номларини мослаш"
 
-#: ../bin/drakhosts:209 ../bin/drakhosts:236 ../bin/draknfs:373
+#: ../bin/drakhosts:209 ../bin/drakhosts:236 ../bin/draknfs:358
 #, c-format
 msgid "Modify entry"
 msgstr "Ўзгартириш"
 
-#: ../bin/drakhosts:228 ../bin/draknfs:605 ../bin/draksambashare:1373
-#: ../bin/draksambashare:1404 ../bin/draksambashare:1435
+#: ../bin/drakhosts:228 ../bin/draknfs:612 ../bin/draksambashare:1386
+#: ../bin/draksambashare:1417 ../bin/draksambashare:1448
 #, c-format
 msgid "Add"
 msgstr "Қўшиш"
@@ -617,9 +455,9 @@ msgstr "Қўшиш"
 msgid "Failed to add host."
 msgstr ""
 
-#: ../bin/drakhosts:235 ../bin/draknfs:612 ../bin/draksambashare:1330
-#: ../bin/draksambashare:1375 ../bin/draksambashare:1406
-#: ../bin/draksambashare:1443
+#: ../bin/drakhosts:235 ../bin/draknfs:619 ../bin/draksambashare:1308
+#: ../bin/draksambashare:1388 ../bin/draksambashare:1419
+#: ../bin/draksambashare:1456
 #, c-format
 msgid "Modify"
 msgstr "Ўзгартириш"
@@ -630,8 +468,8 @@ msgid "Failed to Modify host."
 msgstr ""
 
 #: ../bin/drakhosts:242 ../bin/drakids:95 ../bin/drakids:104
-#: ../bin/draknfs:619 ../bin/draksambashare:1331 ../bin/draksambashare:1383
-#: ../bin/draksambashare:1414 ../bin/draksambashare:1451
+#: ../bin/draknfs:626 ../bin/draksambashare:1309 ../bin/draksambashare:1396
+#: ../bin/draksambashare:1427 ../bin/draksambashare:1464
 #, c-format
 msgid "Remove"
 msgstr "Олиб ташлаш"
@@ -642,7 +480,7 @@ msgid "Failed to remove host."
 msgstr ""
 
 #: ../bin/drakhosts:249 ../bin/drakinvictus:143 ../bin/draknetprofile:226
-#: ../bin/net_applet:219 ../bin/net_applet~:219 ../lib/network/drakroam.pm:94
+#: ../bin/net_applet:218 ../lib/network/drakroam.pm:94
 #: ../lib/network/netcenter.pm:178
 #, c-format
 msgid "Quit"
@@ -655,17 +493,16 @@ msgstr "Рухсат этилган манзиллар"
 
 #: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:141 ../bin/net_applet~:141
-#: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
-#: ../lib/network/net_applet/ifw.pm:62 ../lib/network/net_applet/ifw.pm:90
+#: ../bin/net_applet:142 ../lib/network/drakfirewall.pm:309
+#: ../lib/network/drakfirewall.pm:313 ../lib/network/net_applet/ifw.pm:62
+#: ../lib/network/net_applet/ifw.pm:90
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактив файервол"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:355 ../bin/net_applet~:355
-#: ../lib/network/net_applet/ifw.pm:62
+#: ../bin/net_applet:357 ../lib/network/net_applet/ifw.pm:62
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Демон билан алоқа ўрнатиб бўлмади"
@@ -686,8 +523,7 @@ msgid "Block"
 msgstr ""
 
 #: ../bin/drakids:88 ../bin/drakids:97 ../bin/drakids:106 ../bin/drakids:117
-#: ../bin/drakids:130 ../bin/drakids:138 ../bin/draknfs:201
-#: ../bin/net_monitor:122
+#: ../bin/drakids:130 ../bin/drakids:138 ../bin/draknfs:187
 #, c-format
 msgid "Close"
 msgstr "Ёпиш"
@@ -757,6 +593,12 @@ msgstr "Хизмат"
 msgid "Network interface"
 msgstr "Тармоқнинг интерфейси"
 
+#: ../bin/drakids:261 ../lib/network/drakconnect/edit.pm:136
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:477
+#, c-format
+msgid "Protocol"
+msgstr "Протокол"
+
 #: ../bin/drakids:291
 #, c-format
 msgid "Application"
@@ -806,6 +648,11 @@ msgstr ""
 
 #: ../bin/drakinvictus:107
 #, c-format
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../bin/drakinvictus:107
+#, c-format
 msgid "Real address"
 msgstr ""
 
@@ -845,6 +692,12 @@ msgstr ""
 msgid "Connection mark bit"
 msgstr ""
 
+#: ../bin/drakinvictus:142 ../lib/network/drakconnect/edit.pm:73
+#: ../lib/network/drakconnect/edit.pm:77
+#, c-format
+msgid "Apply"
+msgstr "Қўллаш"
+
 #: ../bin/draknetprofile:39
 #, c-format
 msgid "Network profiles"
@@ -919,6 +772,16 @@ msgid ""
 "afterwards."
 msgstr ""
 
+#: ../bin/draknetprofile:166 ../lib/network/drakconnect/global.pm:89
+#, c-format
+msgid "Cancel"
+msgstr "Бекор қилиш"
+
+#: ../bin/draknetprofile:168 ../lib/network/drakconnect/global.pm:90
+#, c-format
+msgid "Ok"
+msgstr "Ок"
+
 #: ../bin/draknetprofile:173
 #, c-format
 msgid "The \"%s\" profile already exists!"
@@ -956,7 +819,7 @@ msgid ""
 "first."
 msgstr "Жорий профилни ўчириб бўлмайди"
 
-#: ../bin/draknetprofile:201 ../bin/draknfs:360
+#: ../bin/draknetprofile:201 ../bin/draknfs:345
 #, c-format
 msgid "Advanced"
 msgstr "Қўшимча"
@@ -1011,69 +874,32 @@ msgstr ""
 msgid "allow real remote root access"
 msgstr ""
 
-#: ../bin/draknfs:69 ../bin/draknfs:70 ../bin/draknfs:71
-#: ../bin/draksambashare:177 ../bin/draksambashare:178
-#: ../bin/draksambashare:179
-#, c-format
-msgid "_File"
-msgstr "_Файл"
-
-#: ../bin/draknfs:70 ../bin/draksambashare:178
-#, c-format
-msgid "_Write conf"
-msgstr "_Мосламани ёзиш"
-
-#: ../bin/draknfs:71 ../bin/draksambashare:179
-#, c-format
-msgid "_Quit"
-msgstr "_Чиқиш"
-
-#: ../bin/draknfs:71 ../bin/draksambashare:179
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../bin/draknfs:74 ../bin/draknfs:75 ../bin/draknfs:76
-#, c-format
-msgid "_NFS Server"
-msgstr "NFS с_ервери"
-
-#: ../bin/draknfs:75 ../bin/draksambashare:183
-#, c-format
-msgid "_Restart"
-msgstr "Қай_тадан ишга тушириш"
-
-#: ../bin/draknfs:76 ../bin/draksambashare:184
-#, c-format
-msgid "R_eload"
-msgstr "Қайтадан ю_клаш"
-
-#: ../bin/draknfs:95
+#: ../bin/draknfs:81
 #, c-format
 msgid "NFS server"
 msgstr "NFS сервери"
 
-#: ../bin/draknfs:95
+#: ../bin/draknfs:81
 #, c-format
 msgid "Restarting/Reloading NFS server..."
 msgstr "NFS сервери қайтадан ишга туширилмоқда..."
 
-#: ../bin/draknfs:96
+#: ../bin/draknfs:82
 #, c-format
 msgid "Error Restarting/Reloading NFS server"
 msgstr ""
 
-#: ../bin/draknfs:112 ../bin/draksambashare:248
+#: ../bin/draknfs:98 ../bin/draksambashare:226
 #, fuzzy, c-format
 msgid "Directory selection"
 msgstr "Директорияни танлаш"
 
-#: ../bin/draknfs:120 ../bin/draksambashare:256
+#: ../bin/draknfs:106 ../bin/draksambashare:234
 #, c-format
 msgid "Should be a directory."
 msgstr ""
 
-#: ../bin/draknfs:150
+#: ../bin/draknfs:136
 #, c-format
 msgid ""
 "<span weight=\"bold\">NFS clients</span> may be specified in a number of "
@@ -1100,7 +926,7 @@ msgid ""
 "result.\n"
 msgstr ""
 
-#: ../bin/draknfs:165
+#: ../bin/draknfs:151
 #, c-format
 msgid ""
 "<span weight=\"bold\">User ID options</span>\n"
@@ -1126,32 +952,32 @@ msgid ""
 "the uid and gid of the anonymous account.\n"
 msgstr ""
 
-#: ../bin/draknfs:181
+#: ../bin/draknfs:167
 #, c-format
 msgid "Synchronous access:"
 msgstr ""
 
-#: ../bin/draknfs:182
+#: ../bin/draknfs:168
 #, c-format
 msgid "Secured Connection:"
 msgstr ""
 
-#: ../bin/draknfs:183
+#: ../bin/draknfs:169
 #, c-format
 msgid "Read-Only share:"
 msgstr ""
 
-#: ../bin/draknfs:184
+#: ../bin/draknfs:170
 #, c-format
 msgid "Subtree checking:"
 msgstr ""
 
-#: ../bin/draknfs:186
+#: ../bin/draknfs:172
 #, c-format
 msgid "Advanced Options"
 msgstr "Қўшимча мосламалар"
 
-#: ../bin/draknfs:187
+#: ../bin/draknfs:173
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> this option requires that requests "
@@ -1159,7 +985,7 @@ msgid ""
 "is on by default."
 msgstr ""
 
-#: ../bin/draknfs:188
+#: ../bin/draknfs:174
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> allow either only read or both "
@@ -1168,7 +994,7 @@ msgid ""
 "using this option."
 msgstr ""
 
-#: ../bin/draknfs:189
+#: ../bin/draknfs:175
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> disallows the NFS server to "
@@ -1176,7 +1002,7 @@ msgid ""
 "these requests have been committed to stable storage (e.g. disc drive)."
 msgstr ""
 
-#: ../bin/draknfs:190
+#: ../bin/draknfs:176
 #, c-format
 msgid ""
 "<span foreground=\"royalblue3\">%s</span> enable subtree checking which can "
@@ -1184,708 +1010,713 @@ msgid ""
 "exports(5) man page for more details."
 msgstr ""
 
-#: ../bin/draknfs:195 ../bin/draksambashare:626 ../bin/draksambashare:792
+#: ../bin/draknfs:181 ../bin/draksambashare:604 ../bin/draksambashare:770
 #, c-format
 msgid "Information"
 msgstr "Маълумот"
 
-#: ../bin/draknfs:275
+#: ../bin/draknfs:182 ../bin/net_applet:214
+#: ../lib/network/drakconnect/edit.pm:72
+#, c-format
+msgid "Help"
+msgstr "Ёрдам"
+
+#: ../bin/draknfs:260
 #, c-format
 msgid "Directory"
 msgstr "Директория"
 
-#: ../bin/draknfs:286
+#: ../bin/draknfs:271
 #, c-format
 msgid "Please add an NFS share to be able to modify it."
 msgstr ""
 
-#: ../bin/draknfs:383
+#: ../bin/draknfs:368
 #, c-format
 msgid "NFS directory"
 msgstr "NFS директория"
 
-#: ../bin/draknfs:384 ../bin/draksambashare:385 ../bin/draksambashare:591
-#: ../bin/draksambashare:769
+#: ../bin/draknfs:369 ../bin/draksambashare:363 ../bin/draksambashare:569
+#: ../bin/draksambashare:747
 #, c-format
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../bin/draknfs:385
+#: ../bin/draknfs:370
 #, c-format
 msgid "Host access"
 msgstr ""
 
-#: ../bin/draknfs:386
+#: ../bin/draknfs:371
 #, c-format
 msgid "Access:"
 msgstr "Мурожаат:"
 
-#: ../bin/draknfs:387
+#: ../bin/draknfs:372
 #, c-format
 msgid "User ID Mapping"
 msgstr ""
 
-#: ../bin/draknfs:388
+#: ../bin/draknfs:373
 #, c-format
 msgid "User ID:"
 msgstr "Фойдаланувчи ID:"
 
-#: ../bin/draknfs:389
+#: ../bin/draknfs:374
 #, c-format
 msgid "Anonymous user ID:"
 msgstr ""
 
-#: ../bin/draknfs:390
+#: ../bin/draknfs:375
 #, c-format
 msgid "Anonymous Group ID:"
 msgstr ""
 
-#: ../bin/draknfs:433
+#: ../bin/draknfs:418
 #, c-format
 msgid "Please specify a directory to share."
 msgstr "Илтимос бўлишиш учун жилдни кўрсатинг."
 
-#: ../bin/draknfs:435
+#: ../bin/draknfs:420
 #, c-format
 msgid "Can't create this directory."
 msgstr ""
 
-#: ../bin/draknfs:438
+#: ../bin/draknfs:423
 #, c-format
 msgid "You must specify hosts access."
 msgstr ""
 
-#: ../bin/draknfs:478
+#: ../bin/draknfs:463
 #, fuzzy, c-format
 msgid "Remove entry?"
 msgstr "Олиб ташлаш"
 
-#: ../bin/draknfs:478
+#: ../bin/draknfs:463
 #, fuzzy, c-format
 msgid "Remove %s"
 msgstr "Олиб ташлаш"
 
-#: ../bin/draknfs:518
+#: ../bin/draknfs:503
 #, c-format
 msgid "Share Directory"
 msgstr "Директорияни бўлишиш"
 
-#: ../bin/draknfs:518
+#: ../bin/draknfs:503
 #, c-format
 msgid "Hosts Wildcard"
 msgstr ""
 
-#: ../bin/draknfs:518
+#: ../bin/draknfs:503
 #, c-format
 msgid "General Options"
 msgstr "Умумий мосламалар"
 
-#: ../bin/draknfs:518
+#: ../bin/draknfs:503
 #, c-format
 msgid "Custom Options"
 msgstr ""
 
-#: ../bin/draknfs:530 ../bin/draksambashare:400 ../bin/draksambashare:628
-#: ../bin/draksambashare:794
+#: ../bin/draknfs:515 ../bin/draksambashare:378 ../bin/draksambashare:606
+#: ../bin/draksambashare:772
 #, c-format
 msgid "Please enter a directory to share."
 msgstr ""
 
-#: ../bin/draknfs:537
+#: ../bin/draknfs:522
 #, c-format
 msgid "Please use the modify button to set right access."
 msgstr ""
 
-#: ../bin/draknfs:552
+#: ../bin/draknfs:537
 #, c-format
 msgid "Manage NFS shares"
 msgstr "NFS орқали бўлишилган файлларни мослаш"
 
-#: ../bin/draknfs:588
+#: ../bin/draknfs:562 ../bin/draksambashare:1339
+#, c-format
+msgid "_File"
+msgstr "_Файл"
+
+#: ../bin/draknfs:563 ../bin/draksambashare:1340
+#, c-format
+msgid "_Write conf"
+msgstr "_Мосламани ёзиш"
+
+#: ../bin/draknfs:564 ../bin/draksambashare:1341
+#, c-format
+msgid "_Quit"
+msgstr "_Чиқиш"
+
+#: ../bin/draknfs:564 ../bin/draksambashare:1341
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../bin/draknfs:565
+#, c-format
+msgid "_NFS Server"
+msgstr "NFS с_ервери"
+
+#: ../bin/draknfs:566 ../bin/draksambashare:1345
+#, c-format
+msgid "_Restart"
+msgstr "Қай_тадан ишга тушириш"
+
+#: ../bin/draknfs:567 ../bin/draksambashare:1346
+#, c-format
+msgid "R_eload"
+msgstr "Қайтадан ю_клаш"
+
+#: ../bin/draknfs:595
 #, fuzzy, c-format
 msgid "Starting the NFS-server"
 msgstr "NFS сервери қайтадан ишга туширилмоқда..."
 
-#: ../bin/draknfs:600
+#: ../bin/draknfs:607
 #, c-format
 msgid "DrakNFS manage NFS shares"
 msgstr ""
 
-#: ../bin/draknfs:609
+#: ../bin/draknfs:616
 #, c-format
 msgid "Failed to add NFS share."
 msgstr ""
 
-#: ../bin/draknfs:616
+#: ../bin/draknfs:623
 #, c-format
 msgid "Failed to Modify NFS share."
 msgstr ""
 
-#: ../bin/draknfs:623
+#: ../bin/draknfs:630
 #, c-format
 msgid "Failed to remove an NFS share."
 msgstr ""
 
-#: ../bin/draksambashare:67
+#: ../bin/draksambashare:66
 #, c-format
 msgid "User name"
 msgstr "Фойдаланувчи"
 
-#: ../bin/draksambashare:74 ../bin/draksambashare:102
+#: ../bin/draksambashare:73 ../bin/draksambashare:101
 #, c-format
 msgid "Share name"
 msgstr ""
 
-#: ../bin/draksambashare:75 ../bin/draksambashare:103
+#: ../bin/draksambashare:74 ../bin/draksambashare:102
 #, c-format
 msgid "Share directory"
 msgstr "Жилдни бўлишиш"
 
-#: ../bin/draksambashare:76 ../bin/draksambashare:104
-#: ../bin/draksambashare:121
+#: ../bin/draksambashare:75 ../bin/draksambashare:103
+#: ../bin/draksambashare:120
 #, c-format
 msgid "Comment"
 msgstr "Изоҳ"
 
-#: ../bin/draksambashare:77 ../bin/draksambashare:122
+#: ../bin/draksambashare:76 ../bin/draksambashare:121
 #, c-format
 msgid "Browseable"
 msgstr ""
 
-#: ../bin/draksambashare:78
+#: ../bin/draksambashare:77
 #, c-format
 msgid "Public"
 msgstr "Оммавий"
 
-#: ../bin/draksambashare:79 ../bin/draksambashare:127
+#: ../bin/draksambashare:78 ../bin/draksambashare:126
 #, c-format
 msgid "Writable"
 msgstr "Ёзиб бўладиган"
 
-#: ../bin/draksambashare:80 ../bin/draksambashare:168
+#: ../bin/draksambashare:79 ../bin/draksambashare:167
 #, c-format
 msgid "Create mask"
 msgstr ""
 
-#: ../bin/draksambashare:81 ../bin/draksambashare:169
+#: ../bin/draksambashare:80 ../bin/draksambashare:168
 #, c-format
 msgid "Directory mask"
 msgstr ""
 
-#: ../bin/draksambashare:82
+#: ../bin/draksambashare:81
 #, c-format
 msgid "Read list"
 msgstr "Ўқиш рўйхати"
 
-#: ../bin/draksambashare:83 ../bin/draksambashare:128
-#: ../bin/draksambashare:605
+#: ../bin/draksambashare:82 ../bin/draksambashare:127
+#: ../bin/draksambashare:583
 #, c-format
 msgid "Write list"
 msgstr "Ёзиш рўйхати"
 
-#: ../bin/draksambashare:84 ../bin/draksambashare:160
+#: ../bin/draksambashare:83 ../bin/draksambashare:159
 #, c-format
 msgid "Admin users"
 msgstr "Бошқарувчи фойдаланувчилар"
 
-#: ../bin/draksambashare:85 ../bin/draksambashare:161
+#: ../bin/draksambashare:84 ../bin/draksambashare:160
 #, c-format
 msgid "Valid users"
 msgstr ""
 
-#: ../bin/draksambashare:86
+#: ../bin/draksambashare:85
 #, c-format
 msgid "Inherit Permissions"
 msgstr ""
 
-#: ../bin/draksambashare:87 ../bin/draksambashare:162
+#: ../bin/draksambashare:86 ../bin/draksambashare:161
 #, c-format
 msgid "Hide dot files"
 msgstr "Нуқта билан бошланган файлларни бекитиш"
 
-#: ../bin/draksambashare:88 ../bin/draksambashare:163
+#: ../bin/draksambashare:87 ../bin/draksambashare:162
 #, c-format
 msgid "Hide files"
 msgstr "Файлларни яшириш"
 
-#: ../bin/draksambashare:89 ../bin/draksambashare:167
+#: ../bin/draksambashare:88 ../bin/draksambashare:166
 #, c-format
 msgid "Preserve case"
 msgstr ""
 
-#: ../bin/draksambashare:90
+#: ../bin/draksambashare:89
 #, c-format
 msgid "Force create mode"
 msgstr ""
 
-#: ../bin/draksambashare:91
+#: ../bin/draksambashare:90
 #, c-format
 msgid "Force group"
 msgstr ""
 
-#: ../bin/draksambashare:92 ../bin/draksambashare:166
+#: ../bin/draksambashare:91 ../bin/draksambashare:165
 #, c-format
 msgid "Default case"
 msgstr ""
 
-#: ../bin/draksambashare:119
+#: ../bin/draksambashare:118
 #, c-format
 msgid "Printer name"
 msgstr "Принтернинг номи"
 
-#: ../bin/draksambashare:120
+#: ../bin/draksambashare:119
 #, c-format
 msgid "Path"
 msgstr "Йўл"
 
-#: ../bin/draksambashare:123 ../bin/draksambashare:597
+#: ../bin/draksambashare:122 ../bin/draksambashare:575
 #, c-format
 msgid "Printable"
 msgstr ""
 
-#: ../bin/draksambashare:124
+#: ../bin/draksambashare:123
 #, c-format
 msgid "Print Command"
 msgstr "Босиб чиқариш буйруғи"
 
-#: ../bin/draksambashare:125
+#: ../bin/draksambashare:124
 #, c-format
 msgid "LPQ command"
 msgstr "LPQ буйруғи"
 
-#: ../bin/draksambashare:126
+#: ../bin/draksambashare:125
 #, c-format
 msgid "Guest ok"
 msgstr ""
 
-#: ../bin/draksambashare:129 ../bin/draksambashare:170
-#: ../bin/draksambashare:606
+#: ../bin/draksambashare:128 ../bin/draksambashare:169
+#: ../bin/draksambashare:584
 #, c-format
 msgid "Inherit permissions"
 msgstr ""
 
-#: ../bin/draksambashare:130
+#: ../bin/draksambashare:129
 #, c-format
 msgid "Printing"
 msgstr "Босиб чиқариш"
 
-#: ../bin/draksambashare:131
+#: ../bin/draksambashare:130
 #, c-format
 msgid "Create mode"
 msgstr ""
 
-#: ../bin/draksambashare:132
+#: ../bin/draksambashare:131
 #, c-format
 msgid "Use client driver"
 msgstr ""
 
-#: ../bin/draksambashare:158
+#: ../bin/draksambashare:157
 #, c-format
 msgid "Read List"
 msgstr ""
 
-#: ../bin/draksambashare:159
+#: ../bin/draksambashare:158
 #, c-format
 msgid "Write List"
 msgstr "Ёзиш рўйхати"
 
-#: ../bin/draksambashare:164
+#: ../bin/draksambashare:163
 #, c-format
 msgid "Force Group"
 msgstr ""
 
-#: ../bin/draksambashare:165
+#: ../bin/draksambashare:164
 #, c-format
 msgid "Force create group"
 msgstr ""
 
-#: ../bin/draksambashare:181 ../bin/draksambashare:182
-#: ../bin/draksambashare:183 ../bin/draksambashare:184
-#, c-format
-msgid "_Samba Server"
-msgstr "_Samba сервери"
-
 #: ../bin/draksambashare:182
 #, c-format
-msgid "_Configure"
-msgstr "_Мослаш"
-
-#: ../bin/draksambashare:186
-#, c-format
-msgid "_Help"
-msgstr "_Ёрдам"
-
-#: ../bin/draksambashare:186
-#, c-format
-msgid "_Samba Documentation"
-msgstr ""
-
-#: ../bin/draksambashare:192 ../bin/draksambashare:193
-#, c-format
-msgid "_About"
-msgstr "Ҳақ_ида"
-
-#: ../bin/draksambashare:192
-#, c-format
-msgid "_Report Bug"
-msgstr "_Хато ҳақида хабар қилиш"
-
-#: ../bin/draksambashare:193
-#, c-format
-msgid "_About..."
-msgstr "_Ҳақида"
-
-#: ../bin/draksambashare:196
-#, c-format
 msgid "Draksambashare"
 msgstr "Draksambashare"
 
-#: ../bin/draksambashare:198
+#: ../bin/draksambashare:184
 #, fuzzy, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mageia"
 
-#: ../bin/draksambashare:200
+#: ../bin/draksambashare:186
 #, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
 msgstr ""
 
-#: ../bin/draksambashare:202
+#: ../bin/draksambashare:188
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../bin/draksambashare:207
+#: ../bin/draksambashare:192
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Машраб Қуватов <kmashrab@uni-bremen.de>\n"
 
-#: ../bin/draksambashare:231
+#: ../bin/draksambashare:209
 #, c-format
 msgid "Restarting/Reloading Samba server..."
 msgstr ""
 
-#: ../bin/draksambashare:232
+#: ../bin/draksambashare:210
 #, c-format
 msgid "Error Restarting/Reloading Samba server"
 msgstr ""
 
-#: ../bin/draksambashare:373 ../bin/draksambashare:570
-#: ../bin/draksambashare:690
+#: ../bin/draksambashare:351 ../bin/draksambashare:548
+#: ../bin/draksambashare:672
 #, c-format
 msgid "Open"
 msgstr "Очиш"
 
-#: ../bin/draksambashare:376
+#: ../bin/draksambashare:354
 #, c-format
 msgid "DrakSamba add entry"
 msgstr ""
 
-#: ../bin/draksambashare:380
+#: ../bin/draksambashare:358
 #, c-format
 msgid "Add a share"
 msgstr ""
 
-#: ../bin/draksambashare:383
+#: ../bin/draksambashare:361
 #, c-format
 msgid "Name of the share:"
 msgstr ""
 
-#: ../bin/draksambashare:384 ../bin/draksambashare:590
-#: ../bin/draksambashare:770
+#: ../bin/draksambashare:362 ../bin/draksambashare:568
+#: ../bin/draksambashare:748
 #, c-format
 msgid "Comment:"
 msgstr "Изоҳ:"
 
-#: ../bin/draksambashare:396
+#: ../bin/draksambashare:374
 #, c-format
 msgid ""
 "Share with the same name already exist or share name empty, please choose "
 "another name."
 msgstr ""
 
-#: ../bin/draksambashare:403
+#: ../bin/draksambashare:381
 #, c-format
 msgid "Can't create the directory, please enter a correct path."
 msgstr ""
 
-#: ../bin/draksambashare:406 ../bin/draksambashare:626
-#: ../bin/draksambashare:792
+#: ../bin/draksambashare:384 ../bin/draksambashare:604
+#: ../bin/draksambashare:770
 #, c-format
 msgid "Please enter a Comment for this share."
 msgstr ""
 
-#: ../bin/draksambashare:443
+#: ../bin/draksambashare:421
 #, c-format
 msgid "pdf-gen - a PDF generator"
 msgstr ""
 
-#: ../bin/draksambashare:444
+#: ../bin/draksambashare:422
 #, c-format
 msgid "printers - all printers available"
 msgstr ""
 
-#: ../bin/draksambashare:448
+#: ../bin/draksambashare:426
 #, c-format
 msgid "Add Special Printer share"
 msgstr ""
 
-#: ../bin/draksambashare:451
+#: ../bin/draksambashare:429
 #, c-format
 msgid ""
 "Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
 
-#: ../bin/draksambashare:458
+#: ../bin/draksambashare:436
 #, c-format
 msgid "A PDF generator already exists."
 msgstr ""
 
-#: ../bin/draksambashare:482
+#: ../bin/draksambashare:460
 #, c-format
 msgid "Printers and print$ already exist."
 msgstr ""
 
-#: ../bin/draksambashare:532 ../bin/draksambashare:1206
+#: ../bin/draksambashare:510 ../bin/draksambashare:1184
 #, c-format
 msgid "Congratulations"
 msgstr "Табриклаймиз"
 
-#: ../bin/draksambashare:533
+#: ../bin/draksambashare:511
 #, c-format
 msgid "The wizard successfully added the printer Samba share"
 msgstr ""
 
-#: ../bin/draksambashare:555
+#: ../bin/draksambashare:533
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
 msgstr ""
 
-#: ../bin/draksambashare:573
+#: ../bin/draksambashare:551
 #, c-format
 msgid "DrakSamba Printers entry"
 msgstr ""
 
-#: ../bin/draksambashare:586
+#: ../bin/draksambashare:564
 #, c-format
 msgid "Printer share"
 msgstr ""
 
-#: ../bin/draksambashare:589
+#: ../bin/draksambashare:567
 #, c-format
 msgid "Printer name:"
 msgstr "Принтернинг номи:"
 
-#: ../bin/draksambashare:595 ../bin/draksambashare:775
+#: ../bin/draksambashare:573 ../bin/draksambashare:753
 #, c-format
 msgid "Writable:"
 msgstr ""
 
-#: ../bin/draksambashare:596 ../bin/draksambashare:776
+#: ../bin/draksambashare:574 ../bin/draksambashare:754
 #, c-format
 msgid "Browseable:"
 msgstr ""
 
-#: ../bin/draksambashare:601 ../bin/draksambashare:780
+#: ../bin/draksambashare:579 ../bin/draksambashare:758
 #, c-format
 msgid "Advanced options"
 msgstr "Қўшимча мосламалар"
 
-#: ../bin/draksambashare:603
+#: ../bin/draksambashare:581
 #, c-format
 msgid "Printer access"
 msgstr ""
 
-#: ../bin/draksambashare:607
+#: ../bin/draksambashare:585
 #, c-format
 msgid "Guest ok:"
 msgstr ""
 
-#: ../bin/draksambashare:608
+#: ../bin/draksambashare:586
 #, c-format
 msgid "Create mode:"
 msgstr ""
 
-#: ../bin/draksambashare:612
+#: ../bin/draksambashare:590
 #, c-format
 msgid "Printer command"
 msgstr ""
 
-#: ../bin/draksambashare:614
+#: ../bin/draksambashare:592
 #, c-format
 msgid "Print command:"
 msgstr "Босиб чиқариш буйруғи:"
 
-#: ../bin/draksambashare:615
+#: ../bin/draksambashare:593
 #, c-format
 msgid "LPQ command:"
 msgstr "LPQ буйруғи:"
 
-#: ../bin/draksambashare:616
+#: ../bin/draksambashare:594
 #, c-format
 msgid "Printing:"
 msgstr "Босиб чиқариш:"
 
-#: ../bin/draksambashare:632
+#: ../bin/draksambashare:610
 #, c-format
 msgid "create mode should be numeric. ie: 0755."
 msgstr ""
 
-#: ../bin/draksambashare:693
+#: ../bin/draksambashare:659 ../bin/draksambashare:680
 #, c-format
-msgid "DrakSamba entry"
+msgid "Please add or select a Samba share to be able to modify it."
 msgstr ""
 
-#: ../bin/draksambashare:698
+#: ../bin/draksambashare:675
 #, c-format
-msgid "Please add or select a Samba share to be able to modify it."
+msgid "DrakSamba entry"
 msgstr ""
 
-#: ../bin/draksambashare:719
+#: ../bin/draksambashare:697
 #, c-format
 msgid "User options (user access, mask option, force mode)"
 msgstr ""
 
-#: ../bin/draksambashare:721
+#: ../bin/draksambashare:699
 #, c-format
 msgid "Samba user access"
 msgstr ""
 
-#: ../bin/draksambashare:729
+#: ../bin/draksambashare:707
 #, c-format
 msgid "Mask options"
 msgstr ""
 
-#: ../bin/draksambashare:741
+#: ../bin/draksambashare:719
 #, c-format
 msgid "File options (hide files, case)"
 msgstr ""
 
-#: ../bin/draksambashare:743
+#: ../bin/draksambashare:721
 #, c-format
 msgid "Display options"
 msgstr ""
 
-#: ../bin/draksambashare:765
+#: ../bin/draksambashare:743
 #, c-format
 msgid "Samba share directory"
 msgstr ""
 
-#: ../bin/draksambashare:768
+#: ../bin/draksambashare:746
 #, c-format
 msgid "Share name:"
 msgstr ""
 
-#: ../bin/draksambashare:774
+#: ../bin/draksambashare:752
 #, c-format
 msgid "Public:"
 msgstr ""
 
-#: ../bin/draksambashare:798
+#: ../bin/draksambashare:776
 #, c-format
 msgid ""
 "Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
 
-#: ../bin/draksambashare:806
+#: ../bin/draksambashare:784
 #, c-format
 msgid "Please create this Samba user: %s"
 msgstr ""
 
-#: ../bin/draksambashare:918
+#: ../bin/draksambashare:896
 #, c-format
 msgid "Add Samba user"
 msgstr "Samba фойдаланувчини қўшиш"
 
-#: ../bin/draksambashare:933
+#: ../bin/draksambashare:911
 #, c-format
 msgid "User information"
 msgstr "Фойдаланувчи ҳақида маълумот"
 
-#: ../bin/draksambashare:935
+#: ../bin/draksambashare:913
 #, c-format
 msgid "User name:"
 msgstr "Фойдаланувчи:"
 
-#: ../bin/draksambashare:936
+#: ../bin/draksambashare:914
 #, c-format
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../bin/draksambashare:1050
+#: ../bin/draksambashare:1028
 #, c-format
 msgid "PDC - primary domain controller"
 msgstr ""
 
-#: ../bin/draksambashare:1051
+#: ../bin/draksambashare:1029
 #, c-format
 msgid "Standalone - standalone server"
 msgstr ""
 
-#: ../bin/draksambashare:1058
+#: ../bin/draksambashare:1036
 #, c-format
 msgid "Samba Wizard"
 msgstr "Samba ёрдамчиси"
 
-#: ../bin/draksambashare:1061
+#: ../bin/draksambashare:1039
 #, c-format
 msgid "Samba server configuration Wizard"
 msgstr "Samba серверини мослаш ёрдамчиси"
 
-#: ../bin/draksambashare:1061
+#: ../bin/draksambashare:1039
 #, c-format
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../bin/draksambashare:1077
+#: ../bin/draksambashare:1055
 #, c-format
 msgid "PDC server: primary domain controller"
 msgstr ""
 
-#: ../bin/draksambashare:1077
+#: ../bin/draksambashare:1055
 #, c-format
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
 msgstr ""
 
-#: ../bin/draksambashare:1077
+#: ../bin/draksambashare:1055
 #, c-format
 msgid ""
 "Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 
-#: ../bin/draksambashare:1077
+#: ../bin/draksambashare:1055
 #, c-format
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
 "name>. This name will be recognized by other servers."
 msgstr ""
 
-#: ../bin/draksambashare:1094
+#: ../bin/draksambashare:1072
 #, c-format
 msgid "Wins support:"
 msgstr ""
 
-#: ../bin/draksambashare:1095
+#: ../bin/draksambashare:1073
 #, c-format
 msgid "admin users:"
 msgstr "Бошқарувчи фойдаланувчилар:"
 
-#: ../bin/draksambashare:1095
+#: ../bin/draksambashare:1073
 #, c-format
 msgid "root @adm"
 msgstr ""
 
-#: ../bin/draksambashare:1096
+#: ../bin/draksambashare:1074
 #, c-format
 msgid "Os level:"
 msgstr ""
 
-#: ../bin/draksambashare:1096
+#: ../bin/draksambashare:1074
 #, c-format
 msgid ""
 "The global os level option dictates the operating system level at which "
@@ -1895,54 +1726,54 @@ msgid ""
 "ie: os level = 34"
 msgstr ""
 
-#: ../bin/draksambashare:1100
+#: ../bin/draksambashare:1078
 #, c-format
 msgid "The domain is wrong."
 msgstr ""
 
-#: ../bin/draksambashare:1107
+#: ../bin/draksambashare:1085
 #, c-format
 msgid "Workgroup"
 msgstr ""
 
-#: ../bin/draksambashare:1107
+#: ../bin/draksambashare:1085
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../bin/draksambashare:1114 ../bin/draksambashare:1181
+#: ../bin/draksambashare:1092 ../bin/draksambashare:1159
 #, c-format
 msgid "Workgroup:"
 msgstr ""
 
-#: ../bin/draksambashare:1115
+#: ../bin/draksambashare:1093
 #, c-format
 msgid "Netbios name:"
 msgstr "Netbios номи:"
 
-#: ../bin/draksambashare:1119
+#: ../bin/draksambashare:1097
 #, c-format
 msgid "The Workgroup is wrong."
 msgstr ""
 
-#: ../bin/draksambashare:1126 ../bin/draksambashare:1136
+#: ../bin/draksambashare:1104 ../bin/draksambashare:1114
 #, c-format
 msgid "Security mode"
 msgstr "Хавфсизлик усули"
 
-#: ../bin/draksambashare:1126
+#: ../bin/draksambashare:1104
 #, c-format
 msgid ""
 "User level: the client sends a session setup request directly following "
 "protocol negotiation. This request provides a username and password."
 msgstr ""
 
-#: ../bin/draksambashare:1126
+#: ../bin/draksambashare:1104
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
 msgstr ""
 
-#: ../bin/draksambashare:1126
+#: ../bin/draksambashare:1104
 #, c-format
 msgid ""
 "Domain level: provides a mechanism for storing all user and group accounts "
@@ -1950,241 +1781,271 @@ msgid ""
 "is shared between domain (security) controllers."
 msgstr ""
 
-#: ../bin/draksambashare:1137
+#: ../bin/draksambashare:1115
 #, fuzzy, c-format
 msgid "Hosts allow"
 msgstr "Компьютернинг номи"
 
-#: ../bin/draksambashare:1142
+#: ../bin/draksambashare:1120
 #, c-format
 msgid "Server Banner."
 msgstr ""
 
-#: ../bin/draksambashare:1142
+#: ../bin/draksambashare:1120
 #, c-format
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../bin/draksambashare:1147
+#: ../bin/draksambashare:1125
 #, c-format
 msgid "Banner:"
 msgstr ""
 
-#: ../bin/draksambashare:1151
+#: ../bin/draksambashare:1129
 #, c-format
 msgid "The Server Banner is incorrect."
 msgstr ""
 
-#: ../bin/draksambashare:1158
+#: ../bin/draksambashare:1136
 #, fuzzy, c-format
 msgid "Samba Log"
 msgstr "Samba фойдаланувчилари"
 
-#: ../bin/draksambashare:1158
+#: ../bin/draksambashare:1136
 #, c-format
 msgid ""
 "Log file: use %s to use a separate log file for each machine that connects"
 msgstr ""
 
-#: ../bin/draksambashare:1158
+#: ../bin/draksambashare:1136
 #, c-format
 msgid "file.%m"
 msgstr ""
 
-#: ../bin/draksambashare:1158
+#: ../bin/draksambashare:1136
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr ""
 
-#: ../bin/draksambashare:1158
+#: ../bin/draksambashare:1136
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
 msgstr ""
 
-#: ../bin/draksambashare:1165 ../bin/draksambashare:1183
+#: ../bin/draksambashare:1143 ../bin/draksambashare:1161
 #, c-format
 msgid "Log file:"
 msgstr "Лог файли:"
 
-#: ../bin/draksambashare:1166
+#: ../bin/draksambashare:1144
 #, c-format
 msgid "Max log size:"
 msgstr ""
 
-#: ../bin/draksambashare:1167
+#: ../bin/draksambashare:1145
 #, c-format
 msgid "Log level:"
 msgstr "Лог даражаси:"
 
-#: ../bin/draksambashare:1172
+#: ../bin/draksambashare:1150
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
-#: ../bin/draksambashare:1172
+#: ../bin/draksambashare:1150
 #, c-format
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
 
-#: ../bin/draksambashare:1172
+#: ../bin/draksambashare:1150
 #, c-format
 msgid ""
 "If you have previously create some shares, they will appear in this "
 "configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
 
-#: ../bin/draksambashare:1180
+#: ../bin/draksambashare:1158
 #, c-format
 msgid "Samba type:"
 msgstr "Samba тури:"
 
-#: ../bin/draksambashare:1182
+#: ../bin/draksambashare:1160
 #, c-format
 msgid "Server banner:"
 msgstr ""
 
-#: ../bin/draksambashare:1184
+#: ../bin/draksambashare:1162
 #, c-format
 msgid " "
 msgstr ""
 
-#: ../bin/draksambashare:1185
+#: ../bin/draksambashare:1163
 #, c-format
 msgid "Unix Charset:"
 msgstr ""
 
-#: ../bin/draksambashare:1186
+#: ../bin/draksambashare:1164
 #, c-format
 msgid "Dos Charset:"
 msgstr ""
 
-#: ../bin/draksambashare:1187
+#: ../bin/draksambashare:1165
 #, c-format
 msgid "Display Charset:"
 msgstr ""
 
-#: ../bin/draksambashare:1206
+#: ../bin/draksambashare:1184
 #, c-format
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../bin/draksambashare:1278
+#: ../bin/draksambashare:1256
 #, c-format
 msgid "The Samba wizard has unexpectedly failed:"
 msgstr ""
 
-#: ../bin/draksambashare:1292
+#: ../bin/draksambashare:1270
 #, c-format
 msgid "Manage Samba configuration"
 msgstr "Samba серверини ўрнатиш ва мослаш"
 
-#: ../bin/draksambashare:1380
+#: ../bin/draksambashare:1343
+#, c-format
+msgid "_Samba Server"
+msgstr "_Samba сервери"
+
+#: ../bin/draksambashare:1344
+#, c-format
+msgid "_Configure"
+msgstr "_Мослаш"
+
+#: ../bin/draksambashare:1348
+#, c-format
+msgid "_Help"
+msgstr "_Ёрдам"
+
+#: ../bin/draksambashare:1349
+#, c-format
+msgid "_Samba Documentation"
+msgstr ""
+
+#: ../bin/draksambashare:1353
+#, c-format
+msgid "_Report Bug"
+msgstr "_Хато ҳақида хабар қилиш"
+
+#: ../bin/draksambashare:1354
+#, c-format
+msgid "_About..."
+msgstr "_Ҳақида"
+
+#: ../bin/draksambashare:1393
 #, c-format
 msgid "Failed to Modify Samba share."
 msgstr ""
 
-#: ../bin/draksambashare:1389
+#: ../bin/draksambashare:1402
 #, c-format
 msgid "Failed to remove a Samba share."
 msgstr ""
 
-#: ../bin/draksambashare:1396
+#: ../bin/draksambashare:1409
 #, c-format
 msgid "File share"
 msgstr ""
 
-#: ../bin/draksambashare:1411
+#: ../bin/draksambashare:1424
 #, c-format
 msgid "Failed to Modify."
 msgstr ""
 
-#: ../bin/draksambashare:1420
+#: ../bin/draksambashare:1433
 #, c-format
 msgid "Failed to remove."
 msgstr ""
 
-#: ../bin/draksambashare:1427
+#: ../bin/draksambashare:1440
 #, c-format
 msgid "Printers"
 msgstr "Принтерлар"
 
-#: ../bin/draksambashare:1439
+#: ../bin/draksambashare:1452
 #, c-format
 msgid "Failed to add user."
 msgstr ""
 
-#: ../bin/draksambashare:1448
+#: ../bin/draksambashare:1461
 #, c-format
 msgid "Failed to change user password."
 msgstr ""
 
-#: ../bin/draksambashare:1460
+#: ../bin/draksambashare:1473
 #, c-format
 msgid "Failed to delete user."
 msgstr ""
 
-#: ../bin/draksambashare:1465
+#: ../bin/draksambashare:1478
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../bin/draksambashare:1473
+#: ../bin/draksambashare:1486
 #, c-format
 msgid "Samba Users"
 msgstr "Samba фойдаланувчилари"
 
-#: ../bin/draksambashare:1481
+#: ../bin/draksambashare:1494
 #, c-format
 msgid "Please configure your Samba server"
 msgstr ""
 
-#: ../bin/draksambashare:1481
+#: ../bin/draksambashare:1494
 #, c-format
 msgid ""
 "It seems this is the first time you run this tool.\n"
 "A wizard will appear to configure a basic Samba server"
 msgstr ""
 
-#: ../bin/draksambashare:1490
+#: ../bin/draksambashare:1503
 #, c-format
 msgid "DrakSamba manage Samba shares"
 msgstr ""
 
-#: ../bin/net_applet:92 ../bin/net_applet~:92
+#: ../bin/net_applet:93
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "Алоқа ишга тушган: %s"
 
-#: ../bin/net_applet:93 ../bin/net_applet~:93
+#: ../bin/net_applet:94
 #, c-format
 msgid "IP address: %s"
 msgstr "IP рақами: %s"
 
-#: ../bin/net_applet:94 ../bin/net_applet~:94
+#: ../bin/net_applet:95
 #, c-format
 msgid "Gateway: %s"
 msgstr "Гейтвэй: %s"
 
-#: ../bin/net_applet:95 ../bin/net_applet~:95
+#: ../bin/net_applet:96
 #, fuzzy, c-format
 msgid "DNS: %s"
 msgstr "DNS"
 
-#: ../bin/net_applet:96 ../bin/net_applet~:96
+#: ../bin/net_applet:97
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "Уланган: %s (алоқа даражаси: %d %%)"
 
-#: ../bin/net_applet:98 ../bin/net_applet~:98
+#: ../bin/net_applet:99
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "Алоқа ишга тушмаган: %s"
 
-#: ../bin/net_applet:100 ../bin/net_applet~:100
+#: ../bin/net_applet:101
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -2193,263 +2054,103 @@ msgstr ""
 "Интернет билан алоқа мосланмаган.\n"
 "Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
 
-#: ../bin/net_applet:103 ../bin/net_applet~:103
-#: ../lib/network/connection_manager.pm:190
+#: ../bin/net_applet:102 ../lib/network/drakconnect/global.pm:37
+#, c-format
+msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
+msgstr "Янги тармоқ интерфейсини ўрнатиш ва мослаш (LAN, ISDN, ADSL, ...)"
+
+#: ../bin/net_applet:104 ../lib/network/connection_manager.pm:190
 #, c-format
 msgid "Connecting..."
 msgstr "Алоқа ўрнатилмоқда..."
 
-#: ../bin/net_applet:129 ../bin/net_applet~:129 ../bin/net_monitor:519
+#: ../bin/net_applet:130
 #, c-format
 msgid "Connect %s"
 msgstr "Улаш: %s"
 
-#: ../bin/net_applet:133 ../bin/net_applet~:133 ../bin/net_monitor:519
+#: ../bin/net_applet:134
 #, c-format
 msgid "Disconnect %s"
 msgstr "Узиш: %s"
 
-#: ../bin/net_applet:137 ../bin/net_applet~:137
+#: ../bin/net_applet:138
 #, c-format
 msgid "Monitor Network"
 msgstr "Тармоқни назорат қилиш"
 
-#: ../bin/net_applet:145 ../bin/net_applet~:145
+#: ../bin/net_applet:146
 #, c-format
 msgid "Manage wireless networks"
 msgstr "Симсиз алоқаларни бошқариш"
 
-#: ../bin/net_applet:149 ../bin/net_applet~:149
+#: ../bin/net_applet:150
 #, c-format
 msgid "Manage VPN connections"
 msgstr "VPN алоқаларни бошқариш"
 
-#: ../bin/net_applet:153 ../bin/net_applet~:153
+#: ../bin/net_applet:154
 #, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
-#: ../bin/net_applet:157 ../bin/net_applet~:157
+#: ../bin/net_applet:158
 #, c-format
 msgid "Watched interface"
 msgstr "Назорат остидаги интерфейс"
 
-#: ../bin/net_applet:158 ../bin/net_applet:161 ../bin/net_applet:164
-#: ../bin/net_applet~:158 ../bin/net_applet~:161 ../bin/net_applet~:164
+#: ../bin/net_applet:159 ../bin/net_applet:162 ../bin/net_applet:165
 #, c-format
 msgid "Auto-detect"
 msgstr "Авто-аниқлаш"
 
-#: ../bin/net_applet:169 ../bin/net_applet~:169
+#: ../bin/net_applet:170
 #, c-format
 msgid "Active interfaces"
 msgstr "Актив интерфейслар"
 
-#: ../bin/net_applet:189 ../bin/net_applet~:189
+#: ../bin/net_applet:190
 #, c-format
 msgid "Profiles"
 msgstr "Профиллар"
 
-#: ../bin/net_applet:201 ../bin/net_applet~:201
-#: ../lib/network/connection.pm:236 ../lib/network/drakvpn.pm:65
-#: ../lib/network/vpn/openvpn.pm:368 ../lib/network/vpn/openvpn.pm:382
-#: ../lib/network/vpn/openvpn.pm:393
+#: ../bin/net_applet:200 ../lib/network/connection.pm:236
+#: ../lib/network/drakvpn.pm:65 ../lib/network/vpn/openvpn.pm:368
+#: ../lib/network/vpn/openvpn.pm:382 ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "VPN connection"
 msgstr "VPN орқали уланиш"
 
-#: ../bin/net_applet:355 ../bin/net_applet:560 ../bin/net_applet~:355
-#: ../bin/net_applet~:560
+#: ../bin/net_applet:357 ../bin/net_applet:562
 #, c-format
 msgid "Wireless networks"
 msgstr "Симсиз тармоқлар"
 
-#: ../bin/net_applet:436 ../bin/net_applet~:436
+#: ../bin/net_applet:438
 #, c-format
 msgid "Network connection"
 msgstr "Тармоқ алоқаси"
 
-#: ../bin/net_applet:523 ../bin/net_applet~:523
+#: ../bin/net_applet:525
 #, c-format
 msgid "More networks"
 msgstr ""
 
-#: ../bin/net_applet:550 ../bin/net_applet~:550
+#: ../bin/net_applet:552
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr ""
 
-#: ../bin/net_applet:555 ../bin/net_applet~:555
+#: ../bin/net_applet:557
 #, c-format
 msgid "Always launch on startup"
 msgstr "Тизимга кирганда ишга тушириш"
 
-#: ../bin/net_applet:567 ../bin/net_applet~:567 ../bin/net_monitor:96
+#: ../bin/net_applet:569
 #, c-format
 msgid "Settings"
 msgstr "Мосламалар"
 
-#: ../bin/net_monitor:60 ../bin/net_monitor:65
-#, c-format
-msgid "Network Monitoring"
-msgstr "Тармоқни назорат қилиш"
-
-#: ../bin/net_monitor:99
-#, fuzzy, c-format
-msgid "Default connection: "
-msgstr "Кабел орқали уланиш"
-
-#: ../bin/net_monitor:101
-#, c-format
-msgid "Wait please"
-msgstr "Илтимос кутиб туринг"
-
-#: ../bin/net_monitor:104
-#, c-format
-msgid "Global statistics"
-msgstr "Умумий статистика"
-
-#: ../bin/net_monitor:107
-#, c-format
-msgid "Instantaneous"
-msgstr ""
-
-#: ../bin/net_monitor:107
-#, c-format
-msgid "Average"
-msgstr "Ўртача"
-
-#: ../bin/net_monitor:108
-#, c-format
-msgid ""
-"Sending\n"
-"speed:"
-msgstr ""
-"Жўнатиш\n"
-"тезлиги:"
-
-#: ../bin/net_monitor:108 ../bin/net_monitor:109 ../bin/net_monitor:114
-#, c-format
-msgid "unknown"
-msgstr "номаълум"
-
-#: ../bin/net_monitor:109
-#, c-format
-msgid ""
-"Receiving\n"
-"speed:"
-msgstr ""
-"Қабул қилиш\n"
-"тезлиги:"
-
-#: ../bin/net_monitor:113
-#, fuzzy, c-format
-msgid "Connection time: "
-msgstr ""
-"Уланиш\n"
-"вақти: "
-
-#: ../bin/net_monitor:120
-#, c-format
-msgid "Use same scale for received and transmitted"
-msgstr ""
-
-#: ../bin/net_monitor:138
-#, c-format
-msgid "Wait please, testing your connection..."
-msgstr "Илтимос кутиб туринг, алоқа синаб кўрилмоқда..."
-
-#: ../bin/net_monitor:210 ../bin/net_monitor:223
-#, c-format
-msgid "Disconnecting from Internet "
-msgstr "Интернет билан алоқа узилмоқда"
-
-#: ../bin/net_monitor:210 ../bin/net_monitor:223
-#, c-format
-msgid "Connecting to Internet "
-msgstr "Интернетга уланилмоқда "
-
-#: ../bin/net_monitor:254
-#, c-format
-msgid "Disconnection from Internet failed."
-msgstr "Интернетдан узилиш муваффақиятсиз тугади."
-
-#: ../bin/net_monitor:255
-#, c-format
-msgid "Disconnection from Internet complete."
-msgstr "Интернетдан узилиш бажарилди."
-
-#: ../bin/net_monitor:257
-#, c-format
-msgid "Connection complete."
-msgstr "Алоқа ўрнатилди."
-
-#: ../bin/net_monitor:258
-#, fuzzy, c-format
-msgid ""
-"Connection failed.\n"
-"Verify your configuration in the Mageia Linux Control Center."
-msgstr ""
-"Алоқа ўрнатиш муваффақиятсиз тугади.\n"
-"Мосламани Mageia бошқарув марказида текширинг."
-
-#: ../bin/net_monitor:360
-#, fuzzy, c-format
-msgid "%s (%s)"
-msgstr "DNS"
-
-#: ../bin/net_monitor:385
-#, c-format
-msgid "Color configuration"
-msgstr "Рангни мослаш"
-
-#: ../bin/net_monitor:444 ../bin/net_monitor:457
-#, c-format
-msgid "sent: "
-msgstr "жўнатилган: "
-
-#: ../bin/net_monitor:447 ../bin/net_monitor:461
-#, c-format
-msgid "received: "
-msgstr "қабул қилинган: "
-
-#: ../bin/net_monitor:450
-#, c-format
-msgid "average"
-msgstr "ўртачаси"
-
-#: ../bin/net_monitor:451
-#, c-format
-msgid "Reset counters"
-msgstr ""
-
-#: ../bin/net_monitor:454
-#, c-format
-msgid "Local measure"
-msgstr "Локал кўрсатгич"
-
-#: ../bin/net_monitor:512
-#, c-format
-msgid ""
-"Warning, another internet connection has been detected, maybe using your "
-"network"
-msgstr ""
-
-#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:19
-#, c-format
-msgid "Connected"
-msgstr "Уланган"
-
-#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:19
-#, c-format
-msgid "Not connected"
-msgstr "Уланмаган"
-
-#: ../bin/net_monitor:523
-#, c-format
-msgid "No internet connection configured"
-msgstr "Интернетга уланиш мосланмаган"
-
 #: ../lib/network/connection.pm:17
 #, c-format
 msgid "Unknown connection type"
@@ -2485,79 +2186,100 @@ msgstr ""
 msgid "None"
 msgstr "Йўқ"
 
-#: ../lib/network/connection.pm:250
+#: ../lib/network/connection.pm:251 ../lib/network/modem.pm:43
+#: ../lib/network/modem.pm:44 ../lib/network/modem.pm:45
+#: ../lib/network/modem.pm:64 ../lib/network/modem.pm:77
+#: ../lib/network/modem.pm:82 ../lib/network/modem.pm:111
+#: ../lib/network/netconnect.pm:627 ../lib/network/netconnect.pm:632
+#: ../lib/network/netconnect.pm:644 ../lib/network/netconnect.pm:649
+#: ../lib/network/netconnect.pm:665 ../lib/network/netconnect.pm:667
+#, c-format
+msgid "Automatic"
+msgstr "Автоматик"
+
+#: ../lib/network/connection.pm:252
+#, fuzzy, c-format
+msgid "No"
+msgstr "Йўқ"
+
+#: ../lib/network/connection.pm:253
+#, c-format
+msgid "Yes"
+msgstr ""
+
+#: ../lib/network/connection.pm:257
 #, c-format
 msgid "Allow users to manage the connection"
 msgstr "Алоқани бошқариш учун фойдаланувчиларга рухсат бериш"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:258
 #, c-format
 msgid "Start the connection at boot"
 msgstr "Тизим юкланаётганда ишга тушириш"
 
-#: ../lib/network/connection.pm:252
+#: ../lib/network/connection.pm:259
 #, c-format
 msgid "Enable traffic accounting"
 msgstr ""
 
-#: ../lib/network/connection.pm:253
+#: ../lib/network/connection.pm:260
 #, c-format
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:254 ../lib/network/drakconnect/edit.pm:293
+#: ../lib/network/connection.pm:262 ../lib/network/drakconnect/edit.pm:293
 #, c-format
 msgid "Metric"
 msgstr "Метрик"
 
-#: ../lib/network/connection.pm:255
+#: ../lib/network/connection.pm:263
 #, c-format
 msgid "MTU"
 msgstr ""
 
-#: ../lib/network/connection.pm:256
+#: ../lib/network/connection.pm:264
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
 msgstr ""
 
-#: ../lib/network/connection.pm:257
+#: ../lib/network/connection.pm:265
 #, c-format
 msgid "Fake MAC address (MACADDR)"
 msgstr ""
 
-#: ../lib/network/connection.pm:258
+#: ../lib/network/connection.pm:266
 #, c-format
 msgid "Use a fake MAC address. If unset, uses HWADDR or default."
 msgstr ""
 
-#: ../lib/network/connection.pm:259
+#: ../lib/network/connection.pm:267
 #, c-format
 msgid "MAC address (HWADDR)"
 msgstr ""
 
-#: ../lib/network/connection.pm:260
+#: ../lib/network/connection.pm:268
 #, c-format
 msgid ""
 "Make sure to bind the interface to the network card with that MAC address. "
 "If unset, uses default."
 msgstr ""
 
-#: ../lib/network/connection.pm:261
+#: ../lib/network/connection.pm:269
 #, c-format
 msgid "Ethtool options"
 msgstr ""
 
-#: ../lib/network/connection.pm:262
+#: ../lib/network/connection.pm:270
 #, c-format
 msgid "Use ethtool to pass options to the NIC. eg. \"autoneg off wol g\""
 msgstr ""
 
-#: ../lib/network/connection.pm:345
+#: ../lib/network/connection.pm:354
 #, c-format
 msgid "Link detected on interface %s"
 msgstr ""
 
-#: ../lib/network/connection.pm:346 ../lib/network/connection/ethernet.pm:306
+#: ../lib/network/connection.pm:355 ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Link beat lost on interface %s"
 msgstr ""
@@ -2749,6 +2471,12 @@ msgstr "Қидириш домени"
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
+#: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:200
+#, c-format
+msgid "DHCP client"
+msgstr "DHCP клиенти"
+
 #: ../lib/network/connection/ethernet.pm:161
 #: ../lib/network/drakconnect/edit.pm:210
 #, c-format
@@ -2836,22 +2564,22 @@ msgstr "Тармоқ хотплагинг"
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:305
+#: ../lib/network/connection/ethernet.pm:303
 #, c-format
 msgid "Link beat detected on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:308
+#: ../lib/network/connection/ethernet.pm:306
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:309
+#: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Got a network address on interface %s (%s protocol)"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:310
+#: ../lib/network/connection/ethernet.pm:308
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
 msgstr ""
@@ -4681,6 +4409,26 @@ msgstr "Узиш"
 msgid "Connect"
 msgstr "Улаш"
 
+#: ../lib/network/drakconnect.pm:17 ../lib/network/drakconnect/edit.pm:516
+#, c-format
+msgid "No IP"
+msgstr "IP рақами кўрсатилмаган"
+
+#: ../lib/network/drakconnect.pm:18 ../lib/network/drakconnect/edit.pm:517
+#, c-format
+msgid "No Mask"
+msgstr "Маскасиз"
+
+#: ../lib/network/drakconnect.pm:19
+#, c-format
+msgid "up"
+msgstr "ишлаяпти"
+
+#: ../lib/network/drakconnect.pm:19
+#, c-format
+msgid "down"
+msgstr "ишламаяпти"
+
 #: ../lib/network/drakconnect/delete.pm:13
 #, c-format
 msgid ""
@@ -4905,11 +4653,26 @@ msgstr "Белорус"
 msgid "Location on the bus"
 msgstr ""
 
+#: ../lib/network/drakconnect/edit.pm:469
+#, c-format
+msgid "Please Wait... Applying the configuration"
+msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
+
 #: ../lib/network/drakconnect/edit.pm:520 ../lib/network/netconnect.pm:832
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Гейтвей манзили қуйидаги шаклда бўлиши шарт: 1.2.3.5"
 
+#: ../lib/network/drakconnect/global.pm:19
+#, c-format
+msgid "Connected"
+msgstr "Уланган"
+
+#: ../lib/network/drakconnect/global.pm:19
+#, c-format
+msgid "Not connected"
+msgstr "Уланмаган"
+
 #: ../lib/network/drakconnect/global.pm:28
 #, c-format
 msgid "Gateway:"
@@ -5086,7 +4849,7 @@ msgid "Port scan detection"
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:224 ../lib/network/drakfirewall.pm:228
-#: ../lib/network/shorewall.pm:81
+#: ../lib/network/shorewall.pm:84
 #, c-format
 msgid "Firewall configuration"
 msgstr "Файервол мосламалари"
@@ -5113,7 +4876,7 @@ msgstr ""
 "билан мослаганингизга ишонч ҳосил қилинг."
 
 #: ../lib/network/drakfirewall.pm:245 ../lib/network/drakfirewall.pm:247
-#: ../lib/network/shorewall.pm:174
+#: ../lib/network/shorewall.pm:169
 #, c-format
 msgid "Firewall"
 msgstr "Файервол"
@@ -5339,17 +5102,6 @@ msgstr "порт %d"
 msgid "Manual"
 msgstr "Қўлбола"
 
-#: ../lib/network/modem.pm:43 ../lib/network/modem.pm:44
-#: ../lib/network/modem.pm:45 ../lib/network/modem.pm:64
-#: ../lib/network/modem.pm:77 ../lib/network/modem.pm:82
-#: ../lib/network/modem.pm:111 ../lib/network/netconnect.pm:627
-#: ../lib/network/netconnect.pm:632 ../lib/network/netconnect.pm:644
-#: ../lib/network/netconnect.pm:649 ../lib/network/netconnect.pm:665
-#: ../lib/network/netconnect.pm:667
-#, c-format
-msgid "Automatic"
-msgstr "Автоматик"
-
 #: ../lib/network/ndiswrapper.pm:31
 #, c-format
 msgid "No device supporting the %s ndiswrapper driver is present!"
@@ -5696,6 +5448,11 @@ msgid ""
 "want to use?"
 msgstr ""
 
+#: ../lib/network/netconnect.pm:463
+#, c-format
+msgid "Driver"
+msgstr "Драйвер"
+
 #: ../lib/network/netconnect.pm:475
 #, c-format
 msgid "Which protocol do you want to use?"
@@ -6219,7 +5976,7 @@ msgstr "Прокси http:// ёки https:// билан бошланиши ша�
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL \"'ftp:\" ёки \"http:\" билан бошланиши шарт"
 
-#: ../lib/network/shorewall.pm:83
+#: ../lib/network/shorewall.pm:86
 #, c-format
 msgid ""
 "Please select the interfaces that will be protected by the firewall.\n"
@@ -6233,17 +5990,17 @@ msgid ""
 "Which interfaces should be protected?\n"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:165
+#: ../lib/network/shorewall.pm:160
 #, c-format
 msgid "Keep custom rules"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:166
+#: ../lib/network/shorewall.pm:161
 #, c-format
 msgid "Drop custom rules"
 msgstr ""
 
-#: ../lib/network/shorewall.pm:171
+#: ../lib/network/shorewall.pm:166
 #, c-format
 msgid ""
 "Your firewall configuration has been manually edited and contains\n"
@@ -6643,6 +6400,147 @@ msgstr "Тармоқ профиллари"
 msgid "Authentication is required to set the network profile"
 msgstr "Интернетга уланишни мослаш"
 
+#~ msgid "Network configuration (%d adapters)"
+#~ msgstr "Тармоқни созлаш (%d адаптер)"
+
+#~ msgid "State"
+#~ msgstr "Ҳолати"
+
+#~ msgid "Hostname: "
+#~ msgstr "Компьютернинг номи: "
+
+#~ msgid "Configure hostname..."
+#~ msgstr "Компьютер номини мослаш..."
+
+#~ msgid "LAN configuration"
+#~ msgstr "Локал тармоқни созлаш"
+
+#~ msgid "Configure Local Area Network..."
+#~ msgstr "Локал тармоқни созлаш..."
+
+#~ msgid "Deactivate now"
+#~ msgstr "Ўчириш"
+
+#~ msgid "Activate now"
+#~ msgstr "Ёқиш"
+
+#~ msgid ""
+#~ "You do not have any configured interface.\n"
+#~ "Configure them first by clicking on 'Configure'"
+#~ msgstr ""
+#~ "Сизда созланган интерфейс йўқ.\n"
+#~ "Аввало, уларни \"Созлаш\"ни босиб созланг."
+
+#~ msgid "LAN Configuration"
+#~ msgstr "Локал тармоқни созлаш"
+
+#~ msgid "Adapter %s: %s"
+#~ msgstr "Адаптер %s: %s"
+
+#~ msgid "Boot Protocol"
+#~ msgstr "Юклаш протоколи"
+
+#~ msgid "Started on boot"
+#~ msgstr "Тизим юкланганда ишга туширилган"
+
+#, fuzzy
+#~ msgid ""
+#~ "This interface has not been configured yet.\n"
+#~ "Run the \"%s\" assistant from the Mageia Linux Control Center"
+#~ msgstr ""
+#~ "Бу интерфейс ҳали мослангани йўқ.\n"
+#~ "Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
+
+#~ msgid "_About"
+#~ msgstr "Ҳақ_ида"
+
+#~ msgid "Network Monitoring"
+#~ msgstr "Тармоқни назорат қилиш"
+
+#, fuzzy
+#~ msgid "Default connection: "
+#~ msgstr "Кабел орқали уланиш"
+
+#~ msgid "Wait please"
+#~ msgstr "Илтимос кутиб туринг"
+
+#~ msgid "Global statistics"
+#~ msgstr "Умумий статистика"
+
+#~ msgid "Average"
+#~ msgstr "Ўртача"
+
+#~ msgid ""
+#~ "Sending\n"
+#~ "speed:"
+#~ msgstr ""
+#~ "Жўнатиш\n"
+#~ "тезлиги:"
+
+#~ msgid "unknown"
+#~ msgstr "номаълум"
+
+#~ msgid ""
+#~ "Receiving\n"
+#~ "speed:"
+#~ msgstr ""
+#~ "Қабул қилиш\n"
+#~ "тезлиги:"
+
+#, fuzzy
+#~ msgid "Connection time: "
+#~ msgstr ""
+#~ "Уланиш\n"
+#~ "вақти: "
+
+#~ msgid "Wait please, testing your connection..."
+#~ msgstr "Илтимос кутиб туринг, алоқа синаб кўрилмоқда..."
+
+#~ msgid "Disconnecting from Internet "
+#~ msgstr "Интернет билан алоқа узилмоқда"
+
+#~ msgid "Connecting to Internet "
+#~ msgstr "Интернетга уланилмоқда "
+
+#~ msgid "Disconnection from Internet failed."
+#~ msgstr "Интернетдан узилиш муваффақиятсиз тугади."
+
+#~ msgid "Disconnection from Internet complete."
+#~ msgstr "Интернетдан узилиш бажарилди."
+
+#~ msgid "Connection complete."
+#~ msgstr "Алоқа ўрнатилди."
+
+#, fuzzy
+#~ msgid ""
+#~ "Connection failed.\n"
+#~ "Verify your configuration in the Mageia Linux Control Center."
+#~ msgstr ""
+#~ "Алоқа ўрнатиш муваффақиятсиз тугади.\n"
+#~ "Мосламани Mageia бошқарув марказида текширинг."
+
+#, fuzzy
+#~ msgid "%s (%s)"
+#~ msgstr "DNS"
+
+#~ msgid "Color configuration"
+#~ msgstr "Рангни мослаш"
+
+#~ msgid "sent: "
+#~ msgstr "жўнатилган: "
+
+#~ msgid "received: "
+#~ msgstr "қабул қилинган: "
+
+#~ msgid "average"
+#~ msgstr "ўртачаси"
+
+#~ msgid "Local measure"
+#~ msgstr "Локал кўрсатгич"
+
+#~ msgid "No internet connection configured"
+#~ msgstr "Интернетга уланиш мосланмаган"
+
 #~ msgid "Same IP is already in %s file."
 #~ msgstr "Ҳудди шундай IP рақам %s файлида аллақачон кўрсатилган."