1 files changed, 345 insertions, 338 deletions

diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 5f26e9c3f..8edc8d7d4 100644
--- a/perl-install/share/po/th.po
+++ b/perl-install/share/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2005-08-28 17:40+0800\n"
+"POT-Creation-Date: 2005-08-30 18:05+0800\n"
 "PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -142,11 +142,11 @@ msgstr "เลือกระดับระบบรักษาความป
 #: install_steps.pm:81 install_steps_interactive.pm:37 interactive/http.pm:117
 #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:42
 #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101
-#: network/netconnect.pm:918 network/netconnect.pm:922
-#: network/netconnect.pm:926 network/netconnect.pm:931
-#: network/netconnect.pm:1074 network/netconnect.pm:1078
-#: network/netconnect.pm:1196 network/netconnect.pm:1201
-#: network/netconnect.pm:1221 network/netconnect.pm:1374
+#: network/netconnect.pm:910 network/netconnect.pm:914
+#: network/netconnect.pm:918 network/netconnect.pm:923
+#: network/netconnect.pm:1067 network/netconnect.pm:1071
+#: network/netconnect.pm:1189 network/netconnect.pm:1194
+#: network/netconnect.pm:1214 network/netconnect.pm:1367
 #: network/thirdparty.pm:266 network/thirdparty.pm:273
 #: network/thirdparty.pm:309 network/thirdparty.pm:311
 #: network/thirdparty.pm:332 network/thirdparty.pm:356
@@ -436,7 +436,7 @@ msgstr "แบบปรับแก้ได้ (Customized) "
 #: printer/printerdrake.pm:4686 printer/printerdrake.pm:5141
 #: standalone/drakhosts:263 standalone/drakids:62 standalone/drakids:71
 #: standalone/drakids:79 standalone/draksplash:81 standalone/logdrake:173
-#: standalone/net_applet:84 standalone/scannerdrake:477
+#: standalone/net_applet:82 standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "ออก"
@@ -626,7 +626,7 @@ msgid "Cancel"
 msgstr "ยกเลิก"
 
 #: Xconfig/resolution_and_depth.pm:373 diskdrake/hd_gtk.pm:150
-#: install_steps_gtk.pm:232 install_steps_gtk.pm:634 interactive.pm:527
+#: install_steps_gtk.pm:232 install_steps_gtk.pm:636 interactive.pm:527
 #: interactive/gtk.pm:681 interactive/gtk.pm:683 standalone/drakTermServ:284
 #: standalone/drakbackup:3897 standalone/drakbug:105
 #: standalone/drakconnect:153 standalone/drakconnect:236
@@ -907,7 +907,7 @@ msgid "Force No Local APIC"
 msgstr ""
 
 #: any.pm:294 any.pm:648 authentication.pm:186 diskdrake/smbnfs_gtk.pm:180
-#: network/netconnect.pm:571 printer/printerdrake.pm:1887
+#: network/netconnect.pm:565 printer/printerdrake.pm:1887
 #: printer/printerdrake.pm:2008 standalone/drakbackup:1630
 #: standalone/drakbackup:3504 standalone/drakups:299
 #, c-format
@@ -1294,10 +1294,9 @@ msgstr "Advanced"
 msgid "Input method:"
 msgstr ""
 
-#: any.pm:854 install_any.pm:421 network/netconnect.pm:153
-#: network/netconnect.pm:309 network/netconnect.pm:314
-#: network/netconnect.pm:1187 printer/printerdrake.pm:105
-#: printer/printerdrake.pm:2429
+#: any.pm:854 install_any.pm:421 network/netconnect.pm:303
+#: network/netconnect.pm:308 network/netconnect.pm:1180 network/wireless.pm:7
+#: printer/printerdrake.pm:105 printer/printerdrake.pm:2429
 #, c-format
 msgid "None"
 msgstr "ไม่มี"
@@ -1622,7 +1621,7 @@ msgstr "ไม่มีรหัสผ่าน"
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "รหัสลับง่ายเกินไป (ต้องมีอย่างน้อย %d ตัวอักษร)"
 
-#: authentication.pm:188 network/netconnect.pm:314 network/netconnect.pm:572
+#: authentication.pm:188 network/netconnect.pm:308 network/netconnect.pm:566
 #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:481
 #, c-format
 msgid "Authentication"
@@ -1638,7 +1637,7 @@ msgstr ""
 # so use only 7bit for this message (and do transliteration or
 # leave it in English, as it is the best for your language)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:753
+#: bootloader.pm:765
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1648,56 +1647,56 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bootloader.pm:853
+#: bootloader.pm:865
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO แบบ graphical menu"
 
-#: bootloader.pm:854
+#: bootloader.pm:866
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO แบบ text menu"
 
-#: bootloader.pm:855
+#: bootloader.pm:867
 #, c-format
 msgid "GRUB with graphical menu"
 msgstr ""
 
-#: bootloader.pm:856
+#: bootloader.pm:868
 #, c-format
 msgid "GRUB with text menu"
 msgstr ""
 
-#: bootloader.pm:857
+#: bootloader.pm:869
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:935
+#: bootloader.pm:947
 #, c-format
 msgid "not enough room in /boot"
 msgstr "ไม่มีที่พอใน /boot"
 
-#: bootloader.pm:1414
+#: bootloader.pm:1433
 #, fuzzy, c-format
 msgid "You can not install the bootloader on a %s partition\n"
 msgstr "คุณจะติดตั้งบูตโหลดเดอร์ไว้ที่ไหน?"
 
-#: bootloader.pm:1454
+#: bootloader.pm:1473
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1467
+#: bootloader.pm:1486
 #, c-format
 msgid ""
 "The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1468
+#: bootloader.pm:1487
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "ติดตั้งบูตโหลดเดอร์"
@@ -2800,7 +2799,7 @@ msgstr "รหัสลับง่ายเกินไป (ต้องมี�
 msgid "The encryption keys do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: diskdrake/interactive.pm:1329 network/netconnect.pm:1025
+#: diskdrake/interactive.pm:1329 network/netconnect.pm:1018
 #: standalone/drakconnect:419
 #, c-format
 msgid "Encryption key"
@@ -3059,22 +3058,22 @@ msgstr ""
 "\n"
 "คุณแน่ใจว่าจะยอมให้พาร์ติชั่นทั้งหมดถูกลบไป\n"
 
-#: fsedit.pm:381
+#: fsedit.pm:378
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "จุดเม้าท์จะต้องเริ่มด้วย /"
 
-#: fsedit.pm:382
+#: fsedit.pm:379
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr ""
 
-#: fsedit.pm:383
+#: fsedit.pm:380
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "มีพาร์ติชั่นที่เป็นจุดเม้าท์ที่ %s เรียบร้อยแล้ว\n"
 
-#: fsedit.pm:385
+#: fsedit.pm:382
 #, fuzzy, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -3085,14 +3084,14 @@ msgstr ""
 "bootloader ไม่สามารถทำงานโดยไม่มี /boot พาร์ติชั่น \n"
 "เพราะฉนั้นจำเป็นต้องเพิ่ม /boot พาร์ติชั่น"
 
-#: fsedit.pm:390
+#: fsedit.pm:387
 #, c-format
 msgid ""
 "You can not use a LVM Logical Volume for mount point %s since it spans "
 "physical volumes"
 msgstr ""
 
-#: fsedit.pm:392
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -3101,29 +3100,29 @@ msgid ""
 "You should create a /boot partition first"
 msgstr ""
 
-#: fsedit.pm:396 fsedit.pm:398
+#: fsedit.pm:393 fsedit.pm:395
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "This directory should remain within the root filesystem"
 
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:397 fsedit.pm:399
 #, fuzzy, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
 "point\n"
 msgstr "You need a true filesystem (ext2, reiserfs) for this mount point\n"
 
-#: fsedit.pm:404
+#: fsedit.pm:401
 #, fuzzy, c-format
 msgid "You can not use an encrypted file system for mount point %s"
 msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำหรับ %s"
 
-#: fsedit.pm:465
+#: fsedit.pm:462
 #, fuzzy, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับการแบ่งสัดส่วนพาร์ติชั่นแบบออโต้"
 
-#: fsedit.pm:467
+#: fsedit.pm:464
 #, c-format
 msgid "Nothing to do"
 msgstr ""
@@ -3233,7 +3232,7 @@ msgstr ""
 msgid "Ethernetcard"
 msgstr "Ethernet Card"
 
-#: harddrake/data.pm:282 network/netconnect.pm:484
+#: harddrake/data.pm:282 network/netconnect.pm:478
 #, c-format
 msgid "Modem"
 msgstr "โมเด็ม"
@@ -3429,7 +3428,7 @@ msgid "Trouble shooting"
 msgstr ""
 
 #: harddrake/sound.pm:271 install_steps_interactive.pm:1309 keyboard.pm:391
-#: network/ndiswrapper.pm:95 network/netconnect.pm:463
+#: network/ndiswrapper.pm:95 network/netconnect.pm:457
 #: printer/printerdrake.pm:1429 printer/printerdrake.pm:2460
 #: printer/printerdrake.pm:2559 printer/printerdrake.pm:2605
 #: printer/printerdrake.pm:2672 printer/printerdrake.pm:2707
@@ -3539,8 +3538,8 @@ msgid ""
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
 
-#: harddrake/v4l.pm:12 standalone/net_applet:66 standalone/net_applet:67
-#: standalone/net_applet:69
+#: harddrake/v4l.pm:12 standalone/net_applet:64 standalone/net_applet:65
+#: standalone/net_applet:67
 #, c-format
 msgid "Auto-detect"
 msgstr "ตรวจสอบอัตโนมัติ"
@@ -3613,7 +3612,7 @@ msgid ""
 "button will reboot your computer."
 msgstr ""
 
-#: help.pm:14 install_steps_gtk.pm:557 install_steps_interactive.pm:92
+#: help.pm:14 install_steps_gtk.pm:559 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:738 standalone/drakautoinst:214
 #, c-format
 msgid "Accept"
@@ -3667,7 +3666,7 @@ msgid "User name"
 msgstr "ชื่อผู้ใช้"
 
 #: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:237
-#: install_steps_gtk.pm:699 interactive.pm:432 interactive/newt.pm:321
+#: install_steps_gtk.pm:701 interactive.pm:432 interactive/newt.pm:321
 #: network/thirdparty.pm:322 printer/printerdrake.pm:3962
 #: standalone/drakTermServ:384 standalone/drakbackup:3954
 #: standalone/drakbackup:4048 standalone/drakbackup:4065
@@ -3894,7 +3893,7 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:612
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:614
 #: standalone/drakbackup:2341 standalone/drakbackup:2345
 #: standalone/drakbackup:2349 standalone/drakbackup:2353
 #, c-format
@@ -5845,28 +5844,28 @@ msgstr "รายละเอียด"
 msgid "Time remaining "
 msgstr "เวลาที่เหลือ "
 
-#: install_steps_gtk.pm:502
+#: install_steps_gtk.pm:504
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: install_steps_gtk.pm:517
+#: install_steps_gtk.pm:519
 #, c-format
 msgid "%d packages"
 msgstr "แพ็คเก็จ %d ชุด"
 
-#: install_steps_gtk.pm:522
+#: install_steps_gtk.pm:524
 #, c-format
 msgid "Installing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: install_steps_gtk.pm:557 install_steps_interactive.pm:92
+#: install_steps_gtk.pm:559 install_steps_interactive.pm:92
 #: install_steps_interactive.pm:738
 #, c-format
 msgid "Refuse"
 msgstr "ไม่ยอมรับ"
 
-#: install_steps_gtk.pm:561 install_steps_interactive.pm:742
+#: install_steps_gtk.pm:563 install_steps_interactive.pm:742
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5879,41 +5878,41 @@ msgstr ""
 "กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
 "ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
 
-#: install_steps_gtk.pm:576 install_steps_interactive.pm:753
+#: install_steps_gtk.pm:578 install_steps_interactive.pm:753
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:576 install_steps_gtk.pm:580
+#: install_steps_gtk.pm:578 install_steps_gtk.pm:582
 #: install_steps_interactive.pm:753 install_steps_interactive.pm:757
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: install_steps_gtk.pm:580 install_steps_interactive.pm:757
+#: install_steps_gtk.pm:582 install_steps_interactive.pm:757
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:933 steps.pm:30
+#: install_steps_gtk.pm:601 install_steps_interactive.pm:933 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: install_steps_gtk.pm:622 install_steps_interactive.pm:929
+#: install_steps_gtk.pm:624 install_steps_interactive.pm:929
 #: install_steps_interactive.pm:1078
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
 
-#: install_steps_gtk.pm:685
+#: install_steps_gtk.pm:687
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
 msgstr ""
 
-#: install_steps_gtk.pm:694
+#: install_steps_gtk.pm:696
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -5922,7 +5921,7 @@ msgid ""
 "available once the system is fully installed."
 msgstr ""
 
-#: install_steps_gtk.pm:696
+#: install_steps_gtk.pm:698
 #, c-format
 msgid "Copy whole CDs"
 msgstr ""
@@ -8716,9 +8715,9 @@ msgstr "GlidePoint"
 
 #: mouse.pm:36 network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
 #: network/modem.pm:68 network/modem.pm:82 network/modem.pm:87
-#: network/modem.pm:120 network/netconnect.pm:583 network/netconnect.pm:588
-#: network/netconnect.pm:600 network/netconnect.pm:605
-#: network/netconnect.pm:621 network/netconnect.pm:623
+#: network/modem.pm:120 network/netconnect.pm:577 network/netconnect.pm:582
+#: network/netconnect.pm:594 network/netconnect.pm:599
+#: network/netconnect.pm:615 network/netconnect.pm:617
 #, c-format
 msgid "Automatic"
 msgstr "อัตโนมัติ"
@@ -9045,36 +9044,36 @@ msgstr ""
 msgid "A \"%s\" attack has been attempted by %s"
 msgstr ""
 
-#: network/isdn.pm:117 network/netconnect.pm:455 network/netconnect.pm:544
-#: network/netconnect.pm:547 network/netconnect.pm:690
-#: network/netconnect.pm:694
+#: network/isdn.pm:117 network/netconnect.pm:449 network/netconnect.pm:538
+#: network/netconnect.pm:541 network/netconnect.pm:684
+#: network/netconnect.pm:688
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr ""
 
-#: network/isdn.pm:160 network/netconnect.pm:387
+#: network/isdn.pm:160 network/netconnect.pm:381
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:160 network/netconnect.pm:387
+#: network/isdn.pm:160 network/netconnect.pm:381
 #, c-format
 msgid "I do not know"
 msgstr "ผมไม่ทราบ"
 
-#: network/isdn.pm:161 network/netconnect.pm:387
+#: network/isdn.pm:161 network/netconnect.pm:381
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:162 network/netconnect.pm:387
+#: network/isdn.pm:162 network/netconnect.pm:381
 #, c-format
 msgid "USB"
 msgstr "USB"
 
 #: network/modem.pm:47 network/modem.pm:48 network/modem.pm:49
-#: network/netconnect.pm:588 network/netconnect.pm:605
-#: network/netconnect.pm:621
+#: network/netconnect.pm:582 network/netconnect.pm:599
+#: network/netconnect.pm:615
 #, c-format
 msgid "Manual"
 msgstr "_ระบุค่า"
@@ -9111,8 +9110,8 @@ msgstr ""
 msgid "Unable to find the ndiswrapper interface!"
 msgstr ""
 
-#: network/netconnect.pm:69 network/netconnect.pm:485
-#: network/netconnect.pm:492
+#: network/netconnect.pm:69 network/netconnect.pm:479
+#: network/netconnect.pm:486
 #, fuzzy, c-format
 msgid "Manual choice"
 msgstr "เลือกภาษาที่คุณใช้"
@@ -9156,305 +9155,290 @@ msgstr ""
 "Rest of the world \n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:120 network/thirdparty.pm:184
+#: network/netconnect.pm:117 network/thirdparty.pm:184
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:121
+#: network/netconnect.pm:118
 #, fuzzy, c-format
 msgid "Sagem USB modem"
 msgstr "System mode"
 
-#: network/netconnect.pm:122
+#: network/netconnect.pm:119
 #, c-format
 msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:123
+#: network/netconnect.pm:120
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:127
+#: network/netconnect.pm:124
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:128
+#: network/netconnect.pm:125
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:129
+#: network/netconnect.pm:126
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:130
+#: network/netconnect.pm:127
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:131
+#: network/netconnect.pm:128
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:132
+#: network/netconnect.pm:129
 #, c-format
 msgid "DSL over CAPI"
 msgstr ""
 
-#: network/netconnect.pm:136
+#: network/netconnect.pm:133
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:137
+#: network/netconnect.pm:134
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:138
+#: network/netconnect.pm:135
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:139
+#: network/netconnect.pm:136
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:140
+#: network/netconnect.pm:137
 #, c-format
 msgid "PPPoA LLC"
 msgstr ""
 
-#: network/netconnect.pm:141
+#: network/netconnect.pm:138
 #, c-format
 msgid "PPPoA VC"
 msgstr ""
 
-#: network/netconnect.pm:145 standalone/drakconnect:498
+#: network/netconnect.pm:142 standalone/drakconnect:498
 #, c-format
 msgid "Script-based"
 msgstr "รูปแบบสคริปต์"
 
-#: network/netconnect.pm:146 standalone/drakconnect:498
+#: network/netconnect.pm:143 standalone/drakconnect:498
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:147 standalone/drakconnect:498
+#: network/netconnect.pm:144 standalone/drakconnect:498
 #, c-format
 msgid "Terminal-based"
 msgstr "รูปแบบเทอร์มินอล"
 
-#: network/netconnect.pm:148 standalone/drakconnect:498
+#: network/netconnect.pm:145 standalone/drakconnect:498
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:149 standalone/drakconnect:498
+#: network/netconnect.pm:146 standalone/drakconnect:498
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:154
-#, c-format
-msgid "Open WEP"
-msgstr ""
-
-#: network/netconnect.pm:155
-#, c-format
-msgid "Restricted WEP"
-msgstr ""
-
-#: network/netconnect.pm:156
-#, c-format
-msgid "WPA Pre-Shared Key"
-msgstr ""
-
-#: network/netconnect.pm:242 standalone/drakconnect:56
+#: network/netconnect.pm:236 standalone/drakconnect:56
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:242
 #, c-format
 msgid "LAN connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:249 network/netconnect.pm:268
+#: network/netconnect.pm:243 network/netconnect.pm:262
 #, c-format
 msgid "Wireless connection"
 msgstr "ไร้สาย"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:244
 #, fuzzy, c-format
 msgid "ADSL connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:251
+#: network/netconnect.pm:245
 #, c-format
 msgid "Cable connection"
 msgstr "cable connection"
 
-#: network/netconnect.pm:252
+#: network/netconnect.pm:246
 #, c-format
 msgid "ISDN connection"
 msgstr "การติดต่อโดยใช้ ISDN"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:247
 #, c-format
 msgid "Modem connection"
 msgstr "โมเด็ม"
 
-#: network/netconnect.pm:254
+#: network/netconnect.pm:248
 #, c-format
 msgid "DVB connection"
 msgstr ""
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:258
 #, fuzzy, c-format
 msgid "Choose the connection you want to configure"
 msgstr "เลือกเครื่องมือที่คุณต้องการใช้"
 
-#: network/netconnect.pm:279 network/netconnect.pm:769
+#: network/netconnect.pm:273 network/netconnect.pm:761
 #, c-format
 msgid "Connection Configuration"
 msgstr "การคอนฟิก Connection"
 
-#: network/netconnect.pm:279 network/netconnect.pm:770
+#: network/netconnect.pm:273 network/netconnect.pm:762
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "กรุณาเลือกช่องข้างล่างนี้"
 
-#: network/netconnect.pm:282
+#: network/netconnect.pm:276
 #, c-format
 msgid "Your personal phone number"
 msgstr "เบอร์โทรศัพท์ส่วนตัว"
 
-#: network/netconnect.pm:283 network/netconnect.pm:773
+#: network/netconnect.pm:277 network/netconnect.pm:765
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "ชื่อผู้ให้บริการ (ex KSC)"
 
-#: network/netconnect.pm:284 standalone/drakconnect:493
+#: network/netconnect.pm:278 standalone/drakconnect:493
 #, c-format
 msgid "Provider phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:285
+#: network/netconnect.pm:279
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "ผู้ให้บริการ dns 1 (optional)"
 
-#: network/netconnect.pm:286
+#: network/netconnect.pm:280
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "ผู้ให้บริการ dns 2 (optional)"
 
-#: network/netconnect.pm:287 standalone/drakconnect:444
+#: network/netconnect.pm:281 standalone/drakconnect:444
 #, c-format
 msgid "Dialing mode"
 msgstr "การหมุนโทรศัพท์ด้วยโมเด็ม"
 
-#: network/netconnect.pm:288 standalone/drakconnect:449
+#: network/netconnect.pm:282 standalone/drakconnect:449
 #: standalone/drakconnect:517
 #, fuzzy, c-format
 msgid "Connection speed"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:289 standalone/drakconnect:454
+#: network/netconnect.pm:283 standalone/drakconnect:454
 #, fuzzy, c-format
 msgid "Connection timeout (in sec)"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:290 network/netconnect.pm:315
-#: network/netconnect.pm:776 standalone/drakconnect:491
+#: network/netconnect.pm:284 network/netconnect.pm:309
+#: network/netconnect.pm:768 standalone/drakconnect:491
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account Login (user name)"
 
-#: network/netconnect.pm:291 network/netconnect.pm:316
-#: network/netconnect.pm:777 standalone/drakconnect:492
+#: network/netconnect.pm:285 network/netconnect.pm:310
+#: network/netconnect.pm:769 standalone/drakconnect:492
 #, c-format
 msgid "Account Password"
 msgstr "รหัสผ่าน"
 
-#: network/netconnect.pm:292 standalone/drakconnect:554
+#: network/netconnect.pm:286 standalone/drakconnect:554
 #, c-format
 msgid "Card IRQ"
 msgstr "Card IRQ"
 
-#: network/netconnect.pm:293 standalone/drakconnect:555
+#: network/netconnect.pm:287 standalone/drakconnect:555
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Card mem (DMA)"
 
-#: network/netconnect.pm:294 standalone/drakconnect:556
+#: network/netconnect.pm:288 standalone/drakconnect:556
 #, c-format
 msgid "Card IO"
 msgstr "Card IO"
 
-#: network/netconnect.pm:295 standalone/drakconnect:557
+#: network/netconnect.pm:289 standalone/drakconnect:557
 #, c-format
 msgid "Card IO_0"
 msgstr "Card IO_0"
 
-#: network/netconnect.pm:296
+#: network/netconnect.pm:290
 #, c-format
 msgid "Card IO_1"
 msgstr "Card IO_1"
 
-#: network/netconnect.pm:311
+#: network/netconnect.pm:305
 #, fuzzy, c-format
 msgid "Cable: account options"
 msgstr "อ็อปชั่นของการหมุนโทรศัพท์"
 
-#: network/netconnect.pm:314
+#: network/netconnect.pm:308
 #, c-format
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: network/netconnect.pm:340 network/netconnect.pm:657
-#: network/netconnect.pm:808 network/netconnect.pm:1120
+#: network/netconnect.pm:334 network/netconnect.pm:651
+#: network/netconnect.pm:800 network/netconnect.pm:1113
 #, fuzzy, c-format
 msgid "Select the network interface to configure:"
 msgstr "เลือก network interface"
 
-#: network/netconnect.pm:342 network/netconnect.pm:377
-#: network/netconnect.pm:658 network/netconnect.pm:810 network/shorewall.pm:69
+#: network/netconnect.pm:336 network/netconnect.pm:371
+#: network/netconnect.pm:652 network/netconnect.pm:802 network/shorewall.pm:69
 #: standalone/drakconnect:713
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: network/netconnect.pm:343 network/netconnect.pm:348
+#: network/netconnect.pm:337 network/netconnect.pm:342
 #, c-format
 msgid "External ISDN modem"
 msgstr "External ISDN modem"
 
-#: network/netconnect.pm:376 standalone/harddrake2:216
+#: network/netconnect.pm:370 standalone/harddrake2:216
 #, fuzzy, c-format
 msgid "Select a device!"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: network/netconnect.pm:385 network/netconnect.pm:395
-#: network/netconnect.pm:405 network/netconnect.pm:438
-#: network/netconnect.pm:452
+#: network/netconnect.pm:379 network/netconnect.pm:389
+#: network/netconnect.pm:399 network/netconnect.pm:432
+#: network/netconnect.pm:446
 #, c-format
 msgid "ISDN Configuration"
 msgstr "การคอนฟิก ISDN"
 
-#: network/netconnect.pm:386
+#: network/netconnect.pm:380
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "คุณมีการ์ดชนิดใด?"
 
-#: network/netconnect.pm:396
+#: network/netconnect.pm:390
 #, c-format
 msgid ""
 "\n"
@@ -9468,22 +9452,22 @@ msgstr ""
 "\n"
 "ถ้าคุณมีการ์ด PCMCIA คุณต้องรู้ irq และ io ของการ์ดของคุณ\n"
 
-#: network/netconnect.pm:400
+#: network/netconnect.pm:394
 #, c-format
 msgid "Continue"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: network/netconnect.pm:400
+#: network/netconnect.pm:394
 #, c-format
 msgid "Abort"
 msgstr "เลิก"
 
-#: network/netconnect.pm:406
+#: network/netconnect.pm:400
 #, fuzzy, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "คุณใช้การ์ด ISDN ใด?"
 
-#: network/netconnect.pm:424
+#: network/netconnect.pm:418
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -9491,25 +9475,25 @@ msgid ""
 "want to use?"
 msgstr ""
 
-#: network/netconnect.pm:426 standalone/drakconnect:109 standalone/drakups:251
+#: network/netconnect.pm:420 standalone/drakconnect:109 standalone/drakups:251
 #: standalone/harddrake2:133
 #, c-format
 msgid "Driver"
 msgstr "Driver"
 
-#: network/netconnect.pm:438
+#: network/netconnect.pm:432
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Protocol ไหนที่คุณต้องการ"
 
-#: network/netconnect.pm:440 standalone/drakconnect:109
+#: network/netconnect.pm:434 standalone/drakconnect:109
 #: standalone/drakconnect:300 standalone/drakconnect:562
 #: standalone/drakids:196 standalone/drakvpn:1128
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: network/netconnect.pm:452
+#: network/netconnect.pm:446
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -9518,65 +9502,65 @@ msgstr ""
 "เลือกผู้ให้บริการ\n"
 "ถ้าไม่มีเลือก ไม่มี (unlisted)"
 
-#: network/netconnect.pm:454 network/netconnect.pm:543
-#: network/netconnect.pm:689
+#: network/netconnect.pm:448 network/netconnect.pm:537
+#: network/netconnect.pm:683
 #, fuzzy, c-format
 msgid "Provider:"
 msgstr "Profile: "
 
-#: network/netconnect.pm:463
+#: network/netconnect.pm:457
 #, c-format
 msgid ""
 "Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:482
+#: network/netconnect.pm:476
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "เลือก network interface"
 
-#: network/netconnect.pm:512
+#: network/netconnect.pm:506
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: network/netconnect.pm:541
+#: network/netconnect.pm:535
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: network/netconnect.pm:565
+#: network/netconnect.pm:559
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "อ็อปชั่นของการหมุนโทรศัพท์"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:562
 #, c-format
 msgid "Connection name"
 msgstr "ชื่อการเชื่อมต่อ"
 
-#: network/netconnect.pm:569
+#: network/netconnect.pm:563
 #, c-format
 msgid "Phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:570
+#: network/netconnect.pm:564
 #, c-format
 msgid "Login ID"
 msgstr "หมายเลขประจำตัวการล็อกอิน"
 
-#: network/netconnect.pm:585 network/netconnect.pm:618
+#: network/netconnect.pm:579 network/netconnect.pm:612
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:588
+#: network/netconnect.pm:582
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:589 network/netconnect.pm:894
+#: network/netconnect.pm:583 network/netconnect.pm:886
 #: printer/printerdrake.pm:460 standalone/drakconnect:109
 #: standalone/drakconnect:316 standalone/drakconnect:882
 #: standalone/drakhosts:197 standalone/drakups:286
@@ -9584,127 +9568,118 @@ msgstr "Parameters"
 msgid "IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:590
+#: network/netconnect.pm:584
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:602
+#: network/netconnect.pm:596
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:599
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:606
+#: network/netconnect.pm:600
 #, c-format
 msgid "Domain name"
 msgstr "ชื่อโดเมน"
 
-#: network/netconnect.pm:607 network/netconnect.pm:774
+#: network/netconnect.pm:601 network/netconnect.pm:766
 #: standalone/drakconnect:992
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
 
-#: network/netconnect.pm:608 network/netconnect.pm:775
+#: network/netconnect.pm:602 network/netconnect.pm:767
 #: standalone/drakconnect:993
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องที่สอง (optional)"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:603
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: network/netconnect.pm:621 standalone/drakconnect:327
+#: network/netconnect.pm:615 standalone/drakconnect:327
 #, c-format
 msgid "Gateway"
 msgstr "เกตเวย์"
 
-#: network/netconnect.pm:622
+#: network/netconnect.pm:616
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:657
+#: network/netconnect.pm:651
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: network/netconnect.pm:687
+#: network/netconnect.pm:681
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: network/netconnect.pm:717
-#, c-format
-msgid "Connect to the Internet"
-msgstr "ต่อเข้า Internet "
-
-#: network/netconnect.pm:718
+#: network/netconnect.pm:711
 #, c-format
 msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use PPTP, a few use DHCP.\n"
-"If you do not know, choose 'use PPPoE'"
+"Please choose your DSL connection type.\n"
+"If you do not know it, keep the preselected type."
 msgstr ""
-"การติดต่อโดยทั่วไปของ adsl คือ pppoe.\n"
-"บางครั้งอาจใช้  pptp มีน้อยคนที่ใช้  DHCP.\n"
-"ถ้าคุณไม่ทราบ เลือก 'use PPPoE'"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:714
 #, fuzzy, c-format
 msgid "ADSL connection type:"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:779
+#: network/netconnect.pm:771
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:780
+#: network/netconnect.pm:772
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:783
+#: network/netconnect.pm:775
 #, fuzzy, c-format
 msgid "Encapsulation:"
 msgstr "ขอแสดงความยินดี"
 
-#: network/netconnect.pm:810
+#: network/netconnect.pm:802
 #, c-format
 msgid "Manually load a driver"
 msgstr ""
 
-#: network/netconnect.pm:810
+#: network/netconnect.pm:802
 #, c-format
 msgid "Use a Windows driver (with ndiswrapper)"
 msgstr ""
 
-#: network/netconnect.pm:850
+#: network/netconnect.pm:842
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:851 network/netconnect.pm:881
+#: network/netconnect.pm:843 network/netconnect.pm:873
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "กำลังคอนฟิกอุปกรณ์เน็ตเวิร์ก %s"
 
-#: network/netconnect.pm:852
+#: network/netconnect.pm:844
 #, c-format
 msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
 "choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:882
+#: network/netconnect.pm:874
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9715,196 +9690,196 @@ msgstr ""
 "ข้อมูลแต่ละอย่างสามารถใส่เข้าไปได้โดยใช้ค่า IP ในรูปแบบตัวเลขคั่นด้วยจุด\n"
 "(dotted-decimal notation) ตัวอย่างเช่น 1.2.3.4"
 
-#: network/netconnect.pm:889 standalone/drakconnect:373
+#: network/netconnect.pm:881 standalone/drakconnect:373
 #, fuzzy, c-format
 msgid "Assign host name from DHCP address"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:890 standalone/drakconnect:375
+#: network/netconnect.pm:882 standalone/drakconnect:375
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:895 standalone/drakconnect:321
+#: network/netconnect.pm:887 standalone/drakconnect:321
 #: standalone/drakconnect:883 standalone/drakgw:181
 #, c-format
 msgid "Netmask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:897 standalone/drakconnect:437
+#: network/netconnect.pm:889 standalone/drakconnect:437
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:898 standalone/drakconnect:438
+#: network/netconnect.pm:890 standalone/drakconnect:438
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:900 standalone/drakconnect:432
+#: network/netconnect.pm:892 standalone/drakconnect:432
 #, fuzzy, c-format
 msgid "Start at boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: network/netconnect.pm:902 standalone/drakconnect:460
+#: network/netconnect.pm:894 standalone/drakconnect:460
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "จำเพาะ"
 
-#: network/netconnect.pm:903
+#: network/netconnect.pm:895
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
 msgstr ""
 
-#: network/netconnect.pm:905 standalone/drakconnect:369
+#: network/netconnect.pm:897 standalone/drakconnect:369
 #: standalone/drakconnect:886
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: network/netconnect.pm:907 standalone/drakconnect:379
+#: network/netconnect.pm:899 standalone/drakconnect:379
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:908 standalone/drakconnect:382
+#: network/netconnect.pm:900 standalone/drakconnect:382
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: network/netconnect.pm:909 standalone/drakconnect:383
+#: network/netconnect.pm:901 standalone/drakconnect:383
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
-#: network/netconnect.pm:910 standalone/drakconnect:384
+#: network/netconnect.pm:902 standalone/drakconnect:384
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
-#: network/netconnect.pm:918 printer/printerdrake.pm:1896
+#: network/netconnect.pm:910 printer/printerdrake.pm:1896
 #: standalone/drakconnect:676
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:922 standalone/drakconnect:680
+#: network/netconnect.pm:914 standalone/drakconnect:680
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:926
+#: network/netconnect.pm:918
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr ""
 
-#: network/netconnect.pm:931 standalone/drakTermServ:1852
+#: network/netconnect.pm:923 standalone/drakTermServ:1852
 #: standalone/drakTermServ:1853 standalone/drakTermServ:1854
 #, c-format
 msgid "%s already in use\n"
 msgstr ""
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:963
 #, fuzzy, c-format
 msgid "Choose an ndiswrapper driver"
 msgstr "เลือก X เซิร์ฟเวอร์"
 
-#: network/netconnect.pm:973
+#: network/netconnect.pm:965
 #, c-format
 msgid "Use the ndiswrapper driver %s"
 msgstr ""
 
-#: network/netconnect.pm:973
+#: network/netconnect.pm:965
 #, fuzzy, c-format
 msgid "Install a new driver"
 msgstr "ติดตั้งระบบ"
 
-#: network/netconnect.pm:985
+#: network/netconnect.pm:977
 #, c-format
 msgid "Select a device:"
 msgstr ""
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1006
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:1017 standalone/drakconnect:404
+#: network/netconnect.pm:1009 standalone/drakconnect:404
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mouse"
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "เรียกคืนจากไฟล์"
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, c-format
 msgid "Secondary"
 msgstr "รอง (Secondary)"
 
-#: network/netconnect.pm:1018
+#: network/netconnect.pm:1010
 #, c-format
 msgid "Auto"
 msgstr "อัตโนมัติ"
 
-#: network/netconnect.pm:1021 standalone/drakconnect:405
+#: network/netconnect.pm:1013 standalone/drakconnect:405
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:1022
+#: network/netconnect.pm:1014
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: network/netconnect.pm:1026
+#: network/netconnect.pm:1019
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:406
+#: network/netconnect.pm:1020 standalone/drakconnect:406
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Network interface"
 
-#: network/netconnect.pm:1028 standalone/drakconnect:407
+#: network/netconnect.pm:1021 standalone/drakconnect:407
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:1029 standalone/drakconnect:408
+#: network/netconnect.pm:1022 standalone/drakconnect:408
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:1030 standalone/drakconnect:409
+#: network/netconnect.pm:1023 standalone/drakconnect:409
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:1031 standalone/drakconnect:420
+#: network/netconnect.pm:1024 standalone/drakconnect:420
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:1032
+#: network/netconnect.pm:1025
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9918,17 +9893,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1039 standalone/drakconnect:421
+#: network/netconnect.pm:1032 standalone/drakconnect:421
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Workstation ที่ทำงาน"
 
-#: network/netconnect.pm:1040 standalone/drakconnect:422
+#: network/netconnect.pm:1033 standalone/drakconnect:422
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1041
+#: network/netconnect.pm:1034
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -9939,12 +9914,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1048 standalone/drakconnect:423
+#: network/netconnect.pm:1041 standalone/drakconnect:423
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1042
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9956,12 +9931,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1058 standalone/drakconnect:424
+#: network/netconnect.pm:1051 standalone/drakconnect:424
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1059
+#: network/netconnect.pm:1052
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9979,51 +9954,51 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1074
+#: network/netconnect.pm:1067
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1078
+#: network/netconnect.pm:1071
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: network/netconnect.pm:1120
+#: network/netconnect.pm:1113
 #, c-format
 msgid "DVB configuration"
 msgstr ""
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1114
 #, c-format
 msgid "DVB Adapter"
 msgstr ""
 
-#: network/netconnect.pm:1138
+#: network/netconnect.pm:1131
 #, c-format
 msgid "DVB adapter settings"
 msgstr ""
 
-#: network/netconnect.pm:1141
+#: network/netconnect.pm:1134
 #, c-format
 msgid "Adapter card"
 msgstr ""
 
-#: network/netconnect.pm:1142
+#: network/netconnect.pm:1135
 #, c-format
 msgid "Net demux"
 msgstr ""
 
-#: network/netconnect.pm:1143
+#: network/netconnect.pm:1136
 #, c-format
 msgid "PID"
 msgstr ""
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1164
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10036,67 +10011,67 @@ msgstr ""
 "ตัวอย่างเช่น ``mybox.mylab.yco.com''\n"
 "คุณอาจจะใส่ค่า IP ของเกตเวย์ด้วยถ้าคุณมีเครื่องที่ทำหน้าที่เป็นเกตเวย์อยู่"
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1178 standalone/drakconnect:991
+#: network/netconnect.pm:1171 standalone/drakconnect:991
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:1178 standalone/drakhosts:197
+#: network/netconnect.pm:1171 standalone/drakhosts:197
 #, c-format
 msgid "Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1173
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1181
+#: network/netconnect.pm:1174
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1182
+#: network/netconnect.pm:1175
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1183
+#: network/netconnect.pm:1176
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "โดเมน NIS"
 
-#: network/netconnect.pm:1184
+#: network/netconnect.pm:1177
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1185
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr ""
 
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1180
 #, c-format
 msgid "Gateway device"
 msgstr "อุปกรณ์เกตเวย์"
 
-#: network/netconnect.pm:1196
+#: network/netconnect.pm:1189
 #, fuzzy, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1201 standalone/drakconnect:685
+#: network/netconnect.pm:1194 standalone/drakconnect:685
 #, fuzzy, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1207
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10105,67 +10080,67 @@ msgid ""
 "It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1218
+#: network/netconnect.pm:1211
 #, fuzzy, c-format
 msgid "Zeroconf Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1221
+#: network/netconnect.pm:1214
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1224
 #, fuzzy, c-format
 msgid "Do you want to allow users to start the connection?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1244
+#: network/netconnect.pm:1237
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1259
+#: network/netconnect.pm:1252
 #, fuzzy, c-format
 msgid "Automatically at boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: network/netconnect.pm:1261
+#: network/netconnect.pm:1254
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr ""
 
-#: network/netconnect.pm:1263
+#: network/netconnect.pm:1256
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr ""
 
-#: network/netconnect.pm:1272
+#: network/netconnect.pm:1265
 #, fuzzy, c-format
 msgid "How do you want to dial this connection?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1285
+#: network/netconnect.pm:1278
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "คุณต้องการทดสอบต่อเข้า Internet เดี๋ยวนี้หรือไม่"
 
-#: network/netconnect.pm:1293 standalone/drakconnect:1023
+#: network/netconnect.pm:1286 standalone/drakconnect:1023
 #, c-format
 msgid "Testing your connection..."
 msgstr "ทดสอบ connection..."
 
-#: network/netconnect.pm:1313
+#: network/netconnect.pm:1306
 #, fuzzy, c-format
 msgid "The system is now connected to the Internet."
 msgstr "ติดต่อเข้า Internet เรียบร้อย"
 
-#: network/netconnect.pm:1314
+#: network/netconnect.pm:1307
 #, fuzzy, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "เพื่อความปลอดภัย มันจะหยุดการติดต่อเดี๋ยวนี้"
 
-#: network/netconnect.pm:1315
+#: network/netconnect.pm:1308
 #, fuzzy, c-format
 msgid ""
 "The system does not seem to be connected to the Internet.\n"
@@ -10174,7 +10149,7 @@ msgstr ""
 "ไม่สามารถต่อเข้า Internet \n"
 "ลองทำการคอนฟิกใหม่อีกครั้ง"
 
-#: network/netconnect.pm:1330
+#: network/netconnect.pm:1323
 #, fuzzy, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10184,7 +10159,7 @@ msgstr ""
 "\n"
 "ค่าต่างๆจะถูกนำไปใช้เดี๋ยวนี้\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10193,7 +10168,7 @@ msgstr ""
 "เมื่อทุกอย่างเสร็จสิ้น ผมแนะนำให้ท่านเริ่มทำงาน X windows ใหม่\n"
 "เพื่อป้องกันปัญหา hostname ที่อาจเกิดขึ้นได้"
 
-#: network/netconnect.pm:1334
+#: network/netconnect.pm:1327
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
@@ -10201,28 +10176,28 @@ msgid ""
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1345
+#: network/netconnect.pm:1338
 #, fuzzy, c-format
 msgid "(detected on port %s)"
 msgstr "ค้นหาเจอบน port %s"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:1347
+#: network/netconnect.pm:1340
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:1347
+#: network/netconnect.pm:1340
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:1348
+#: network/netconnect.pm:1341
 #, c-format
 msgid "Network Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:1349
+#: network/netconnect.pm:1342
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10233,14 +10208,14 @@ msgstr ""
 "เนื่องจากคุณใช้การติดตั้งแบบ network ระบบ network จึงใช้ได้อยู่แล้ว\n"
 "กด OK เพื่อรักษาค่าคอนฟิกเดิมไว้ หรือเลือก ยกเลิกเพื่อปรับแต่งใหม่\n"
 
-#: network/netconnect.pm:1352
+#: network/netconnect.pm:1345
 #, fuzzy, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: network/netconnect.pm:1353
+#: network/netconnect.pm:1346
 #, fuzzy, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -10248,7 +10223,7 @@ msgid ""
 "%s"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: network/netconnect.pm:1354
+#: network/netconnect.pm:1347
 #, fuzzy, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10259,12 +10234,12 @@ msgstr ""
 "\n"
 "คุณสามารถเลิกติดต่อหรือทำการปรับแต่งการติดต่อของคุณใหม่"
 
-#: network/netconnect.pm:1355
+#: network/netconnect.pm:1348
 #, fuzzy, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Xorg ชนิดใหนที่คุณต้องการมี"
 
-#: network/netconnect.pm:1356
+#: network/netconnect.pm:1349
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10272,12 +10247,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1350
 #, fuzzy, c-format
 msgid "Internet connection"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: network/netconnect.pm:1374
+#: network/netconnect.pm:1367
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10429,6 +10404,21 @@ msgstr ""
 msgid "Please wait, running device configuration commands..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
+#: network/wireless.pm:8
+#, c-format
+msgid "Open WEP"
+msgstr ""
+
+#: network/wireless.pm:9
+#, c-format
+msgid "Restricted WEP"
+msgstr ""
+
+#: network/wireless.pm:10
+#, c-format
+msgid "WPA Pre-Shared Key"
+msgstr ""
+
 #: partition_table.pm:391
 #, c-format
 msgid "mount failed: "
@@ -18735,7 +18725,7 @@ msgstr ""
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:700 standalone/drakgw:313
+#: standalone/drakconnect:700 standalone/drakgw:311
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -18850,7 +18840,7 @@ msgid ""
 "Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 
-#: standalone/drakconnect:975 standalone/net_applet:53
+#: standalone/drakconnect:975 standalone/net_applet:51
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -18858,7 +18848,7 @@ msgid ""
 msgstr ""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:976 standalone/drakroam:42 standalone/net_applet:54
+#: standalone/drakconnect:976 standalone/drakroam:42 standalone/net_applet:52
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "เลือก network interface"
@@ -19358,7 +19348,7 @@ msgstr ""
 msgid "The DNS Server IP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:236
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19367,77 +19357,77 @@ msgid ""
 "If you do not know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:245
+#: standalone/drakgw:243
 #, fuzzy, c-format
 msgid "Use automatic configuration (DHCP)"
 msgstr "Boot Style Configuration"
 
-#: standalone/drakgw:246
+#: standalone/drakgw:244
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:247
+#: standalone/drakgw:245
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:248
+#: standalone/drakgw:246
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:249
+#: standalone/drakgw:247
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:272
+#: standalone/drakgw:270
 #, c-format
 msgid "Proxy caching server (SQUID)"
 msgstr ""
 
-#: standalone/drakgw:276
+#: standalone/drakgw:274
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr ""
 
-#: standalone/drakgw:277
+#: standalone/drakgw:275
 #, c-format
 msgid "Admin mail"
 msgstr ""
 
-#: standalone/drakgw:278
+#: standalone/drakgw:276
 #, fuzzy, c-format
 msgid "Visible hostname"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: standalone/drakgw:279
+#: standalone/drakgw:277
 #, fuzzy, c-format
 msgid "Proxy port"
 msgstr "คุณสมบัติ"
 
-#: standalone/drakgw:280
+#: standalone/drakgw:278
 #, fuzzy, c-format
 msgid "Cache size (MB)"
 msgstr "ขนาดของ chunk"
 
-#: standalone/drakgw:302
+#: standalone/drakgw:300
 #, fuzzy, c-format
 msgid "Broadcast printer information"
 msgstr "การตรวจหาฮาร์ดไดรว์"
 
-#: standalone/drakgw:319
+#: standalone/drakgw:317
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing เริ่มทำงานแล้ว"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:323
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing ถูกยกเลิกแล้ว"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:329
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -19448,29 +19438,29 @@ msgstr ""
 "ทุกอย่างได้ถูกทำการปรับแต่งเรียบร้อยแล้ว\n"
 "คุณสามารถใช้อินเตอร์เนตบนคอมพิวเตอร์อื่นๆใน LAN โดยใช้ (DHCP)"
 
-#: standalone/drakgw:366
+#: standalone/drakgw:364
 #, c-format
 msgid "Disabling servers..."
 msgstr "ยกเลิกการทำงานของ server"
 
-#: standalone/drakgw:380
+#: standalone/drakgw:378
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "ตรวจพบคอนฟิกของ Firewall"
 
-#: standalone/drakgw:381
+#: standalone/drakgw:379
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fixes after installation."
 msgstr ""
 
-#: standalone/drakgw:386
+#: standalone/drakgw:384
 #, c-format
 msgid "Configuring..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: standalone/drakgw:387
+#: standalone/drakgw:385
 #, c-format
 msgid "Configuring firewall..."
 msgstr ""
@@ -19593,7 +19583,7 @@ msgstr "เพิ่มผู้ใช้"
 
 #: standalone/drakids:33 standalone/drakids:134 standalone/drakids:160
 #: standalone/drakids:169 standalone/drakids:179 standalone/drakids:246
-#: standalone/net_applet:61 standalone/net_applet:183
+#: standalone/net_applet:59 standalone/net_applet:181
 #: standalone/net_applet:353 standalone/net_applet:390
 #, fuzzy, c-format
 msgid "Interactive Firewall"
@@ -19635,7 +19625,7 @@ msgid "Remove from whitelist"
 msgstr "ลบออกจาก LVM"
 
 #: standalone/drakids:134 standalone/drakids:160 standalone/drakids:169
-#: standalone/drakids:179 standalone/drakids:246 standalone/net_applet:183
+#: standalone/drakids:179 standalone/drakids:246 standalone/net_applet:181
 #: standalone/net_applet:353
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
@@ -19870,10 +19860,9 @@ msgstr ""
 msgid "Anonymous Group ID:"
 msgstr ""
 
-#: standalone/draknfs:433 standalone/draknfs:525 standalone/draksambashare:625
-#: standalone/draksambashare:792
+#: standalone/draknfs:433
 #, c-format
-msgid "Please enter a directory to share."
+msgid "Can't create this directory."
 msgstr ""
 
 #: standalone/draknfs:435
@@ -19901,6 +19890,12 @@ msgstr ""
 msgid "Custom Options"
 msgstr ""
 
+#: standalone/draknfs:525 standalone/draksambashare:625
+#: standalone/draksambashare:792
+#, c-format
+msgid "Please enter a directory to share."
+msgstr ""
+
 #: standalone/draknfs:532
 #, c-format
 msgid "Please use the modify button to set right access."
@@ -20499,7 +20494,7 @@ msgstr ""
 
 #: standalone/draksambashare:433
 #, c-format
-msgid "pdf-gen - a pdf generator"
+msgid "pdf-gen - a PDF generator"
 msgstr ""
 
 #: standalone/draksambashare:434
@@ -20520,7 +20515,7 @@ msgstr ""
 
 #: standalone/draksambashare:449
 #, c-format
-msgid "A pdf gnerator already exist."
+msgid "A PDF generator already exists."
 msgstr ""
 
 #: standalone/draksambashare:473
@@ -23552,53 +23547,53 @@ msgstr "Mouse Systems"
 msgid "Please test your mouse:"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/net_applet:49
+#: standalone/net_applet:47
 #, fuzzy, c-format
 msgid "Network is up on interface %s"
 msgstr "Network interface"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:52
+#: standalone/net_applet:50
 #, fuzzy, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/net_applet:58 standalone/net_monitor:469
+#: standalone/net_applet:56 standalone/net_monitor:469
 #, fuzzy, c-format
 msgid "Connect %s"
 msgstr "เชื่อมต่ออยู่"
 
-#: standalone/net_applet:59 standalone/net_monitor:469
+#: standalone/net_applet:57 standalone/net_monitor:469
 #, fuzzy, c-format
 msgid "Disconnect %s"
 msgstr "ยกเลิกติดต่อ..."
 
-#: standalone/net_applet:60
+#: standalone/net_applet:58
 #, fuzzy, c-format
 msgid "Monitor Network"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/net_applet:62
+#: standalone/net_applet:60
 #, c-format
 msgid "Manage wireless networks"
 msgstr ""
 
-#: standalone/net_applet:63
+#: standalone/net_applet:61
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/net_applet:65
+#: standalone/net_applet:63
 #, fuzzy, c-format
 msgid "Watched interface"
 msgstr "Interface"
 
-#: standalone/net_applet:74
+#: standalone/net_applet:72
 #, c-format
 msgid "Profiles"
 msgstr "โปรไฟล์"
 
-#: standalone/net_applet:83
+#: standalone/net_applet:81
 #, c-format
 msgid "Get Online Help"
 msgstr ""
@@ -24576,6 +24571,18 @@ msgstr ""
 msgid "Installation failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
+#~ msgid "Connect to the Internet"
+#~ msgstr "ต่อเข้า Internet "
+
+#~ msgid ""
+#~ "The most common way to connect with adsl is pppoe.\n"
+#~ "Some connections use PPTP, a few use DHCP.\n"
+#~ "If you do not know, choose 'use PPPoE'"
+#~ msgstr ""
+#~ "การติดต่อโดยทั่วไปของ adsl คือ pppoe.\n"
+#~ "บางครั้งอาจใช้  pptp มีน้อยคนที่ใช้  DHCP.\n"
+#~ "ถ้าคุณไม่ทราบ เลือก 'use PPPoE'"
+
 #, fuzzy
 #~ msgid "Do not print any test page"
 #~ msgstr "กำลังพิมพ์กระดาษทดสอบ"