updated pot file

author: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:40:59 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-10-07 13:40:59 +0000
commit: 79ecddfe11c0aa12f6ebefb6542b7c286b66400d (patch)
tree: 8a2aeb882e59d623794d2b734b74d7bd5035461a /perl-install/share/po/th.po
parent: 54f5f51c6dcfc30abb2d64781404ba7bdbead24e (diff)
download: drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.gz
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.bz2
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.xz
drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.zip
1 files changed, 6174 insertions, 4820 deletions
diff --git a/perl-install/share/po/th.po b/perl-install/share/po/th.po
index 414f54d7e..3aadb9604 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: 2004-06-14 15:48+0200\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\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"
@@ -14,7 +14,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, fuzzy, c-format
+msgid "Which USB key do you want to format?"
+msgstr "ข้อมูลประเภทใดที่คุณต้องการเพิ่ม"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr ""
+
+#: ../move/move.pm:450
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+
+#: ../move/move.pm:452
+#, fuzzy, c-format
+msgid "Retry"
+msgstr "เรียกคืนจากไฟล์"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+msgstr ""
+
+#: ../move/move.pm:462
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled, but we can't safely\n"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#, c-format
+msgid "Reboot"
+msgstr "Reboot"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -29,7 +82,7 @@ msgid ""
 "Operating System."
 msgstr ""
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -45,137 +98,99 @@ msgid ""
 "Operating System."
 msgstr ""
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr ""
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr ""
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr ""
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr ""
-
-#: ../move/move.pm:439
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
-msgstr ""
-
-#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr ""
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-
-#: ../move/move.pm:455
-#, fuzzy, c-format
-msgid "Retry"
-msgstr "เรียกคืนจากไฟล์"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr ""
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, fuzzy, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, fuzzy, c-format
 msgid "Auto configuration"
 msgstr "การคอนฟิก"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, fuzzy, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
+#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
+#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
+#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
+#: network/netconnect.pm:1004 network/netconnect.pm:1045
+#: network/netconnect.pm:1049 network/netconnect.pm:1187
+#: network/netconnect.pm:1192 network/netconnect.pm:1210
+#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
+#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
+#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
+#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
+#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
+#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
+#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
+#: standalone/drakTermServ:379 standalone/drakTermServ:731
+#: standalone/drakTermServ:738 standalone/drakTermServ:933
+#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
+#: standalone/drakTermServ:1447 standalone/drakauth:37
+#: standalone/drakbackup:512 standalone/drakbackup:626
+#: standalone/drakbackup:1128 standalone/drakbackup:1161
+#: standalone/drakbackup:1665 standalone/drakbackup:1821
+#: standalone/drakbackup:2416 standalone/drakbackup:4105
+#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
+#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
+#: standalone/drakconnect:651 standalone/drakconnect:670
+#: standalone/drakfloppy:297 standalone/drakfloppy:301
+#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
+#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
+#: standalone/scannerdrake:196 standalone/scannerdrake:255
+#: standalone/scannerdrake:684 standalone/scannerdrake:695
+#: standalone/scannerdrake:834 standalone/scannerdrake:845
+#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
 "An error occurred, but I don't know how to handle it nicely.\n"
@@ -184,12 +199,12 @@ msgstr ""
 "มีความผิดพลาดเกิดขึ้น แต่โปรแกรมไม่สามารถแก้ไขได้\n"
 "หากทำงานต่ออาจเกิดความเสียหายได้"
 
-#: ../move/move.pm:601 install_steps_interactive.pm:40
+#: ../move/move.pm:660 install_steps_interactive.pm:38
 #, c-format
 msgid "An error occurred"
 msgstr "มีปัญหาเกิดขึ้น"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -209,32 +224,39 @@ msgid ""
 "guess what's happening."
 msgstr ""
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, fuzzy, c-format
 msgid "Remove system config files"
 msgstr "ฟอร์แมต loopback file %s"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr ""
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
 msgstr ""
 
-#: ../move/tree/mdk_totem:81
-#, c-format
+#: ../move/tree/mdk_totem:71
+#, fuzzy, c-format
 msgid "Kill those programs"
-msgstr ""
+msgstr "ชนิดแฟ้มและโปรแกรมที่ใช้"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr ""
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1068
+#, c-format
+msgid "Read carefully!"
+msgstr "โปรดอ่านอย่างถี่ถ้วน!"
+
+#: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
 "You can't use another CDROM when the following programs are running: \n"
@@ -291,22 +313,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB หรือมากกว่า"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "X เซิร์ฟเวอร์"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, fuzzy, c-format
 msgid "Choose an X server"
 msgstr "เลือก X เซิร์ฟเวอร์"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head configuration"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, fuzzy, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -315,80 +337,80 @@ msgstr ""
 "เครื่องของคุณสนับสนุนการคอนฟิกแบบ multihead \n"
 "คุณต้องการทำอะไร?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, fuzzy, c-format
-msgid "Can't install XFree package: %s"
+msgid "Can't install Xorg package: %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "เลือกขนาดหน่วยความจำของกราฟฟิคการ์ด"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "การคอนฟิก XFree"
+msgid "Xorg configuration"
+msgstr "การคอนฟิก Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "XFree ชนิดใหนที่คุณต้องการมี"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Xorg ชนิดใหนที่คุณต้องการมี"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configure all heads independently"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Use Xinerama extension"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, fuzzy, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "คอนฟิกเฉพาะการ์ด \"%s\" (%s)"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Xorg %s"
+msgstr "Xorg %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s with 3D hardware acceleration"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s with 3D hardware acceleration"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Your card can have 3D hardware acceleration support with XFree %s."
+msgid "Your card can have 3D hardware acceleration support with Xorg %s."
+msgstr "Your card can have 3D hardware acceleration support with Xorg %s."
 
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 
-#: Xconfig/card.pm:402
+#: Xconfig/card.pm:422
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:112 any.pm:833
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
 #, c-format
 msgid "Custom"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
-#: printer/printerdrake.pm:4076 standalone/draksplash:120
-#: standalone/harddrake2:194 standalone/logdrake:175
-#: standalone/scannerdrake:450
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
+#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
+#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
+#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
+#: standalone/net_applet:160 standalone/scannerdrake:446
 #, c-format
 msgid "Quit"
 msgstr "ออก"
@@ -398,12 +420,12 @@ msgstr "ออก"
 msgid "Graphic Card"
 msgstr "กราฟฟิคการ์ด"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "จอภาพ"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
 #, c-format
 msgid "Resolution"
 msgstr "ขนาดจอภาพ"
@@ -413,14 +435,19 @@ msgstr "ขนาดจอภาพ"
 msgid "Test"
 msgstr ""
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
-#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
-#, fuzzy, c-format
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
+#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#, c-format
 msgid "Options"
-msgstr "/Options/ทดลอง"
+msgstr "อ็อปชั่น"
+
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr ""
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -433,38 +460,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "เลือกจอภาพ"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "เลือกจอภาพ"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, fuzzy, c-format
 msgid "Vendor"
 msgstr "ยกเลิก"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr ""
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -485,12 +512,12 @@ msgstr ""
 "ไม่เกินความสามารถของจอภาพ ไม่เช่นนั้นอาจเกิดความเสียหายกับจอภาพได้\n"
 "หากไม่แน่ใจโปรดเลือกเซ็ตอัพแบบมาตรฐาน"
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวนอน"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวตั้ง"
@@ -515,58 +542,60 @@ msgstr "หกหมื่นห้าพันสี (16 บิต)"
 msgid "16 million colors (24 bits)"
 msgstr "สิบหกล้านสี (24 บิต)"
 
-#: Xconfig/resolution_and_depth.pm:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "ความละเอียด"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "เลือกขนาดจอภาพและความละเอียดสี"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "กราฟฟิคการ์ด: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: standalone/drakTermServ:201 standalone/drakTermServ:474
+#: standalone/drakbackup:3962 standalone/drakbackup:4022
+#: standalone/drakbackup:4066 standalone/drakconnect:165
+#: standalone/drakconnect:850 standalone/drakconnect:937
+#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
+#: ugtk2.pm:1122 ugtk2.pm:1145
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
+#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
+#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
+#: standalone/drakautoinst:217 standalone/drakbackup:3888
+#: standalone/drakbackup:3892 standalone/drakbackup:3950
+#: standalone/drakconnect:164 standalone/drakconnect:935
+#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
+#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
+#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
+#: standalone/drakbackup:3884 standalone/drakbug:128
+#: standalone/drakconnect:160 standalone/drakconnect:245
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
+#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
+#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
@@ -656,8 +685,8 @@ msgstr "ความละเอียดของภาพ %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "ไดร์เวอร์ XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "ไดร์เวอร์ Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -668,8 +697,8 @@ msgstr "ให้เป็นกราฟฟิคเมื่อเริ่ม
 #, c-format
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
+"(Xorg) upon booting.\n"
+"Would you like Xorg to start when you reboot?"
 msgstr ""
 "โปรแกรมจะกำหนดให้คอมพิวเตอร์ของคุณใช้งานแบบกราฟฟิคเมื่อเริ่มบูต\n"
 "คุณต้องการจะให้ทำงานแบบกราฟฟิคเมื่อรีบูตหรือไม่?"
@@ -692,20 +721,47 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "การติดต่อแบบ ISDN ของคุณเป็นแบบใด"
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
+#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Please wait"
 msgstr "โปรดรอสักครู่"
 
-#: any.pm:103
+#: any.pm:116
 #, fuzzy, c-format
 msgid "Bootloader installation in progress"
 msgstr "การติดตั้ง Bootloader"
 
-#: any.pm:142
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "การติดตั้ง bootloader ล้มเหลว ต่อไปนี้เป็นข้อผิดพลาดที่เกิดขึ้น"
+
+#: any.pm:144
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -715,274 +771,259 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "เซ็กเตอร์แรกของไดรว์ (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, fuzzy, c-format
 msgid "First sector of the root partition"
 msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
 
-#: any.pm:168
+#: any.pm:207
 #, fuzzy, c-format
 msgid "On Floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "ข้ามไป"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "การติดตั้ง SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "การติดตั้ง LILO/grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "คุณจะติดตั้งบูตโหลดเดอร์ไว้ที่ไหน?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Boot Style Configuration"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "อ๊อปชั่นหลักของ Bootloader"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "ให้ป้อนข้อมูลของขนาดหน่วยความจำเป็น Mb"
 
-#: any.pm:217
+#: any.pm:247
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "อ็อปชั่น ``อ๊อปชั่นจำเพาะที่ใช้กับคอมมานด์ไลน์'' จะต้องใส่รหัสผ่านด้วย"
 
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "โปรดลองอีกครั้ง"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Bootloader ที่จะใช้"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "การติดตั้ง Bootloader"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "อุปกรณ์บูต"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "หน่วงเวลาก่อนทำการบูตอิมเมจที่ใช้"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, fuzzy, c-format
 msgid "Enable ACPI"
 msgstr "Enable CD Boot?"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr ""
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr ""
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1220 network/netconnect.pm:595
+#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
+#: standalone/drakbackup:1647 standalone/drakbackup:3490
+#: standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
+#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
 #, c-format
 msgid "Password (again)"
 msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "อ็อปชั่นจำเพาะที่ใช้กับคอมมานด์ไลน์"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "จำเพาะ"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "ลบ /tmp ตอน boot ทุกครั้ง"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "กำหนดค่าหน่วยความจำ (RAM) ให้ถูกต้องถ้าต้องการ (ระบบพบ %d MB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Enable multiple profiles"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "ข้อความ init"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Kernel Boot Timeout"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Enable CD Boot?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Enable OF Boot?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "Default OS?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Image"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Root"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Append"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "โหมดของการแสดงผล"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, fuzzy, c-format
+msgid "Network profile"
+msgstr "โปรแกรมค้นหาเครือข่าย"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Default"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "ไม่อนุญาตให้มีหัวข้อว่าง"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr ""
 
-#: any.pm:340
+#: any.pm:377
 #, fuzzy, c-format
 msgid "You must specify a root partition"
 msgstr "คุณจะต้องมีพาร์ติชั่นสวอป"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "หัวข้อนี้ถูกใช้ไปเรียบร้อยแล้ว"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "ข้อมูลประเภทใดที่คุณต้องการเพิ่ม"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
 msgstr "ลีนุกซ์"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (SunOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (Mac OS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "ระบบปฏิบัติการอื่นๆ (วินโดวส์...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -991,73 +1032,73 @@ msgstr ""
 "ต่อไปนี้เป็นข้อมูลต่างๆ\n"
 "คุณสามารถเพิ่มข้อมูลหรือแก้ไขข้อมูลที่มีได้"
 
-#: any.pm:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr ""
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr ""
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr ""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr ""
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr ""
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr ""
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(เพิ่ม %s เรียบร้อยแล้ว)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "รหัสผ่านนี้ง่ายต่อการเดา"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "โปรดป้อนชื่อผู้ใช้"
 
-#: any.pm:534
+#: any.pm:589
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "ชื่อผู้ใช้จะสามารถมีได้เฉพาะตัวอักษรตัวเล็ก ตัวเลข '-' และ '_'"
 
-#: any.pm:535
+#: any.pm:590
 #, fuzzy, c-format
 msgid "The user name is too long"
 msgstr "ชื่อผู้ใช้นี้ได้ถูกเพิ่มลงไปในระบบเรียบร้อยแล้ว"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "ชื่อผู้ใช้นี้ได้ถูกเพิ่มลงไปในระบบเรียบร้อยแล้ว"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "เพิ่มผู้ใช้"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1066,75 +1107,79 @@ msgstr ""
 "ให้ใส่ผู้ใช้\n"
 "%s"
 
-#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
-#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
-#: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2708 standalone/scannerdrake:641
-#: standalone/scannerdrake:791
+#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
+#: interactive/http.pm:151 printer/printerdrake.pm:191
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
+#: standalone/drakbackup:2703 standalone/scannerdrake:637
+#: standalone/scannerdrake:787
 #, c-format
 msgid "Done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "ยอมรับผู้ใช้"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "ชื่อเต็ม"
 
-#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1493
-#, c-format
-msgid "User name"
-msgstr "ชื่อผู้ใช้"
+#: any.pm:612 standalone/drakbackup:1642
+#, fuzzy, c-format
+msgid "Login name"
+msgstr "ชื่อโดเมน"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "เชลล์ที่ใช้"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Icon"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Autologin"
 
-#: any.pm:604
+#: any.pm:665
 #, fuzzy, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr ""
 "ผมไม่สามารถทำให้ท่านเข้าทำงานโดยใช้ชื่อคนคนหนึ่งแบบอัตโนมัติ\n"
 "ถ้าคุณไม่ต้องการใช้งานรูปแบบนี้กรุณากดปุ่มยกเลิก"
 
-#: any.pm:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, fuzzy, c-format
 msgid "Do you want to use this feature?"
 msgstr "คุณต้องการใช้ aboot หรือไม่"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "เลือกผู้ใช้ default"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "เลือก window manager:"
 
-#: any.pm:619
+#: any.pm:680
 #, fuzzy, c-format
 msgid "Please choose a language to use."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: any.pm:640
+#: any.pm:681
+#, fuzzy, c-format
+msgid "Language choice"
+msgstr "เลือกภาษาที่คุณใช้"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1142,48 +1187,57 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
 
-#: any.pm:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr ""
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, fuzzy, c-format
 msgid "All languages"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
+#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
 #, fuzzy, c-format
 msgid "Country / Region"
 msgstr "ขนาดจอภาพ"
 
-#: any.pm:699
+#: any.pm:766
 #, fuzzy, c-format
 msgid "Please choose your country."
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: any.pm:701
+#: any.pm:768
 #, fuzzy, c-format
 msgid "Here is the full list of available countries"
 msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
+#, fuzzy, c-format
+msgid "Other Countries"
+msgstr "กำลังตรวจสอบพอร์ต"
+
+#: any.pm:777
 #, c-format
-msgid "More"
-msgstr "More"
+msgid "Input method:"
+msgstr ""
 
-#: any.pm:833
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, fuzzy, c-format
+msgid "None"
+msgstr "ทำเรียบร้อยแล้ว"
+
+#: any.pm:912
 #, fuzzy, c-format
 msgid "No sharing"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: any.pm:833
+#: any.pm:912
 #, fuzzy, c-format
 msgid "Allow all users"
 msgstr "เพิ่มผู้ใช้"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1193,124 +1247,233 @@ msgid ""
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
 "Windows."
 msgstr ""
 
-#: any.pm:852
+#: any.pm:931
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
 "systems."
 msgstr ""
 
-#: any.pm:860
+#: any.pm:939
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 
-#: any.pm:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr ""
 
-#: any.pm:885
+#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
+#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
+#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
+#: standalone/drakfont:594 standalone/net_monitor:123
+#: standalone/printerdrake:559
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Mouse"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, fuzzy, c-format
-msgid "Local files"
+msgid "Local file"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
 msgstr ""
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, fuzzy, c-format
 msgid "NIS"
 msgstr "ใช้ NIS"
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, fuzzy, c-format
 msgid "Windows Domain"
 msgstr "โดเมน NIS"
 
-#: authentication.pm:12
+#: authentication.pm:20
+#, c-format
+msgid "Active Directory with SFU"
+msgstr ""
+
+#: authentication.pm:21
 #, c-format
-msgid "Active Directory"
+msgid "Active Directory with Winbind"
 msgstr ""
 
-#: authentication.pm:38
+#: authentication.pm:30
+#, fuzzy, c-format
+msgid "Local file:"
+msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง):"
+
+#: authentication.pm:30
+#, c-format
+msgid ""
+"Use local for all authentication and information user tell in local file"
+msgstr ""
+
+#: authentication.pm:31
+#, c-format
+msgid "LDAP:"
+msgstr ":"
+
+#: authentication.pm:31
+#, c-format
+msgid ""
+"Tells your computer to use LDAP for some or all authentication. LDAP "
+"consolidates certain types of information within your organization."
+msgstr ""
+
+#: authentication.pm:32
+#, fuzzy, c-format
+msgid "NIS:"
+msgstr "ใช้ NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+msgstr ""
+
+#: authentication.pm:33
+#, fuzzy, c-format
+msgid "Windows Domain:"
+msgstr "โดเมน NIS:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
+msgstr ""
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr ""
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr ""
+
+#: authentication.pm:60
 #, fuzzy, c-format
 msgid "Authentication LDAP"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr ""
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, fuzzy, c-format
 msgid "LDAP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: authentication.pm:50
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "ง่าย"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr ""
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr ""
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr ""
+
+#: authentication.pm:85 authentication.pm:123
 #, fuzzy, c-format
 msgid "Authentication Active Directory"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, fuzzy, c-format
 msgid "Domain"
 msgstr "โดเมน NIS"
 
-#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: authentication.pm:53
-#, c-format
+#: authentication.pm:89
+#, fuzzy, c-format
 msgid "LDAP users database"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
 msgstr ""
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr ""
 
-#: authentication.pm:55
+#: authentication.pm:92
 #, fuzzy, c-format
 msgid "Password for user"
 msgstr "รหัสผ่าน"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, fuzzy, c-format
+msgid "Encryption"
+msgstr "การตรวจสอบสิทธิ์การใช้งาน"
+
+#: authentication.pm:104
 #, fuzzy, c-format
 msgid "Authentication NIS"
 msgstr "การตรวจสอบสิทธิ์การใช้งานของ NIS"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "โดเมน NIS"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: authentication.pm:69
+#: authentication.pm:111
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1327,22 +1490,32 @@ msgid ""
 "good."
 msgstr ""
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, fuzzy, c-format
 msgid "Authentication Windows Domain"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, fuzzy, c-format
 msgid "Domain Admin User Name"
 msgstr "ชื่อโดเมน"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr ""
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr ""
+
+#: authentication.pm:131
+#, fuzzy, c-format
+msgid "Default Idmap "
+msgstr "Default"
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't use broadcast with no NIS domain"
 msgstr ""
@@ -1352,7 +1525,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:532
+#: bootloader.pm:673
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1362,56 +1535,51 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LILO แบบ graphical menu"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO แบบ text menu"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "ไม่มีที่พอใน /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, fuzzy, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "คุณจะติดตั้งบูตโหลดเดอร์ไว้ที่ไหน?"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, fuzzy, c-format
 msgid "Re-install Boot Loader"
 msgstr "ติดตั้งบูตโหลดเดอร์"
@@ -1471,76 +1639,79 @@ msgstr "ไม่มี kdesu "
 msgid "consolehelper missing"
 msgstr ""
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
+#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
+#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
+#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
+#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
+#: network/netconnect.pm:47
 #, fuzzy, c-format
 msgid "France"
 msgstr "ฝรั่งเศษ"
 
-#: crypto.pm:15 lang.pm:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "คอสตาริกา"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
+#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
+#: network/adsl_consts.pm:85 network/netconnect.pm:50
 #, fuzzy, c-format
 msgid "Belgium"
 msgstr "เบลเยี่ยม"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "สาธารณรัฐเช็ค"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, fuzzy, c-format
 msgid "Germany"
 msgstr "เยอรมัน"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:253
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
 #, fuzzy, c-format
 msgid "Greece"
 msgstr "กรีก"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, fuzzy, c-format
 msgid "Norway"
 msgstr "นอร์เวย์"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
 #, fuzzy, c-format
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
-#: network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
+#: network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "เนเธอร์แลนด์"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
+#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
+#: network/netconnect.pm:49 standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "Italy"
 msgstr "อิตาลี"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "พอร์ตอนุกรม"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "สหรัฐอเมริกา"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1549,66 +1720,60 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, fuzzy, c-format
 msgid "New"
 msgstr "ใหม่"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "เลิกเม้าท์์ระบบไฟล์"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "เม้าท์"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "กำหนดจุดเม้าท์"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, fuzzy, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr ""
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, fuzzy, c-format
 msgid "Server: "
 msgstr "เซิร์ฟเวอร์"
 
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
-#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
 #, c-format
 msgid "Mount point: "
 msgstr "จุดเม้าท์: "
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, fuzzy, c-format
 msgid "Options: %s"
 msgstr "พาร์ติชั่น %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "โปรดอ่านอย่างถี่ถ้วน!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "กรุณาทำ backup ก่อน"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1618,17 +1783,17 @@ msgstr ""
 "ถ้าคุณต้องการใช้ aboot ควรระวังว่าต้องมีที่ว่าง (2048 sectors) \n"
 "ด้านหน้าของ disk"
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Wizard"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "เลือกกิจกรรม"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, fuzzy, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1640,179 +1805,185 @@ msgstr ""
 "ผมแนะนำให้คุณปรับขนาด พาร์ติชั่น เสียก่อน\n"
 "(กดที่มันแล้วกด \"ปรับขนาด\")"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "โปรดเลือกพาร์ติชั่น"
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:2942 standalone/drakbackup:3004
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
+#: standalone/drakbackup:2938 standalone/drakbackup:2998
 #, c-format
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, fuzzy, c-format
 msgid "No hard drives found"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, fuzzy, c-format
 msgid "Journalised FS"
 msgstr "การเม้าท์ล้มเหลว"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "สวอป"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, fuzzy, c-format
 msgid "Windows"
 msgstr "โดเมน NIS"
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
+#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "ว่าง"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "ประเภทของระบบไฟล์:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "ใช้ ``%s'' แทน"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "ประเภท"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
 #, c-format
 msgid "Create"
 msgstr "สร้าง"
 
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:423
-#: standalone/drakperm:124 standalone/printerdrake:236
+#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
+#: standalone/drakperm:124 standalone/printerdrake:242
 #, c-format
 msgid "Delete"
 msgstr "ลบ"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "ใช้ ``Unmount'' ก่อน"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, fuzzy, c-format
 msgid "Choose another partition"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, fuzzy, c-format
 msgid "Choose a partition"
 msgstr "เลือกกิจกรรม"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, fuzzy, c-format
 msgid "Exit"
 msgstr "Ext2"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "ยกเลิก"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "สำหรับผู้ชำนาญ > ปกติ"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "ปกติ > สำหรับผู้ชำนาญ"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "ออกโดยไม่ต้องบันทึก"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "ออกโดยไม่ต้องเขียนตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, fuzzy, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "คุณต้องทำการรีบูตระบบให้เครื่องรับทราบการเปลี่ยนแปลงตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "ล้างทั้งหมด"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "กำหนดแบบอัตโนมัติ"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "More"
+
+#: diskdrake/interactive.pm:305
 #, fuzzy, c-format
 msgid "Hard drive information"
 msgstr "การตรวจหาฮาร์ดไดรว์"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "พาร์ติชั่นแบบ primary ถูกใช้ทั้งหมดแล้ว"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
 msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
 
-#: diskdrake/interactive.pm:336
+#: diskdrake/interactive.pm:339
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
@@ -1821,37 +1992,37 @@ msgstr ""
 "หากต้องการเพิ่มพาร์ติชั่น โปรดลบพาร์ติชั่นทิ้งหนึ่งพาร์ติชั่นเพื่อสร้าง\n"
 "พาร์ติชั่นแบบ extended ได้"
 
-#: diskdrake/interactive.pm:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, fuzzy, c-format
 msgid "Save partition table"
 msgstr "บันทึกตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, fuzzy, c-format
 msgid "Restore partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, fuzzy, c-format
 msgid "Reload partition table"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr ""
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "เลือกไฟล์"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1860,23 +2031,23 @@ msgstr ""
 "พาร์ติชั่นแบ็คอัพไม่มีขนาดเท่ากัน\n"
 "ต้องการทำต่อหรือไม่?"
 
-#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
-#: network/netconnect.pm:450 network/netconnect.pm:469
-#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
-#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
-#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
-#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
-#: standalone/drakTermServ:1801 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
-#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:913
+#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
+#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
+#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
+#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
+#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
+#: standalone/drakTermServ:315 standalone/drakTermServ:1045
+#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
+#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
+#: standalone/drakclock:225 standalone/drakconnect:972
+#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
+#: standalone/scannerdrake:909
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: diskdrake/interactive.pm:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1885,92 +2056,92 @@ msgstr ""
 "กรุณาใส่แผ่นฟล้อปปี้ในไดรว์\n"
 "ข้อมูลทั้งหมดบนแผ่นฟล้อปปี้จะถูกลบ"
 
-#: diskdrake/interactive.pm:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "กำลังพยายามกู้ตารางพาร์ติชั่นคืน"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, fuzzy, c-format
 msgid "Detailed information"
 msgstr "แสดงข้อมูล"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "เปลี่ยนขนาด"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "ย้าย"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "ฟอร์แมต"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "เพิ่มให้ RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "เพิ่มให้ LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "ลบออกจาก RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "ลบออกจาก LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "แก้ไข RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "ใช้สำหรับ loopback"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "เริ่มเซ็กเตอร์: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "ขนาดเป็น MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "ประเภทของระบบไฟล์: "
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "ข้อกำหนด: "
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, fuzzy, c-format
 msgid "Logical volume name "
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -1978,43 +2149,43 @@ msgid ""
 "First remove a primary partition and create an extended partition."
 msgstr ""
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, fuzzy, c-format
 msgid "Remove the loopback file?"
 msgstr "ฟอร์แมต loopback file %s"
 
-#: diskdrake/interactive.pm:559
+#: diskdrake/interactive.pm:564
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "การเปลี่ยนชนิดพาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
 
-#: diskdrake/interactive.pm:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "เปลี่ยนประเภทพาร์ติชั่น"
 
-#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "คุณต้องการเลือก filesystem ใด"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr ""
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, fuzzy, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "คุณต้องการเม้าท์ loopback file %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
@@ -2023,250 +2194,243 @@ msgstr ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, fuzzy, c-format
 msgid "Where do you want to mount %s?"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
-#: install_interactive.pm:156 install_interactive.pm:186
+#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "ปรับขนาด"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "คำนวณขอบเขตของระบบไฟล์"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "พาร์ติชั่นนี้ไม่สามารถเปลี่ยนขนาดได้"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "ข้อมูลทั้งหมดในพาร์ติชั่นนี้ควรจะทำการสำรองไว้"
 
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:712
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "หลังจากเปลี่ยนขนาดพาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะหายไป"
 
-#: diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "เลือกขนาดใหม่"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, fuzzy, c-format
 msgid "New size in MB: "
 msgstr "ขนาดเป็น MB: "
 
-#: diskdrake/interactive.pm:756 install_interactive.pm:194
+#: diskdrake/interactive.pm:761 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
 
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:784
 #, c-format
 msgid "Which disk do you want to move it to?"
 msgstr "คุณต้องการจะย้ายไปดิสก์ไหน"
 
-#: diskdrake/interactive.pm:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "เซ็กเตอร์"
 
-#: diskdrake/interactive.pm:782
+#: diskdrake/interactive.pm:786
 #, c-format
 msgid "Which sector do you want to move it to?"
 msgstr "คุณต้องการย้ายไปเซ็กเตอร์ไหน"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "ย้าย"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "ย้ายพาร์ติชั่น..."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "เลือก RAID เพื่อเพิ่มเข้าไป"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "ใหม่"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "เลือก LVM ที่มีอยู่เพื่อเพิ่มเข้าไป"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "ชื่อ LVM"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "พาร์ติชั่นนี้ไม่สามารถใช้กับ loopback"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "ชื่อ Loopback file: "
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, fuzzy, c-format
 msgid "Give a file name"
 msgstr "ชื่อเต็ม"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, fuzzy, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "File already used by another loopback, choose another one"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, fuzzy, c-format
 msgid "Mount options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr ""
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "อุปกรณ์"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "ระดับ"
 
-#: diskdrake/interactive.pm:985
-#, c-format
-msgid "chunk size"
+#: diskdrake/interactive.pm:989
+#, fuzzy, c-format
+msgid "chunk size in KiB"
 msgstr "ขนาดของ chunk"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "ระวัง การทำงานนี้อันตราย"
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "การทำ partitioning ชนิดใด?"
 
-#: diskdrake/interactive.pm:1032
-#, fuzzy, c-format
-msgid "The package %s is needed. Install it?"
-msgstr ""
-"แพกเกจนี้จำเป็นต้องถูก upgrade\n"
-"คุณแน่ใจว่าจะไม่เลือกมันหรือ"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "คุณจะต้องทำการรีบูตระบบก่อนที่จะทำการแก้ไข"
 
-#: diskdrake/interactive.pm:1070
+#: diskdrake/interactive.pm:1068
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "ตารางพาร์ติชั่นของไดรฟ์ %s จะถูกบันทึกลงไปในดิสก์"
 
-#: diskdrake/interactive.pm:1083
+#: diskdrake/interactive.pm:1081
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "หลังจาก format พาร์ติชั่น %s ข้อมูลทั้งหมดในพาร์ติชั่นนี้จะถูกลบทิ้ง"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, fuzzy, c-format
 msgid "Move files to the new partition"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, fuzzy, c-format
 msgid "Hide files"
 msgstr "mkraid failed"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
 "(%s)"
 msgstr ""
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, fuzzy, c-format
 msgid "Moving files to the new partition"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr ""
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr ""
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "อุปกรณ์: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, fuzzy, c-format
 msgid "Devfs name: "
 msgstr "ชื่อโฮสต์:"
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
 msgstr ""
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "อักษรไดรว์แบบดอส: %s (เป็นการคาดเดา)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "ประเภท: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "ชื่อ: "
@@ -2313,8 +2477,8 @@ msgstr "เม้าท์\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, fuzzy, c-format
@@ -2338,8 +2502,8 @@ msgid "Level %s\n"
 msgstr "ระดับ %s\n"
 
 #: diskdrake/interactive.pm:1190
-#, c-format
-msgid "Chunk size %s\n"
+#, fuzzy, c-format
+msgid "Chunk size %d KiB\n"
 msgstr "ขนาดของ Chunk %s\n"
 
 #: diskdrake/interactive.pm:1191
@@ -2413,38 +2577,38 @@ msgstr "ชนิดตารางพาร์ติชั่น: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "บนบัส %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, fuzzy, c-format
 msgid "Filesystem encryption key"
 msgstr "ประเภทของระบบไฟล์: "
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr ""
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1260
 #, fuzzy, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "รหัสลับง่ายเกินไป (ต้องมีอย่างน้อย %d ตัวอักษร)"
 
-#: diskdrake/interactive.pm:1262
+#: diskdrake/interactive.pm:1261
 #, fuzzy, c-format
 msgid "The encryption keys do not match"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
-#: standalone/drakconnect:404
+#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
+#: standalone/drakconnect:395
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr ""
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, fuzzy, c-format
 msgid "Change type"
 msgstr "เปลี่ยนประเภทพาร์ติชั่น"
@@ -2475,7 +2639,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, fuzzy, c-format
 msgid "Username"
 msgstr "ชื่อผู้ใช้"
@@ -2490,48 +2654,93 @@ msgstr "เซิร์ฟเวอร์ DNS"
 msgid "Search new servers"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: do_pkgs.pm:21
+#: do_pkgs.pm:16 do_pkgs.pm:31
 #, fuzzy, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr ""
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, fuzzy, c-format
 msgid "Installing packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, fuzzy, c-format
 msgid "Removing packages..."
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, fuzzy, c-format
+msgid "Mounting partition %s"
+msgstr "ฟอร์แมตพาร์ติชั่น %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr ""
+
+#: fs.pm:466 fs.pm:473
+#, fuzzy, c-format
+msgid "Checking %s"
+msgstr "ความละเอียดของภาพ %s\n"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "ผิดพลาดยกเลิกการเม้าท์ %s: %s"
+
+#: fs.pm:543
+#, fuzzy, c-format
+msgid "Enabling swap partition %s"
+msgstr "ฟอร์แมตพาร์ติชั่น %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "ฟอร์แมตพาร์ติชั่น %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "กำลังสร้างและ format ไฟล์ %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "ไม่ทราบว่าจะฟอร์แมต %s เป็นชนิด %s ได้อย่างไร"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "กำลังฟอร์แมต %s ของ %s ที่มีปัญหา"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2539,7 +2748,7 @@ msgid ""
 "containing binaries for architectures other than its own."
 msgstr ""
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2547,17 +2756,17 @@ msgid ""
 "have suidperl(1) installed.)"
 msgstr ""
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr ""
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2568,65 +2777,25 @@ msgid ""
 "user,exec,dev,suid )."
 msgstr ""
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr ""
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr ""
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "กำลังฟอร์แมต %s ของ %s ที่มีปัญหา"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "ไม่ทราบว่าจะฟอร์แมต %s เป็นชนิด %s ได้อย่างไร"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "ฟอร์แมตพาร์ติชั่น %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "กำลังสร้างและ format ไฟล์ %s"
-
-#: fs.pm:726 fs.pm:775
-#, fuzzy, c-format
-msgid "Mounting partition %s"
-msgstr "ฟอร์แมตพาร์ติชั่น %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr ""
-
-#: fs.pm:747 fs.pm:754
-#, fuzzy, c-format
-msgid "Checking %s"
-msgstr "ความละเอียดของภาพ %s\n"
-
-#: fs.pm:792 partition_table.pm:639
+#: fs/type.pm:364
 #, c-format
-msgid "error unmounting %s: %s"
-msgstr "ผิดพลาดยกเลิกการเม้าท์ %s: %s"
-
-#: fs.pm:824
-#, fuzzy, c-format
-msgid "Enabling swap partition %s"
-msgstr "ฟอร์แมตพาร์ติชั่น %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "คุณไม่สามารถใช้ JFS สำหรับพาร์ติชั่นที่น้อยกว่า 16MB ได้"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "ง่าย"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "คุณไม่สามารถใช้ ReiserFS สำหรับพาร์ติชั่นที่น้อยกว่า 32MB ได้"
 
 #: fsedit.pm:25
 #, c-format
@@ -2638,7 +2807,7 @@ msgstr ""
 msgid "server"
 msgstr "เซิร์ฟเวอร์"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, fuzzy, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2655,32 +2824,22 @@ msgstr ""
 "\n"
 "คุณแน่ใจว่าจะยอมให้พาร์ติชั่นทั้งหมดถูกลบไป\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "คุณไม่สามารถใช้ JFS สำหรับพาร์ติชั่นที่น้อยกว่า 16MB ได้"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "คุณไม่สามารถใช้ ReiserFS สำหรับพาร์ติชั่นที่น้อยกว่า 32MB ได้"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "จุดเม้าท์จะต้องเริ่มด้วย /"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr ""
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "มีพาร์ติชั่นที่เป็นจุดเม้าท์ที่ %s เรียบร้อยแล้ว\n"
 
-#: fsedit.pm:548
+#: fsedit.pm:389
 #, fuzzy, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2691,12 +2850,12 @@ msgstr ""
 "bootloader ไม่สามารถทำงานโดยไม่มี /boot พาร์ติชั่น \n"
 "เพราะฉนั้นจำเป็นต้องเพิ่ม /boot พาร์ติชั่น"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำหรับ %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, fuzzy, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2707,152 +2866,146 @@ msgstr ""
 "bootloader ไม่สามารถทำงานโดยไม่มี /boot พาร์ติชั่น \n"
 "เพราะฉนั้นจำเป็นต้องเพิ่ม /boot พาร์ติชั่น"
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
 "multiple PVs)"
 msgstr ""
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "This directory should remain within the root filesystem"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, 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:567
+#: fsedit.pm:408
 #, fuzzy, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "คุณไม่สามารถใช้ LVM Logical Volume สำหรับ %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, fuzzy, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "ไม่มีพื้นที่เพียงพอสำหรับการแบ่งสัดส่วนพาร์ติชั่นแบบออโต้"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr ""
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "เกิดข้อผิดพลาดในการเปิด %s สำหรับการเขียน: %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, fuzzy, c-format
 msgid "Floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "ซิปไดร์ฟ"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, fuzzy, c-format
 msgid "Disk"
 msgstr "เดนมาร์ก"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr ""
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr ""
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, fuzzy, c-format
 msgid "DVD-ROM"
 msgstr "ซีดี-รอม"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, fuzzy, c-format
 msgid "Tape"
 msgstr "ประเภท"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, fuzzy, c-format
 msgid "Videocard"
 msgstr "โหมดของการแสดงผล"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, fuzzy, c-format
 msgid "Tvcard"
 msgstr "TV card"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, fuzzy, c-format
 msgid "Other MultiMedia devices"
 msgstr "อื่นๆ"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, fuzzy, c-format
 msgid "Soundcard"
 msgstr "Sound card"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr ""
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr ""
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, fuzzy, c-format
 msgid "ISDN adapters"
 msgstr "Internal ISDN card"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, fuzzy, c-format
 msgid "Ethernetcard"
 msgstr "Ethernet Card"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, fuzzy, c-format
 msgid "Modem"
 msgstr "Mouse"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr ""
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr ""
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr ""
 
-#: harddrake/data.pm:248 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
-#: printer/printerdrake.pm:4175
+#: harddrake/data.pm:261 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr "เครื่องพิมพ์"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Mouse"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -2875,69 +3028,91 @@ msgstr ""
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr ""
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr ""
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr ""
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, fuzzy, c-format
 msgid "USB ports"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr ""
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, fuzzy, c-format
+msgid "UPS"
+msgstr "HFS"
+
+#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
+#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#, c-format
+msgid "Keyboard"
+msgstr "คีย์บอร์ด"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Mouse"
+
+#: harddrake/data.pm:393
 #, fuzzy, c-format
 msgid "Scanner"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, fuzzy, c-format
 msgid "Unknown/Others"
 msgstr "Generic"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr ""
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:170 standalone/drakconnect:169
+#: standalone/drakconnect:613
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "กรุณารอสักครู่ ..."
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr ""
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr ""
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:213
 #, fuzzy, c-format
 msgid "Sound configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -2946,7 +3121,7 @@ msgid ""
 "\"%s\")"
 msgstr ""
 
-#: harddrake/sound.pm:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -2966,64 +3141,65 @@ msgid ""
 "the ALSA library.\n"
 msgstr ""
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
 #, fuzzy, c-format
 msgid "Driver:"
 msgstr "Driver"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr ""
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr ""
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
 msgstr ""
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr ""
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr ""
 
-#: harddrake/sound.pm:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr ""
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr ""
 
-#: harddrake/sound.pm:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr ""
 
-#: harddrake/sound.pm:258
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:281
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3047,17 +3223,18 @@ msgid ""
 "- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr ""
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr ""
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3135,13 +3312,13 @@ msgstr ""
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 msgstr ""
 
-#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "ยอมรับ"
@@ -3149,61 +3326,65 @@ msgstr "ยอมรับ"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"GNU/Linux is a multi-user system which means each user can have his or her\n"
+"own preferences, own files and so on. But unlike \"root\", who is the\n"
+"system administrator, the users you add at this point won't be authorized\n"
+"to change anything except their own files and their own configurations,\n"
+"protecting the system from unintentional or malicious changes which could\n"
+"impact on the system as a whole. You'll have to create at least one regular\n"
+"user for yourself -- this is the account which you should use for routine,\n"
+"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
+"anything and everything, it may also be very dangerous! A very simple\n"
+"mistake could mean that your system won't work any more. If you make a\n"
+"serious mistake as a regular user, the worst that can happen is that you'll\n"
+"lose some information, but you won't affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"When you're finished adding users, you'll be asked to choose a user who\n"
+"will be automatically logged into the system when the computer boots up. If\n"
+"you're interested in that feature (and don't care much about local\n"
+"security), choose the desired user and window manager, then click on\n"
+"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, c-format
+msgid "User name"
+msgstr "ชื่อผู้ใช้"
+
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
+#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
+#: network/tools.pm:198 printer/printerdrake.pm:3268
+#: standalone/drakTermServ:372 standalone/drakbackup:3941
+#: standalone/drakbackup:4035 standalone/drakbackup:4052
+#: standalone/drakbackup:4070 ugtk2.pm:515
 #, c-format
 msgid "Next"
 msgstr "Next"
 
-#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:371
 #, c-format
 msgid "Advanced"
 msgstr "Advanced"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3237,33 +3418,41 @@ msgid ""
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 
-#: help.pm:86
+#: help.pm:85
 #, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
+"installed."
 msgstr ""
 
-#: help.pm:91
+#: help.pm:92
 #, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
-"to make it simpler to manage the packages have been placed into groups of\n"
-"similar applications.\n"
+"It's now time to specify which programs you wish to install on your system.\n"
+"There are thousands of packages available for Mandrakelinux, and to make it\n"
+"simpler to manage, they have been placed into groups of similar\n"
+"applications.\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"match applications from the various categories, so a ``Workstation''\n"
+"installation can still have applications from the ``Server'' category\n"
+"installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"more of the groups in the workstation category.\n"
 "\n"
 " * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+"appropriate groups from that category. The special \"LSB\" group will\n"
+"configure your system so that it complies as much as possible with the\n"
+"Linux Standard Base specifications.\n"
+"\n"
+"   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n"
+"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n"
+"of the system. However, if you do not select the \"LSB\" group you will\n"
+"still have a system which is nearly 100%% LSB-compliant.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3273,9 +3462,19 @@ msgid ""
 "interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"text about that group.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you're familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you start the installation in \"%s\" mode, you can deselect all groups\n"
+"and prevent the installation of any new packages. This is useful for\n"
+"repairing or updating an existing system.\n"
+"\n"
+"If you deselect all groups when performing a regular installation (as\n"
+"opposed to an upgrade), a dialog will pop up suggesting different options\n"
+"for a minimal installation:\n"
 "\n"
 " * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
@@ -3285,187 +3484,147 @@ msgid ""
 "\n"
 " * \"%s\": will install the absolute minimum number of packages necessary\n"
 "to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
-"\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
-"\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
 msgstr ""
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, fuzzy, c-format
 msgid "Workstation"
 msgstr "Workstation ที่ทำงาน"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "การทำงานแบบกราฟฟิก"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Individual package selection"
+
+#: help.pm:146 help.pm:588
+#, fuzzy, c-format
+msgid "Upgrade"
+msgstr "Update"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr ""
 
-#: help.pm:137
+#: help.pm:146
 #, fuzzy, c-format
 msgid "With basic documentation"
 msgstr "ตำแหน่ง"
 
-#: help.pm:137
+#: help.pm:146
 #, fuzzy, c-format
 msgid "Truly minimal install"
 msgstr "ออกจากการติดตั้ง"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Individual package selection"
-
-#: help.pm:137 help.pm:602
-#, fuzzy, c-format
-msgid "Upgrade"
-msgstr "Update"
-
-#: help.pm:140
+#: help.pm:149
 #, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
-"the time the distribution was shipped, it is entirely possible that that\n"
+"the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't know what a particular service is supposed to do or\n"
+"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
+"the listed services and they will be started automatically at boot time. !!\n"
 "\n"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"another installation. See the second tip of the last step on how to create\n"
+"such a floppy."
 msgstr ""
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
-#: ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
+#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "ไม่ต้อง"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
-#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
-#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:711
+#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
+#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
+#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "ใช่"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr ""
 
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "ใช้ auto detection"
-
-#: help.pm:200
+#: help.pm:183
 #, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"manual is similar to the one used during installation."
 msgstr ""
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
+#: standalone/drakbackup:2329 standalone/drakbackup:2333
+#: standalone/drakbackup:2337 standalone/drakbackup:2341
 #, c-format
 msgid "Configure"
 msgstr "การปรับแต่ง"
 
-#: help.pm:206
+#: help.pm:189
 #, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\n"
+"DrakX will list all services available on the current installation. Review\n"
+"each one of them carefully and uncheck those which aren't needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't need.\n"
+"Please remember that some services can be dangerous if they're enabled on a\n"
+"server. In general, select only those services you really need. !!"
 msgstr ""
 
-#: help.pm:224
+#: help.pm:206
 #, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
@@ -3473,72 +3632,74 @@ msgid ""
 "motherboard is set to local time, you may deactivate this by unselecting\n"
 "\"%s\", which will let GNU/Linux know that the system clock and the\n"
 "hardware clock are in the same time zone. This is useful when the machine\n"
-"also hosts another operating system like Windows.\n"
+"also hosts another operating system.\n"
 "\n"
-"The \"%s\" option will automatically regulate the clock by connecting to a\n"
-"remote time server on the Internet. For this feature to work, you must have\n"
-"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can be used by\n"
-"other machines on your local network as well."
+"The \"%s\" option will automatically regulate the system clock by\n"
+"connecting to a remote time server on the Internet. For this feature to\n"
+"work, you must have a working Internet connection. We recommend that you\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server which can be used by other machines on your local network as well."
 msgstr ""
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, fuzzy, c-format
 msgid "Hardware clock set to GMT"
 msgstr "คุณต้องการให้เซ็ตนาฬิกาฮาร์ดแวร์เป็น GMT?"
 
-#: help.pm:235
+#: help.pm:217
 #, fuzzy, c-format
 msgid "Automatic time synchronization"
 msgstr "Boot Style Configuration"
 
-#: help.pm:238
+#: help.pm:220
 #, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
 
-#: help.pm:249
+#: help.pm:231
 #, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3547,119 +3708,120 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 
-#: help.pm:311
+#: help.pm:295
 #, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 
-#: help.pm:319
+#: help.pm:303
 #, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
 
-#: help.pm:324
+#: help.pm:308
 #, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 
-#: help.pm:332
+#: help.pm:316
 #, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"You now need to decide where you want to install the Mandrakelinux\n"
+"operating system on your hard drive. If your hard drive is empty or if an\n"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\n"
-" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrakelinux system,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\n"
+" * \"%s\". If you want to delete all data and all partitions present on\n"
+"your hard drive and replace them with your new Mandrakelinux system, choose\n"
+"this option. Be careful, because you won't be able to undo this operation\n"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -3667,52 +3829,53 @@ msgid ""
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "ใช้พื้นที่ที่ว่าง"
 
-#: help.pm:389
+#: help.pm:374
 #, fuzzy, c-format
 msgid "Use existing partition"
 msgstr "ใช้พาร์ติชั่นที่มีอยู่"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "ใช้พื้นที่ที่ว่างใน Windows partition"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "ลบ disk ทั้งหมด"
 
-#: help.pm:389
+#: help.pm:374
 #, fuzzy, c-format
 msgid "Remove Windows"
 msgstr "ลบ Windows(TM)"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
-#: help.pm:392
+#: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -3720,119 +3883,119 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
+"\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key, type >>linux\n"
+"defcfg=\"floppy\"<< and press the [Enter] key.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
+"/dev/fd0\"."
 msgstr ""
 
-#: help.pm:418
+#: help.pm:409
 #, fuzzy, c-format
 msgid "Generate auto-install floppy"
 msgstr "สร้างfloppyสำหรับการติดตั้งแบบออโตเมติก"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "เรียกอีกครั้ง"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "อัตโนมัติ"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: help.pm:421
+#: help.pm:412
 #, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
+"reformat some of them and erase any data they contain. To do so, please\n"
+"select those partitions as well.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing\n"
+"Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"Please be careful when selecting partitions. After the formatting is\n"
+"completed, all data on the selected partitions will be deleted and you\n"
+"won't be able to recover it.\n"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:376 standalone/drakbackup:3880
-#: standalone/drakbackup:3919 standalone/drakbackup:4030
-#: standalone/drakbackup:4045 ugtk2.pm:508
+#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
+#: interactive/newt.pm:316 printer/printerdrake.pm:3266
+#: standalone/drakTermServ:351 standalone/drakbackup:3901
+#: standalone/drakbackup:3940 standalone/drakbackup:4051
+#: standalone/drakbackup:4066 ugtk2.pm:513
 #, c-format
 msgid "Previous"
 msgstr "ก่อน"
 
-#: help.pm:447
+#: help.pm:434
 #, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"By the time you install Mandrakelinux, it's likely that some packages will\n"
+"have been updated since the initial release. Bugs may have been fixed,\n"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"will appear: review the selection, and press \"%s\" to retrieve and install\n"
+"the selected package(s), or \"%s\" to abort."
 msgstr ""
 
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "ติดตั้ง"
 
-#: help.pm:460
+#: help.pm:447
 #, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"At this point, DrakX will allow you to choose the security level you desire\n"
+"for your machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"exposed to the Internet. The trade-off that a higher security level is\n"
+"generally obtained at the expense of ease of use.\n"
 "\n"
-"If you do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't know what to choose, keep the default option. You'll be able\n"
+"to change it later with the draksec tool, which is part of Mandrakelinux\n"
+"Control Center.\n"
 "\n"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
+"security. Security messages will be sent to that address."
 msgstr ""
 
-#: help.pm:472
+#: help.pm:458
 #, fuzzy, c-format
 msgid "Security Administrator"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
-#: help.pm:475
+#: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -3907,17 +4070,17 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr ""
 
-#: help.pm:544
+#: help.pm:530
 #, fuzzy, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "สำหรับผู้ชำนาญ > ปกติ"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -3951,80 +4114,81 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 
-#: help.pm:578
+#: help.pm:564
 #, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%s\": check the current country selection. If you're not in this country,\n"
+"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
 
-#: help.pm:584
+#: help.pm:569
 #, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\n"
+" * \"%s\". This installation class allows you to update the packages\n"
+"currently installed on your Mandrakelinux system. Your current partitioning\n"
+"scheme and user data won't be altered. Most of the other configuration\n"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 
-#: help.pm:605
+#: help.pm:591
 #, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard do not match. In either case, this installation step\n"
+"country-set keyboard don't match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
-"Click on the \"%s\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 
-#: help.pm:624
+#: help.pm:609
 #, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4033,82 +4197,90 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"by the entire system. Running the command as a regular user will only\n"
+"change the language settings for that particular user."
 msgstr ""
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr ""
 
-#: help.pm:663
+#: help.pm:650
 #, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, a test screen will be\n"
 "displayed. Use the buttons and wheel to verify that the settings are\n"
 "correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are not detected automatically, so you will need to\n"
 "select your mouse from a list. Be sure to select the one corresponding to\n"
 "the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"Test the buttons and check that the mouse pointer moves on-screen as you\n"
+"move your mouse about."
 msgstr ""
 
-#: help.pm:691
+#: help.pm:681
 #, fuzzy, c-format
 msgid "with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: help.pm:694
+#: help.pm:681
+#, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr ""
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
 "Windows is named \"ttyS0\" under GNU/Linux."
 msgstr ""
 
-#: help.pm:698
+#: help.pm:688
 #, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4117,201 +4289,104 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't be displayed on screen as you type it. To reduce the\n"
+"chance of a blind typing error you'll need to enter the password twice. If\n"
+"you do happen to make the same typing error twice, you'll have to use this\n"
+"``incorrect'' password the first time you'll try to connect as \"root\".\n"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 
-#: help.pm:733
+#: help.pm:722
 #, fuzzy, c-format
 msgid "authentication"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
 msgid "No password"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: help.pm:736
+#: help.pm:725
 #, c-format
 msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-
-#: help.pm:768
-#, fuzzy, c-format
-msgid "GRUB"
-msgstr "GB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, fuzzy, c-format
-msgid "Delay before booting the default image"
-msgstr "หน่วงเวลาก่อนทำการบูตอิมเมจที่ใช้"
-
-#: help.pm:771
-#, c-format
-msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "เพิ่ม"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, fuzzy, c-format
-msgid "Modify"
-msgstr "แก้ไข RAID"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, fuzzy, c-format
-msgid "Remove"
-msgstr "เครื่องพิมพ์แบบรีโมท"
-
-#: help.pm:787
-#, c-format
-msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"A boot loader is a little program which is started by the computer at boot\n"
+"time. It's responsible for starting up the whole system. Normally, the boot\n"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"where it should place it. Generally, the \"%s\" is the safest place.\n"
+"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"know what you're doing."
 msgstr ""
 
-#: help.pm:803
+#: help.pm:742
 #, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"Now, it's time to select a printing system for your computer. Other\n"
+"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
+"the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%s\" includes graphical front-ends for printing or choosing printer\n"
+"options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you don't like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr ""
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr ""
 
-#: help.pm:829
+#: help.pm:765
+#, fuzzy, c-format
+msgid "Expert"
+msgstr "โหมดผู้เชี่ยวชาญ"
+
+#: help.pm:768
 #, fuzzy, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -4351,154 +4426,71 @@ msgstr ""
 "เติมได้จากคู่มือ (บทที่ 3 ตอน Collective informations on your hardware ) หรือ \n"
 "จาก Web Site ของผู้ผลิต หรือ จาก Microsoft Windows ถ้าคุณมีติดตั้ง"
 
-#: help.pm:847
-#, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-
-#: help.pm:894
-#, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-
-#: help.pm:926
+#: help.pm:786
 #, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver."
 msgstr ""
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "Sound card"
 
-#: help.pm:932
+#: help.pm:791
 #, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"As a review, DrakX will present a summary of information it has gathered\n"
+"about your system. Depending on the hardware installed on your machine, you\n"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
+" * \"%s\": check the current country selection. If you're not in this\n"
+"country, click on the \"%s\" button and choose another. If your country\n"
+"isn't in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"presented in our manual is similar to the one used during installation.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
+"here. If you notice the sound card isn't the one actually present on your\n"
+"system, you can click on the button and choose a different driver.\n"
+"\n"
+" * \"%s\": if you have a TV card, this is where information about its\n"
+"configuration will be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -4508,66 +4500,67 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "คีย์บอร์ด"
-
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr "โซนเวลา"
 
-#: help.pm:991
-#, fuzzy, c-format
-msgid "Graphical Interface"
-msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "TV card"
 
-#: help.pm:991
+#: help.pm:855
 #, fuzzy, c-format
 msgid "ISDN card"
 msgstr "Internal ISDN card"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, fuzzy, c-format
+msgid "Graphical Interface"
+msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, fuzzy, c-format
 msgid "Network"
 msgstr "Network interface"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, fuzzy, c-format
+msgid "Proxies"
+msgstr "Profile: "
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, fuzzy, c-format
 msgid "Security Level"
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr ""
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, fuzzy, c-format
 msgid "Bootloader"
 msgstr "Bootloader ที่จะใช้"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, fuzzy, c-format
 msgid "Services"
 msgstr "อุปกรณ์"
 
-#: help.pm:994
+#: help.pm:858
 #, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -4578,7 +4571,7 @@ msgstr ""
 "ควรระวังเป็นอย่างมากดพราะว่าข้อมูลทุกอย่างจะถูกลบ\n"
 "และจะไม่สามารถกู้คืนได้"
 
-#: help.pm:999
+#: help.pm:863
 #, fuzzy, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -4595,7 +4588,17 @@ msgstr ""
 "\n"
 "กด \"ยกเลิก\" เพื่อยกเสิกการทำงานนี้"
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Next ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- ก่อน"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -4603,12 +4606,78 @@ msgid ""
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr ""
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, 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_any.pm:411
+#, fuzzy, c-format
+msgid "Do you have further supplementary media?"
+msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, fuzzy, c-format
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
+msgstr "คุณมีอินเทอร์เฟส %s จำนวนเท่าไหร่?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "ซีดี-รอม"
+
+#: install_any.pm:420
+#, fuzzy, c-format
+msgid "Network (http)"
+msgstr "Network interface"
+
+#: install_any.pm:420
+#, fuzzy, c-format
+msgid "Network (ftp)"
+msgstr "Network interface"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, fuzzy, c-format
+msgid "No device found"
+msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr ""
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr ""
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr ""
+
+#: install_any.pm:532
+#, fuzzy, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "Adapter %s: %s"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -4622,7 +4691,8 @@ msgid ""
 "Do you really want to install these servers?\n"
 msgstr ""
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -4631,17 +4701,17 @@ msgid ""
 "Do you really want to remove these packages?\n"
 msgstr ""
 
-#: install_any.pm:818
+#: install_any.pm:1116
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ที่ format แบบ FAT ลงในไดรว์ %s"
 
-#: install_any.pm:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "่แผ่นฟล้อปปี้นี้ ไม่ใช่ แบบFAT"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -4650,12 +4720,17 @@ msgstr ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "Port"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -4664,12 +4739,12 @@ msgstr ""
 "เกิดข้อผิดพลาดขึ้น - ไม่พบอุปกรณ์ที่ถูกต้องเพื่อจะสร้างระบบไฟล์ใหม่ "
 "โปรดตรวจสอบฮาร์ดแวร์ของท่านเพื่อแก้ไขปัญหานี้"
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, fuzzy, c-format
 msgid "System installation"
 msgstr "การติดตั้ง SILO"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, fuzzy, c-format
 msgid "System configuration"
 msgstr "การคอนฟิก"
@@ -4705,7 +4780,7 @@ msgstr ""
 "\n"
 "ต้องการจะทำต่อหรือไม่?"
 
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
 #, fuzzy, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "คุณจะต้องมีพาร์ติชั่นสวอป"
@@ -4764,7 +4839,7 @@ msgstr "พาร์ติชั่นไหนที่คุณต้องก
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "ตัวเปลี่ยนขนาดไม่สามารถทำงานกับ partition ของคุณ\n"
 "มีข้อผิดพลาดนี้เกิดขึ้น: %s"
@@ -4782,7 +4857,8 @@ msgid ""
 "installation."
 msgstr "Windows partition ของคุณกระจัดกระจายมากเกินไป กรุณา Defrag ก่อน"
 
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
 #, fuzzy, c-format
 msgid ""
 "WARNING!\n"
@@ -4803,52 +4879,52 @@ msgstr ""
 "Backup ข้อมูลสำคัญขึ้นมาก่อน\n"
 "เมื่อคุณแน่ใจแล้ว กด OK"
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "คุณต้องการเก็บ Windows ไว้ในขนาดใหน"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "พาร์ติชั่น %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "คำนวณขอบเขตของระบบไฟล์ Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "การกำหนดขนาด FAT เกิดการผิดพลาด: %s"
 
-#: install_interactive.pm:206
+#: install_interactive.pm:208
 #, fuzzy, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr "ไม่มี พาร์ติชั่น FAT เพื่อทำการเปี่ยนขนาดหรือให้ใช้เป็น loopback (พื้นที่ไม่พอ)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "ลบ Windows(TM)"
 
-#: install_interactive.pm:213
+#: install_interactive.pm:215
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "คุณมี harddisk มากกว่า  1 ตัว  คุณต้องการลง linux บน harddisk ตัวใหน"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "ข้อมูลทั้งหมดในพาร์ติชั่นทั้งหมดจะสูญหายไป %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "ใช้ fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4857,32 +4933,33 @@ msgstr ""
 "คุณสามารถพาร์ติชั่น %s เดี๋ยวนี้\n"
 "เมื่อเสร็จแล้วอย่าลืมบันทึกโดยใช้ `w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "ผมไม่สามารถหาพื้นที่ว่างเพื่อทำการติดตั้ง"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "The DrakX Partitioning wizard เจอทางเลือกดังต่อไปนี้"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "การทำพาร์ติชั่นล้มเหลว: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "ระบบเน็ตเวิร์กกำลังจะทำงาน"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, fuzzy, c-format
 msgid ""
 "Introduction\n"
@@ -4900,7 +4977,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -4922,7 +4999,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -4930,14 +5007,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -4967,10 +5044,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -4981,11 +5058,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5001,7 +5078,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Introduction\n"
 "\n"
@@ -5018,7 +5095,7 @@ msgstr ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -5040,7 +5117,7 @@ msgstr ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -5048,14 +5125,14 @@ msgstr ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
 "occurence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -5085,10 +5162,10 @@ msgstr ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -5099,11 +5176,11 @@ msgstr ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -5119,9 +5196,9 @@ msgstr ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -5133,7 +5210,8 @@ msgid ""
 "may be applicable to you, check your local laws."
 msgstr ""
 
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
 #, c-format
 msgid ""
 "\n"
@@ -5166,7 +5244,7 @@ msgid ""
 "copyright laws applicable to software programs.\n"
 msgstr ""
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, fuzzy, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5198,30 +5276,31 @@ msgstr ""
 "ข้อมูลสำหรับการคอนฟิกระบบของคุณ สามารถหาได้จากช่วง\n"
 "บทหลังจากการติดตั้งของคู่มือแนะนำผู้ใช้งานลีนุกซ์-แมนเดรกฉบับเป็นทางการ"
 
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#: install_steps.pm:242
+#: install_steps.pm:246
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "ทำซ้ำจุดเม้าท์ %s"
 
-#: install_steps.pm:407
+#: install_steps.pm:477
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "แพ็กเกจสำคัญบางอย่างไม่ได้ถูกติดตั้งอย่างเรียบร้อย\n"
 "cdrom หรือ cdrom drive ของคุณอาจมีการเสียหาย\n"
 "กรุณาตรวจสอบ cdrom ในเครื่องคอมพิวเตอร์ที่มีการติดตั้งแล้ว\n"
-"โดยใช้ \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+"โดยใช้ \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออยู่"
@@ -5231,7 +5310,7 @@ msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออ
 msgid "Entering step `%s'\n"
 msgstr "เข้าสู่ขั้นตอน `%s'\n"
 
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -5243,93 +5322,93 @@ msgstr ""
 "Mandrakelinux  ถ้าเป็นเช่นนั้น กรุณาทดลองติดตั้งแบบ text \n"
 "กรุณากด F1 ขณะ boot จาก cdrom แล้วพิมพ์ text"
 
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
 #, c-format
 msgid "Package Group Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "ขนาดรวม: %d / %d MB "
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "แพ็คเก็จชำรุด"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, fuzzy, c-format
 msgid "Version: "
 msgstr "เวอร์ชั่น: %s\n"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "ขนาด: %s"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, fuzzy, c-format
 msgid "%d KB\n"
 msgstr "ขนาด: %d KB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, fuzzy, c-format
 msgid "Importance: "
 msgstr "ความสำคัญ: %s\n"
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "คุณไม่สามารถเลือก/ไม่เลือกแพกเกจนี้"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "ไม่มี kdesu "
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
 #, c-format
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "คุณไม่สามารถเลือก package นี้เนื่องจากคุณมีพื้นที่ไม่เพียงพอ"
 
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "นี่คือแพกเกจที่ต้องติดตั้ง ไม่สามารถไม่เลือก"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't unselect this package. It is already installed"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -5338,82 +5417,81 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้  มันจำเป็นที่จะต้องถูก upgrade"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr ""
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, fuzzy, c-format
 msgid "Load/Save on floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, fuzzy, c-format
 msgid "Updating package selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, fuzzy, c-format
 msgid "Minimal install"
 msgstr "ออกจากการติดตั้ง"
 
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "กำลังติดตั้ง"
 
-#: install_steps_gtk.pm:477
-#, fuzzy, c-format
-msgid "No details"
-msgstr "รายละเอียด"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "การประเมิน"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "เวลาที่เหลือ "
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, fuzzy, c-format
+msgid "No details"
+msgstr "รายละเอียด"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "แพ็คเก็จ %d ชุด"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
 #, c-format
 msgid "Refuse"
 msgstr "ไม่ยอมรับ"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
-#, c-format
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
+#, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
@@ -5423,254 +5501,270 @@ msgstr ""
 "กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
 "ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
 #, c-format
 msgid "Go on anyway?"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
 #, fuzzy, c-format
 msgid "not configured"
 msgstr "คอนฟิกใหม่"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, fuzzy, c-format
 msgid "Do you want to recover your system?"
 msgstr "คุณต้องการใช้ aboot หรือไม่"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "License agreement"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, fuzzy, c-format
+msgid "Release Notes"
+msgstr "โปรดรอสักครู่"
+
+#: install_steps_interactive.pm:121
 #, fuzzy, c-format
 msgid "Please choose your keyboard layout."
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, fuzzy, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
 
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
 #, fuzzy, c-format
 msgid "Install/Upgrade"
 msgstr "ติดตั้ง/อัพเกรด "
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, fuzzy, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "นี่เป็นการติดตั้งหรือการอัพเกรด"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, fuzzy, c-format
 msgid "Upgrade %s"
 msgstr "Update"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, fuzzy, c-format
 msgid "Encryption key for %s"
 msgstr "รหัสผ่านไม่เหมือนกัน"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "พอร์ตของเม้าส์"
 
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr ""
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "กำลังคอนฟิกการ์ด PCMCIA..."
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "Configuring IDE"
 msgstr "คอนฟิก IDE"
 
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
 #, c-format
 msgid "No partition available"
 msgstr "ไม่มีพาร์ติชั่นเหลือ"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Scanning partitions to find mount points"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "เลือกจุดเม้าท์"
 
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
 
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "เลือกพาร์ติชั่นที่คุณต้องการฟอร์แมต"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "ตรวจสอบ bad blocks"
 
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
 "you can lose data)"
 msgstr ""
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "ไม่มีพื้นที่สวอปเพียงพอกับการติดตั้ง โปรดเพิ่มเนื้อที่"
 
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
 #, fuzzy, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
 #, c-format
 msgid "Looking for available packages..."
 msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, fuzzy, c-format
 msgid "Looking at packages already installed..."
 msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
 
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, fuzzy, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
+
+#: install_steps_interactive.pm:451
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr "เครื่องของคุณไม่มีเนื้อที่เพียงพอในการติดตั้งหรือ upgrade (%d > %d)"
 
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, fuzzy, c-format
 msgid "Load from floppy"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, fuzzy, c-format
 msgid "Package selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, fuzzy, c-format
 msgid "Loading from floppy"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, fuzzy, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr ""
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr ""
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr ""
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr ""
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "ทั้งหมด"
 
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -5681,17 +5775,17 @@ msgstr ""
 "ถ้าไม่มีเลย กด ยกเลิก (cancel)\n"
 "ถ้ามีแค่บางแผ่น เลือกเท่าที่มีแล้วกด OK"
 
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom labeled \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "กำลังเตรียมการติดตั้ง"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5700,17 +5794,17 @@ msgstr ""
 "กำลังติดตั้งแพ็คเก็จ %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "การคอนฟิกหลังการติดตั้ง"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, fuzzy, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: install_steps_interactive.pm:748
+#: install_steps_interactive.pm:813
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -5720,181 +5814,165 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
+"Do you want to install the updates?"
 msgstr ""
 
-#: install_steps_interactive.pm:769
-#, fuzzy, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, fuzzy, c-format
 msgid "Unable to contact mirror %s"
 msgstr "ไม่สามารถ forkได้.%s"
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, fuzzy, c-format
 msgid "Would you like to try again?"
 msgstr "คุณต้องการคอนฟิกเครื่องพิมพ์ด้วยหรือไม่"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "คุณใช้ย่านเวลาใด? "
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr ""
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, fuzzy, c-format
 msgid "NTP Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "รวมความ"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
 #, fuzzy, c-format
 msgid "System"
 msgstr "System mode"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Remote CUPS server"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, fuzzy, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
 #, fuzzy, c-format
 msgid "Graphical interface"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
 #, fuzzy, c-format
 msgid "Network & Internet"
 msgstr "Network interface"
 
-#: install_steps_interactive.pm:1020
-#, fuzzy, c-format
-msgid "Proxies"
-msgstr "Profile: "
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, fuzzy, c-format
 msgid "configured"
 msgstr "คอนฟิกใหม่"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "ระบบความป้องกัน"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, fuzzy, c-format
 msgid "activated"
 msgstr "แอ็คทีฟ"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, fuzzy, c-format
 msgid "disabled"
 msgstr "disable"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, fuzzy, c-format
 msgid "Boot"
 msgstr "Root"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, fuzzy, c-format
 msgid "%s on %s"
 msgstr "Port"
 
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr ""
 
-#: install_steps_interactive.pm:1083
+#: install_steps_interactive.pm:1151
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr ""
 
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "เซ็ตรหัสผ่านรูท"
 
-#: install_steps_interactive.pm:1152
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "รหัสลับง่ายเกินไป (ต้องมีอย่างน้อย %d ตัวอักษร)"
 
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
 #, c-format
 msgid "Authentication"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "กำลังเตรียมบูตโหลดเดอร์"
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -5903,12 +5981,12 @@ msgid ""
 " need to use BootX or some other means to boot your machine"
 msgstr ""
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "คุณต้องการใช้ aboot หรือไม่"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -5917,50 +5995,29 @@ msgstr ""
 "การติดตั้ง aboot ล้มเหลว\n"
 "พยายามติดตั้งถึงแม้พาติชั่นแรกอาจจะเสียหาย?"
 
-#: install_steps_interactive.pm:1218
-#, fuzzy, c-format
-msgid "Installing bootloader"
-msgstr "ติดตั้งบูตโหลดเดอร์"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "การติดตั้ง bootloader ล้มเหลว ต่อไปนี้เป็นข้อผิดพลาดที่เกิดขึ้น"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
 
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, fuzzy, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -5971,12 +6028,12 @@ msgstr ""
 "\n"
 "คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "สร้างfloppyสำหรับการติดตั้งแบบออโตเมติก"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -5995,7 +6052,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "การติดตั้งลีนุกซ์-แมนเดรก %s"
 
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
@@ -6006,17 +6064,37 @@ msgstr "  <Tab>/<Alt-Tab> ระหว่างตัวเลือก | <Space
 msgid "Choose a file"
 msgstr "เลือกกิจกรรม"
 
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
+#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Add"
+msgstr "เพิ่ม"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, fuzzy, c-format
+msgid "Modify"
+msgstr "แก้ไข RAID"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, fuzzy, c-format
+msgid "Remove"
+msgstr "เครื่องพิมพ์แบบรีโมท"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "เสร็จแล้ว"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, fuzzy, c-format
 msgid "Do"
 msgstr "ทำเรียบร้อยแล้ว"
@@ -6088,572 +6166,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr ""
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "เชคโกสโลวาเกีย (QWERTZ)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "เยอรมัน"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "สเปน"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "ฟินแลนด์"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "ฝรั่งเศษ"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "นอร์เวย์"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "โปแลนด์"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "รัสเซีย"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "สวีเดน"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "อังกฤษ"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "อเมริกา"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, fuzzy, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Iranian"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "อาร์เมเนียน (เก่า)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr ""
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "เบลเยี่ยม"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, fuzzy, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "enable"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, fuzzy, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, fuzzy, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "บัลกาเรีย"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "บราซิล"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, fuzzy, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Estonian"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Belarusian"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามเยอรมัน)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามฝรั่งเศษ)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "เชคโกสโลวาเกีย (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "German (no dead keys)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr ""
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "เดนมาร์ก"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, fuzzy, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estonian"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบรัสเซีย)"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบละติน)"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "กรีก"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr ""
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr ""
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr ""
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "อังการี"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Croatian"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr ""
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "อิสราเอล"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "อิลราเอล (โฟเนติค)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iranian"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "ไอซ์แลนด์"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "อิตาลี"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr ""
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Japanese 106 keys"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, fuzzy, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "ปฎิทิน"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Korean keyboard"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, fuzzy, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "อังกฤษ"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "ละตินอเมริกา"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, fuzzy, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "ตำแหน่ง"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lithuanian AZERTY (old)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lithuanian AZERTY (new)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "ลิธัวเนีย \"แถวตัวเลข\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "ลิธัวเนีย \"โฟเนติค\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, fuzzy, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "ตำแหน่ง"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr ""
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macedonian"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr ""
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, fuzzy, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr ""
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr ""
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "ฮอลแลนด์"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr ""
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "โปรตุเกส"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "คานาดา (ควิเบค)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr ""
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr ""
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "รัสเซีย (โฟเนติค)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, fuzzy, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr ""
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "สโลวาเนีย"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "สโลวาเกีย (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "สโลวาเกีย (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, fuzzy, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, fuzzy, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "พอร์ตอนุกรม"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, fuzzy, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, fuzzy, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "เบลเยี่ยม"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr ""
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, fuzzy, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "ไทย"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, fuzzy, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "ไทย"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "ตุรกี (โมเดลแบบแผน \"F\")"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "ตุรกี (โมเดลสมัยใหม่ \"Q\")"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "ยูเครน"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "คีย์บอร์ดอเมริกัน (นานาชาติ)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, fuzzy, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Azerbaidjani (cyrillic)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, fuzzy, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "ยูโกสลาเวีย (เลย์เอ้าท์แบบละติน)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr ""
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -6661,7 +6932,7 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -6669,1164 +6940,1188 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, fuzzy, c-format
-msgid "Afghanistan"
-msgstr "Iranian"
-
-#: lang.pm:170
+#: lang.pm:182
 #, fuzzy, c-format
 msgid "Andorra"
 msgstr "ยกเลิก"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr ""
 
-#: lang.pm:172
+#: lang.pm:184
+#, fuzzy, c-format
+msgid "Afghanistan"
+msgstr "Iranian"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr ""
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr ""
 
-#: lang.pm:174
+#: lang.pm:187
 #, fuzzy, c-format
 msgid "Albania"
 msgstr "Iranian"
 
-#: lang.pm:175
+#: lang.pm:188
 #, fuzzy, c-format
 msgid "Armenia"
 msgstr "อาร์เมเนียน (เก่า)"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr ""
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr ""
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr ""
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr ""
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, fuzzy, c-format
 msgid "Australia"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:183
+#: lang.pm:196
 #, fuzzy, c-format
 msgid "Aruba"
 msgstr "Grub"
 
-#: lang.pm:184
+#: lang.pm:197
 #, fuzzy, c-format
 msgid "Azerbaijan"
 msgstr "Iranian"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr ""
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr ""
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr ""
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, fuzzy, c-format
 msgid "Bulgaria"
 msgstr "อังการี"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr ""
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr ""
 
-#: lang.pm:193
+#: lang.pm:206
 #, fuzzy, c-format
 msgid "Benin"
 msgstr "เบลเยี่ยม"
 
-#: lang.pm:194
+#: lang.pm:207
 #, fuzzy, c-format
 msgid "Bermuda"
 msgstr "เยอรมัน"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr ""
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr ""
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr ""
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr ""
 
-#: lang.pm:201
+#: lang.pm:214
 #, fuzzy, c-format
 msgid "Botswana"
 msgstr "Estonian"
 
-#: lang.pm:202
+#: lang.pm:215
 #, fuzzy, c-format
 msgid "Belarus"
 msgstr "Belarusian"
 
-#: lang.pm:203
+#: lang.pm:216
 #, fuzzy, c-format
 msgid "Belize"
 msgstr "เปลี่ยนขนาด"
 
-#: lang.pm:204
+#: lang.pm:217
 #, fuzzy, c-format
 msgid "Canada"
 msgstr "ปฎิทิน"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr ""
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr ""
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr ""
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr ""
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr ""
 
-#: lang.pm:212
+#: lang.pm:225
 #, fuzzy, c-format
 msgid "Chile"
 msgstr "เลือก file"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr ""
 
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
 #, c-format
 msgid "China"
 msgstr "จีน"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr ""
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr ""
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr ""
 
-#: lang.pm:218
+#: lang.pm:232
 #, fuzzy, c-format
 msgid "Cape Verde"
 msgstr "ยุบ tree"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr ""
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr ""
 
-#: lang.pm:223
+#: lang.pm:237
 #, fuzzy, c-format
 msgid "Djibouti"
 msgstr "เลิก"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr ""
 
-#: lang.pm:225
+#: lang.pm:239
 #, fuzzy, c-format
 msgid "Dominica"
 msgstr "โดเมน NIS"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr ""
 
-#: lang.pm:227
+#: lang.pm:241
 #, fuzzy, c-format
 msgid "Algeria"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr ""
 
-#: lang.pm:229
+#: lang.pm:243
 #, fuzzy, c-format
 msgid "Estonia"
 msgstr "Estonian"
 
-#: lang.pm:230
+#: lang.pm:244
 #, fuzzy, c-format
 msgid "Egypt"
 msgstr "ว่าง"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr ""
 
-#: lang.pm:232
+#: lang.pm:246
 #, fuzzy, c-format
 msgid "Eritrea"
 msgstr "ส่วนของผู้เชี่ยวชาญ"
 
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
 #, fuzzy, c-format
 msgid "Spain"
 msgstr "สเปน"
 
-#: lang.pm:234
+#: lang.pm:248
 #, fuzzy, c-format
 msgid "Ethiopia"
 msgstr "Estonian"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
-#: lang.pm:236
+#: lang.pm:250
 #, fuzzy, c-format
 msgid "Fiji"
 msgstr "ฟินแลนด์"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr ""
 
-#: lang.pm:238
+#: lang.pm:252
 #, fuzzy, c-format
 msgid "Micronesia"
 msgstr "Macedonian"
 
-#: lang.pm:239
+#: lang.pm:253
 #, fuzzy, c-format
 msgid "Faroe Islands"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr ""
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "อังกฤษ"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr ""
 
-#: lang.pm:244
+#: lang.pm:258
 #, fuzzy, c-format
 msgid "Georgia"
 msgstr "นอร์เวย์"
 
-#: lang.pm:245
+#: lang.pm:259
 #, fuzzy, c-format
 msgid "French Guiana"
 msgstr "ฝรั่งเศษ"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr ""
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr ""
 
-#: lang.pm:248
+#: lang.pm:262
 #, fuzzy, c-format
 msgid "Greenland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr ""
 
-#: lang.pm:250
+#: lang.pm:264
 #, fuzzy, c-format
 msgid "Guinea"
 msgstr "ทั่วไป"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr ""
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr ""
 
-#: lang.pm:255
+#: lang.pm:269
 #, fuzzy, c-format
 msgid "Guatemala"
 msgstr "เกตเวย์"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr ""
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr ""
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr ""
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr ""
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr ""
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr ""
 
-#: lang.pm:262
+#: lang.pm:276
 #, fuzzy, c-format
 msgid "Croatia"
 msgstr "Croatian"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr ""
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, fuzzy, c-format
 msgid "Hungary"
 msgstr "อังการี"
 
-#: lang.pm:265
+#: lang.pm:279
 #, fuzzy, c-format
 msgid "Indonesia"
 msgstr "ไม่มี"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "Ireland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:267
+#: lang.pm:281
 #, fuzzy, c-format
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: lang.pm:268
+#: lang.pm:282
 #, fuzzy, c-format
 msgid "India"
 msgstr "Iranian"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr ""
 
-#: lang.pm:271
+#: lang.pm:285
 #, fuzzy, c-format
 msgid "Iran"
 msgstr "Iranian"
 
-#: lang.pm:272
+#: lang.pm:286
 #, fuzzy, c-format
 msgid "Iceland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr ""
 
-#: lang.pm:275
+#: lang.pm:289
 #, fuzzy, c-format
 msgid "Jordan"
 msgstr "Iranian"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "ญี่ปุ่น"
 
-#: lang.pm:277
+#: lang.pm:291
 #, fuzzy, c-format
 msgid "Kenya"
 msgstr "คีย์บอร์ด"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr ""
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr ""
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr ""
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr ""
 
-#: lang.pm:284
+#: lang.pm:298
 #, fuzzy, c-format
 msgid "Korea"
 msgstr "More"
 
-#: lang.pm:285
+#: lang.pm:299
 #, fuzzy, c-format
 msgid "Kuwait"
 msgstr "ออก"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr ""
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr ""
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr ""
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr ""
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr ""
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr ""
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr ""
 
-#: lang.pm:293
+#: lang.pm:307
 #, fuzzy, c-format
 msgid "Liberia"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr ""
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr ""
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr ""
 
-#: lang.pm:297
+#: lang.pm:311
 #, fuzzy, c-format
 msgid "Latvia"
 msgstr "ตำแหน่ง"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr ""
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr ""
 
-#: lang.pm:300
+#: lang.pm:314
 #, fuzzy, c-format
 msgid "Monaco"
 msgstr "จอภาพ"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr ""
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr ""
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr ""
 
-#: lang.pm:304
+#: lang.pm:318
 #, fuzzy, c-format
 msgid "Macedonia"
 msgstr "Macedonian"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr ""
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr ""
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr ""
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr ""
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr ""
 
-#: lang.pm:311
+#: lang.pm:325
 #, fuzzy, c-format
 msgid "Montserrat"
 msgstr "พอร์ตของเม้าส์"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr ""
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr ""
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr ""
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr ""
 
-#: lang.pm:316
+#: lang.pm:330
 #, fuzzy, c-format
 msgid "Mexico"
 msgstr "Mouse"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr ""
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr ""
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr ""
 
-#: lang.pm:320
+#: lang.pm:334
 #, fuzzy, c-format
 msgid "New Caledonia"
 msgstr "Macedonian"
 
-#: lang.pm:321
+#: lang.pm:335
 #, fuzzy, c-format
 msgid "Niger"
 msgstr "สูง"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr ""
 
-#: lang.pm:323
+#: lang.pm:337
 #, fuzzy, c-format
 msgid "Nigeria"
 msgstr "พอร์ตอนุกรม"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr ""
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr ""
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr ""
 
-#: lang.pm:329
+#: lang.pm:343
 #, fuzzy, c-format
 msgid "Niue"
 msgstr "NoVideo"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr ""
 
-#: lang.pm:331
+#: lang.pm:345
 #, fuzzy, c-format
 msgid "Oman"
 msgstr "โดเมน NIS"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr ""
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr ""
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr ""
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr ""
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr ""
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr ""
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, fuzzy, c-format
 msgid "Poland"
 msgstr "ไอซ์แลนด์"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr ""
 
-#: lang.pm:340
+#: lang.pm:354
 #, fuzzy, c-format
 msgid "Pitcairn"
 msgstr "เครื่องพิมพ์"
 
-#: lang.pm:341
+#: lang.pm:355
 #, fuzzy, c-format
 msgid "Puerto Rico"
 msgstr "Protocol"
 
-#: lang.pm:342
+#: lang.pm:356
 #, fuzzy, c-format
 msgid "Palestine"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, fuzzy, c-format
 msgid "Portugal"
 msgstr "Port"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr ""
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr ""
 
-#: lang.pm:346
+#: lang.pm:360
 #, fuzzy, c-format
 msgid "Qatar"
 msgstr "สถานะ:"
 
-#: lang.pm:347
+#: lang.pm:361
 #, fuzzy, c-format
 msgid "Reunion"
 msgstr "ขนาดจอภาพ"
 
-#: lang.pm:348
+#: lang.pm:362
 #, fuzzy, c-format
 msgid "Romania"
 msgstr "โดเมน NIS"
 
-#: lang.pm:349
+#: lang.pm:363
 #, fuzzy, c-format
 msgid "Russia"
 msgstr "รัสเซีย"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr ""
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr ""
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr ""
 
-#: lang.pm:353
+#: lang.pm:367
 #, fuzzy, c-format
 msgid "Seychelles"
 msgstr "เชลล์ที่ใช้"
 
-#: lang.pm:354
+#: lang.pm:368
 #, fuzzy, c-format
 msgid "Sudan"
 msgstr "SunOS"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr ""
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr ""
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, fuzzy, c-format
 msgid "Slovenia"
 msgstr "สโลวาเนีย"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr ""
 
-#: lang.pm:360
+#: lang.pm:374
 #, fuzzy, c-format
 msgid "Slovakia"
 msgstr "สโลวาเนีย"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr ""
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr ""
 
-#: lang.pm:363
+#: lang.pm:377
 #, fuzzy, c-format
 msgid "Senegal"
 msgstr "enable"
 
-#: lang.pm:364
+#: lang.pm:378
 #, fuzzy, c-format
 msgid "Somalia"
 msgstr "โดเมน NIS"
 
-#: lang.pm:365
+#: lang.pm:379
 #, fuzzy, c-format
 msgid "Suriname"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr ""
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr ""
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr ""
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr ""
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr ""
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr ""
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr ""
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr ""
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr ""
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr ""
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr ""
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr ""
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr ""
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr ""
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr ""
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr ""
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr ""
 
-#: lang.pm:384
+#: lang.pm:398
 #, fuzzy, c-format
 msgid "Taiwan"
 msgstr "ตำแหน่ง"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr ""
 
-#: lang.pm:386
+#: lang.pm:400
 #, fuzzy, c-format
 msgid "Ukraine"
 msgstr "ยูเครน"
 
-#: lang.pm:387
+#: lang.pm:401
 #, fuzzy, c-format
 msgid "Uganda"
 msgstr "Update"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr ""
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr ""
 
-#: lang.pm:392
+#: lang.pm:406
 #, fuzzy, c-format
 msgid "Vatican"
 msgstr "ตำแหน่ง"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr ""
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr ""
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr ""
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr ""
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr ""
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr ""
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr ""
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr ""
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr ""
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr ""
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr ""
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr ""
 
-#: lang.pm:406
+#: lang.pm:419
 #, fuzzy, c-format
 msgid "Zimbabwe"
 msgstr "อาจจะ"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, fuzzy, c-format
+msgid "You should install the following packages: %s"
+msgstr "กำลังติดตั้งแพ็คเก็จ %s"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ""
+
+#: lang.pm:1101
 #, c-format
 msgid "Welcome to %s"
 msgstr "ยินดีต้อนรับสู่ %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Circular mounts %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "ลบ logical volume ก่อน\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Parameters"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr ""
@@ -7842,8 +8137,8 @@ msgid "You can configure each parameter of the module here."
 msgstr ""
 
 #: modules/interactive.pm:63
-#, c-format
-msgid "Found %s %s interfaces"
+#, fuzzy, c-format
+msgid "Found %s interfaces"
 msgstr "ตรวจพบ %s อินเทอร์เฟส %s"
 
 #: modules/interactive.pm:64
@@ -7897,12 +8192,12 @@ msgid "Module options:"
 msgstr "อ๊อปชั่นของโมดูล:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "ต้องการให้โปรแกรมทดลองใช้ไดรเวอร์ %s ชนิดใด?"
 
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -7919,17 +8214,17 @@ msgstr ""
 "ตรวจหาข้อมูลที่จำเป็นต้องใช้? ในบางกรณีการตรวจหาอาจทำให้คอมพิวเตอร์แฮงค์\n"
 "แต่จะไม่เป็นอันตรายกับคอมพิวเตอร์"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "ตรวจหาอัตโนมัติ"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "ระบุอ๊อปชั่น"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -7988,11 +8283,11 @@ msgstr "Generic PS2 Wheel Mouse"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
 #, fuzzy, c-format
 msgid "Automatic"
 msgstr "กำหนดค่า IP แบบอัตโนมัติ"
@@ -8137,50 +8432,55 @@ msgstr "ออกจากการติดตั้ง"
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr ""
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "ไม่มี"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "ไม่มีเม้าส์"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "เพื่อให้เม้าส์ทำงาน"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "เลื่อนล้อของคุณ"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "ใช้ pppoe"
+msgid "use PPPoE"
+msgstr "ใช้ PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "ใช้ pptp"
+msgid "use PPTP"
+msgstr "ใช้ PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
-msgstr "ใช้ dhcp"
+msgid "use DHCP"
+msgstr "ใช้ DHCP"
 
 #: network/adsl.pm:22
-#, c-format
-msgid "Alcatel speedtouch usb"
-msgstr ""
+#, fuzzy, c-format
+msgid "Alcatel Speedtouch USB"
+msgstr "กรุณาทดสอบเม้าส์"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, fuzzy, c-format
@@ -8189,36 +8489,36 @@ msgstr "ค้นพบ %s"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
+msgid "Sagem (using PPPoA) USB"
 msgstr ""
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
+msgid "Sagem (using DHCP) USB"
 msgstr ""
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "ต่อเข้า Internet "
 
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
 #, 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 don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
 msgstr ""
 "การติดต่อโดยทั่วไปของ adsl คือ pppoe.\n"
-"บางครั้งอาจใช้  pptp มีน้อยคนที่ใช้  dhcp.\n"
-"ถ้าคุณไม่ทราบ เลือก 'use pppoe'"
+"บางครั้งอาจใช้  pptp มีน้อยคนที่ใช้  DHCP.\n"
+"ถ้าคุณไม่ทราบ เลือก 'use PPPoE'"
 
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, fuzzy, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "LAN connection"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, fuzzy, c-format
 msgid "Web Server"
 msgstr "เซิร์ฟเวอร์"
@@ -8330,106 +8630,107 @@ msgstr ""
 msgid "Other ports"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr ""
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "ผมไม่ทราบ"
 
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
 #, c-format
 msgid "USB"
 msgstr ""
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
 #, fuzzy, c-format
 msgid "Manual"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
 #, fuzzy, c-format
 msgid "Manual choice"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Internal ISDN card"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:99
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mouse"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "เรียกคืนจากไฟล์"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, fuzzy, c-format
 msgid "Secondary"
 msgstr "%d วินาที"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, fuzzy, c-format
 msgid "Auto"
 msgstr "เลิก"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, fuzzy, c-format
 msgid "Manual configuration"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, fuzzy, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "กำหนดค่า IP แบบอัตโนมัติ"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr ""
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, fuzzy, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Rest of the world"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, fuzzy, c-format
 msgid "European protocol (EDSS1)"
 msgstr "ยุโรป (EDS11)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, fuzzy, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -8438,163 +8739,168 @@ msgstr ""
 "Rest of the world \n"
 "No D-Channel (leased lines)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, fuzzy, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, fuzzy, c-format
 msgid "Sagem USB modem"
 msgstr "System mode"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr ""
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr ""
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr ""
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, fuzzy, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr ""
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr ""
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr ""
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
 #, fuzzy, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, fuzzy, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Ethernet Card"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr ""
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr ""
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
+msgid "PPPoA LLC"
 msgstr ""
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
+msgid "PPPoA VC"
 msgstr ""
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "รูปแบบสคริปต์"
 
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
 #, c-format
 msgid "Terminal-based"
 msgstr "รูปแบบเทอร์มินอล"
 
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
 #, c-format
 msgid "CHAP"
 msgstr ""
 
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
 #, c-format
 msgid "PAP/CHAP"
 msgstr ""
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, 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:236
+#: network/netconnect.pm:244
 #, fuzzy, c-format
 msgid "(detected %s)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, fuzzy, c-format
 msgid "(detected)"
 msgstr "ค้นพบ %s"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, fuzzy, c-format
 msgid "Modem connection"
 msgstr "การติดต่อโดยใช้ Modem ธรรมดา"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "การติดต่อโดยใช้ ISDN"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, fuzzy, c-format
 msgid "ADSL connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "cable connection"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "LAN connection"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, fuzzy, c-format
 msgid "Wireless connection"
 msgstr "cable connection"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, fuzzy, c-format
 msgid "Choose the connection you want to configure"
 msgstr "เลือกเครื่องมือที่คุณต้องการใช้"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, fuzzy, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -8605,131 +8911,130 @@ msgstr ""
 "\n"
 "คุณสามารถเลิกติดต่อหรือทำการปรับแต่งการติดต่อของคุณใหม่"
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "การคอนฟิก Connection"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "กรุณาเลือกช่องข้างล่างนี้"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "Card IRQ"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Card mem (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "Card IO"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "Card IO_0"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "Card IO_1"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "เบอร์โทรศัพท์ส่วนตัว"
 
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "ชื่อผู้ให้บริการ (ex KSC)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "ผู้ให้บริการ dns 1 (optional)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, fuzzy, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "ผู้ให้บริการ dns 2 (optional)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "การหมุนโทรศัพท์ด้วยโมเด็ม"
 
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
 #, fuzzy, c-format
 msgid "Connection speed"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, fuzzy, c-format
 msgid "Connection timeout (in sec)"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account Login (user name)"
 
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
 #, c-format
 msgid "Account Password"
 msgstr "รหัสผ่าน"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, fuzzy, c-format
 msgid "Select the network interface to configure:"
 msgstr "เลือก network interface"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "External ISDN modem"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, fuzzy, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "การคอนฟิก ISDN"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "คุณมีการ์ดชนิดใด?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -8743,34 +9048,48 @@ msgstr ""
 "\n"
 "ถ้าคุณมีการ์ด PCMCIA คุณต้องรู้ irq และ io ของการ์ดของคุณ\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "ทำงานต่อหรือไม่?"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "เลิก"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, fuzzy, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "คุณใช้การ์ด ISDN ใด?"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Driver"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Protocol ไหนที่คุณต้องการ"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -8779,135 +9098,130 @@ msgstr ""
 "เลือกผู้ให้บริการ\n"
 "ถ้าไม่มีเลือก ไม่มี (unlisted)"
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, fuzzy, c-format
 msgid "Provider:"
 msgstr "Profile: "
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, fuzzy, c-format
 msgid "Select the modem to configure:"
 msgstr "เลือก network interface"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr ""
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
 #, fuzzy, c-format
 msgid "Select your provider:"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, fuzzy, c-format
 msgid "Dialup: account options"
 msgstr "อ็อปชั่นของการหมุนโทรศัพท์"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "ชื่อการเชื่อมต่อ"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "หมายเลขโทรศัพท์"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "หมายเลขประจำตัวการล็อกอิน"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, fuzzy, c-format
 msgid "Dialup: IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, fuzzy, c-format
 msgid "IP parameters"
 msgstr "Parameters"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, fuzzy, c-format
 msgid "Subnet mask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr ""
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, fuzzy, c-format
 msgid "DNS"
 msgstr "ใช้ NIS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "ชื่อโดเมน"
 
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
 
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องที่สอง (optional)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, fuzzy, c-format
 msgid "Set hostname from IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "เกตเวย์"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, fuzzy, c-format
 msgid "Gateway IP address"
 msgstr "ค่า IP"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, fuzzy, c-format
 msgid "ADSL configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, fuzzy, c-format
 msgid "Please choose your ADSL provider"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8915,32 +9229,32 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, fuzzy, c-format
 msgid "Use a floppy"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, fuzzy, c-format
 msgid "Use my Windows partition"
 msgstr "คำนวณขอบเขตของระบบไฟล์ Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr ""
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr ""
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr ""
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -8949,22 +9263,22 @@ msgid ""
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr ""
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr ""
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, fuzzy, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "ขอแสดงความยินดี"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -8973,24 +9287,24 @@ msgid ""
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr ""
 
-#: network/netconnect.pm:844
-#, c-format
+#: network/netconnect.pm:898
+#, fuzzy, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
 msgstr ""
 "คำเตือน: อุปกรณ์นี้ได้ถูกปรับแต่งให้ใช้ในการต่อเข้า internet\n"
 "คุณสามารถยอมรับค่าต่างๆหรือทำการแก้ใขค่าต่างๆข้างล่างนี้\n"
 " "
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, fuzzy, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -9000,24 +9314,24 @@ msgstr ""
 "\n"
 "ค่าต่างๆจะถูกนำไปใช้เดี๋ยวนี้\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, fuzzy, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, fuzzy, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "กำลังคอนฟิกอุปกรณ์เน็ตเวิร์ก %s"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
 "Please choose the one you want to use"
 msgstr ""
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -9028,108 +9342,114 @@ msgstr ""
 "ข้อมูลแต่ละอย่างสามารถใส่เข้าไปได้โดยใช้ค่า IP ในรูปแบบตัวเลขคั่นด้วยจุด\n"
 "(dotted-decimal notation) ตัวอย่างเช่น 1.2.3.4"
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, fuzzy, c-format
 msgid "Assign host name from DHCP address"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "เน็ตมาสก์"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr ""
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, fuzzy, c-format
 msgid "Start at boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr ""
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr ""
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr ""
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Network interface"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, 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:988
+#: network/netconnect.pm:1049
 #, 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:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -9143,33 +9463,33 @@ msgid ""
 "or off."
 msgstr ""
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Workstation ที่ทำงาน"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
 "as the hostname).\n"
 "\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -9181,12 +9501,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr ""
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -9204,27 +9524,7 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"ไม่พบการ์ด ethernet \n"
-"ผมไม่สามารถจัดทำการติดต่อชนิดนี้"
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "เลือก network interface"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "กรุณาเลือก Network Adaptor สำหรับการต่อเข้า Internet"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -9237,84 +9537,86 @@ msgstr ""
 "ตัวอย่างเช่น ``mybox.mylab.yco.com''\n"
 "คุณอาจจะใส่ค่า IP ของเกตเวย์ด้วยถ้าคุณมีเครื่องที่ทำหน้าที่เป็นเกตเวย์อยู่"
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
 
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, fuzzy, c-format
 msgid "Host name (optional)"
 msgstr "การคอนฟิก"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, fuzzy, c-format
 msgid "DNS server 1"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, fuzzy, c-format
 msgid "DNS server 2"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, fuzzy, c-format
 msgid "DNS server 3"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, fuzzy, c-format
 msgid "Search domain"
 msgstr "โดเมน NIS"
 
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr ""
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "อุปกรณ์เกตเวย์"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, fuzzy, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, fuzzy, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, fuzzy, c-format
 msgid "Zeroconf Host name"
 msgstr "ชื่อโฮสต์:"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr ""
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -9322,62 +9624,82 @@ msgid ""
 "\n"
 msgstr ""
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, fuzzy, c-format
 msgid "Internet connection"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, fuzzy, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
-msgstr "XFree ชนิดใหนที่คุณต้องการมี"
+msgid "Configuration is complete, do you want to apply settings?"
+msgstr "Xorg ชนิดใหนที่คุณต้องการมี"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
 #, fuzzy, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "Automatically at boot"
+msgstr "เริ่มทำงานตอน boot"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+
+#: network/netconnect.pm:1271
+#, fuzzy, c-format
+msgid "How do you want to dial this connection?"
+msgstr "คุณต้องการต่อตอน boot หรือไม่"
+
+#: network/netconnect.pm:1284
+#, fuzzy, c-format
+msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
 #, fuzzy, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
 "\n"
 "%s"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "คุณต้องการทดสอบต่อเข้า Internet เดี๋ยวนี้หรือไม่"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "ทดสอบ connection..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, fuzzy, c-format
 msgid "The system is now connected to the Internet."
 msgstr "ติดต่อเข้า Internet เรียบร้อย"
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, fuzzy, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "เพื่อความปลอดภัย มันจะหยุดการติดต่อเดี๋ยวนี้"
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, fuzzy, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -9386,7 +9708,7 @@ msgstr ""
 "ไม่สามารถต่อเข้า Internet \n"
 "ลองทำการคอนฟิกใหม่อีกครั้ง"
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -9395,15 +9717,15 @@ msgstr ""
 "เมื่อทุกอย่างเสร็จสิ้น ผมแนะนำให้ท่านเริ่มทำงาน X windows ใหม่\n"
 "เพื่อป้องกันปัญหา hostname ที่อาจเกิดขึ้นได้"
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
 
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -9414,34 +9736,34 @@ msgstr ""
 "เนื่องจากคุณใช้การติดตั้งแบบ network ระบบ network จึงใช้ได้อยู่แล้ว\n"
 "กด OK เพื่อรักษาค่าคอนฟิกเดิมไว้ หรือเลือก ยกเลิกเพื่อปรับแต่งใหม่\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "การคอนฟิก Proxies"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP proxy"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP proxy"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "ค่าของ Proxy ควรจะเป็น http://..."
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, fuzzy, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "ค่าของ Proxy ควรจะเป็น http://..."
@@ -9458,7 +9780,7 @@ msgid ""
 "need some manual fixes after installation."
 msgstr ""
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -9469,34 +9791,34 @@ msgid ""
 "\t\tippp+ for a isdn connection.\n"
 msgstr ""
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, fuzzy, c-format
 msgid "Insert floppy"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, fuzzy, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ที่ format แบบ FAT ลงในไดรว์ %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, fuzzy, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: partition_table.pm:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "การเม้าท์ล้มเหลว: "
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Extended partition not supported on this platform"
 
-#: partition_table.pm:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -9506,22 +9828,22 @@ msgstr ""
 "คุณมีช่องว่างในตารางพาร์ติชั่น  แต่โปรแกรมจะไม่ใช้งานช่องว่างนั้น\n"
 "การแก้ไขปัญหาสามารถทำได้โดยย้ายไพรมารีพาร์ติชั่น เพื่อให้ช่องว่าไปต่อท้ายพาร์ติชั่นแบบ extended"
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "การกู้คืนจากไฟล์ %s ล้มเหลว: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, fuzzy, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -9533,27 +9855,27 @@ msgstr ""
 "สอบความถูกต้องของข้อมูลได้\n"
 "นั่นหมายความว่าการเขียนข้อมูลลงไปอาจกลายเป็นขยะ"
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "ต้องมี"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "สำคัญ"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "ดีมาก"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "ดี"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "อาจจะ"
@@ -9568,7 +9890,7 @@ msgstr "(โมดูล %s)"
 msgid "(on this machine)"
 msgstr ""
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, fuzzy, c-format
 msgid "Configured on other machines"
 msgstr "ปรับแต่งการบริการต่างๆ"
@@ -9578,357 +9900,362 @@ msgstr "ปรับแต่งการบริการต่างๆ"
 msgid "On CUPS server \"%s\""
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
 msgstr " (Default)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr ""
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr ""
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr ""
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr ""
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr ""
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr ""
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr ""
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr ""
+
+#: printer/data.pm:133
+#, fuzzy, c-format
+msgid "Remote CUPS"
+msgstr "Remote CUPS server"
+
 #: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr ""
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, fuzzy, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Remote CUPS server"
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, fuzzy, c-format
 msgid "Printer on remote lpd server"
 msgstr "รีโมต lpd"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, fuzzy, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, fuzzy, c-format
 msgid "Printer on NetWare server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
 #, fuzzy, c-format
 msgid "Enter a printer device URI"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr ""
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
 #, c-format
 msgid "Unknown model"
 msgstr ""
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, fuzzy, c-format
 msgid "Configured on this machine"
 msgstr "คอนฟิกเม้าส์"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ""
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, fuzzy, c-format
 msgid ", USB printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ""
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, fuzzy, c-format
 msgid ", multi-function device on a parallel port"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ""
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, fuzzy, c-format
 msgid ", printing to %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr ""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr ""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ""
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, fuzzy, c-format
 msgid "Parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, fuzzy, c-format
 msgid "USB printer #%s"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, fuzzy, c-format
 msgid "USB printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, fuzzy, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, fuzzy, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr ""
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr ""
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr ""
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, fuzzy, c-format
 msgid "Prints into %s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, fuzzy, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr ""
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, fuzzy, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, fuzzy, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, fuzzy, c-format
 msgid "Uses command %s"
 msgstr "Port"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr ""
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr ""
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, fuzzy, c-format
 msgid "Local network(s)"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, fuzzy, c-format
 msgid "Interface \"%s\""
 msgstr "Interface %s"
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, fuzzy, c-format
 msgid "Network %s"
 msgstr "Network interface"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, fuzzy, c-format
 msgid "Host %s"
 msgstr "ชื่อโฮสต์:"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, fuzzy, c-format
 msgid "%s (Port %s)"
 msgstr "Port"
 
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
 "on. Download the Windows driver package from the HP web site (the firmware "
 "on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
 "searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
 "printer' directory. There it will be found by the automatic uploader script "
 "and uploaded whenever the printer is connected and turned on.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, fuzzy, c-format
 msgid "CUPS printer configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
 "automatically made available on this machine."
 msgstr ""
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr ""
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr ""
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, fuzzy, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "เครื่องพิมพ์"
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, fuzzy, c-format
 msgid "Custom configuration"
 msgstr "การคอนฟิก"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, fuzzy, c-format
 msgid "No remote machines"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, fuzzy, c-format
 msgid "Additional CUPS servers: "
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: printer/printerdrake.pm:93
-#, fuzzy, c-format
-msgid "None"
-msgstr "ทำเรียบร้อยแล้ว"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -9941,29 +10268,29 @@ msgid ""
 "information from the server(s)."
 msgstr ""
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, fuzzy, c-format
 msgid "Japanese text printing mode"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, fuzzy, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Boot Style Configuration"
 
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -9980,73 +10307,99 @@ msgid ""
 "but then you have to take care of these points."
 msgstr ""
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, fuzzy, c-format
+msgid "On"
+msgstr "โดเมน NIS"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr ""
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, fuzzy, c-format
 msgid "Sharing of local printers"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
 "(s) should be available:"
 msgstr ""
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr ""
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, fuzzy, c-format
 msgid "Remove selected host/network"
 msgstr "ลบคิว"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr ""
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
 "available:"
 msgstr ""
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr ""
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, fuzzy, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr "Remote CUPS server"
 
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -10054,102 +10407,118 @@ msgid ""
 "local network."
 msgstr ""
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, fuzzy, c-format
 msgid "Add server"
 msgstr "เพิ่มผู้ใช้"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, fuzzy, c-format
 msgid "Edit selected server"
 msgstr "ค้นพบ %s"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, fuzzy, c-format
 msgid "Remove selected server"
 msgstr "ลบคิว"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr ""
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, fuzzy, c-format
 msgid "Server IP missing!"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, fuzzy, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "ถูกต้องหรือไม่?"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
 #, fuzzy, c-format
 msgid "The port number should be an integer!"
 msgstr "Port number ควรเป็นตัวเลข"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "Port"
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, fuzzy, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "รีโมต lpd"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, fuzzy, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "ชื่อของเครื่องพิมพ์"
+
+#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
+#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
+#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
+#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
+#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
+#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
+#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
+#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
+#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
+#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
+#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
+#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
+#: printer/printerdrake.pm:4826 standalone/printerdrake:64
+#: standalone/printerdrake:84 standalone/printerdrake:566
 #, fuzzy, c-format
 msgid "Printerdrake"
 msgstr "เครื่องพิมพ์"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, fuzzy, c-format
+msgid "Reading printer data..."
+msgstr "อ่าน CUPS drivers database..."
+
+#: printer/printerdrake.pm:581
 #, fuzzy, c-format
 msgid "Restarting CUPS..."
 msgstr "จำเพาะ"
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "เครื่องพิมพ์เชื่อมต่ออย่างไร?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10160,7 +10529,7 @@ msgstr ""
 "ในตอนนี้  เครื่องพิมพ์จะถูกค้นหาเอง\n"
 "กรณีมีข้อสงสัย กรุณาเลือก \"Remote CUPS server\""
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -10168,28 +10537,28 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, fuzzy, c-format
 msgid "Checking your system..."
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, fuzzy, c-format
 msgid "and one unknown printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, fuzzy, c-format
 msgid "and %d unknown printers"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, fuzzy, c-format
 msgid ""
 "The following printers\n"
@@ -10198,7 +10567,7 @@ msgid ""
 "are directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, fuzzy, c-format
 msgid ""
 "The following printer\n"
@@ -10207,7 +10576,7 @@ msgid ""
 "are directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, fuzzy, c-format
 msgid ""
 "The following printer\n"
@@ -10216,102 +10585,96 @@ msgid ""
 "is directly connected to your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
 "There are %d unknown printers directly connected to your system"
 msgstr ""
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr ""
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, fuzzy, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, fuzzy, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
 #, fuzzy, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "คุณต้องการต่อตอน boot หรือไม่"
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
 "additional software will be installed."
 msgstr ""
 
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
 #, fuzzy, c-format
 msgid "Searching for new printers..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, fuzzy, c-format
-msgid "Configuring printer ..."
-msgstr "การคอนฟิกเครื่องพิมพ์"
-
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, fuzzy, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "การคอนฟิกเครื่องพิมพ์"
+msgid "Found printer on %s..."
+msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr ""
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr ""
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ""
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, fuzzy, c-format
 msgid "Printer model selection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, fuzzy, c-format
 msgid "Which printer model do you have?"
 msgstr "คุณมีเครื่องพิมพ์ชนิดใด?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -10320,28 +10683,31 @@ msgid ""
 "choose the correct model from the list."
 msgstr ""
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
+#, fuzzy, c-format
+msgid "Configuring printer on %s..."
+msgstr "การคอนฟิกเครื่องพิมพ์"
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
 #, fuzzy, c-format
-msgid "Configuring applications..."
+msgid "Configuring printer \"%s\"..."
 msgstr "การคอนฟิกเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, fuzzy, c-format
 msgid "Add a new printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -10355,7 +10721,7 @@ msgid ""
 "connection types."
 msgstr ""
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -10377,7 +10743,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -10393,7 +10759,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -10414,7 +10780,7 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -10430,22 +10796,22 @@ msgid ""
 "to set up your printer(s) now."
 msgstr ""
 
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
 #, fuzzy, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 
-#: printer/printerdrake.pm:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -10459,70 +10825,70 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the %s Control Center."
 msgstr ""
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
 #, fuzzy, c-format
 msgid "Could not install the %s packages!"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr ""
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, fuzzy, c-format
 msgid "Printer auto-detection"
 msgstr "ใช้ auto detection"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "กำลังตรวจสอบอุปกรณ์..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, fuzzy, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, fuzzy, c-format
 msgid "Detected %s"
 msgstr "ค้นพบ %s"
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
 #, fuzzy, c-format
 msgid "Printer on parallel port #%s"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, fuzzy, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, fuzzy, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "SMB/วินโดวส์ 95/98/NT"
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, fuzzy, c-format
 msgid "Local Printer"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -10531,64 +10897,64 @@ msgid ""
 "printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, fuzzy, c-format
 msgid "You must enter a device or file name!"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, fuzzy, c-format
 msgid "No printer found!"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, fuzzy, c-format
 msgid "Local Printers"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, fuzzy, c-format
 msgid "Available printers"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, fuzzy, c-format
 msgid "The following printer was auto-detected. "
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
 "the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr ""
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
 "name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
 "device name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -10596,12 +10962,12 @@ msgid ""
 "configuration, turn on \"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr ""
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -10610,50 +10976,50 @@ msgid ""
 "\"Manual configuration\"."
 msgstr ""
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, fuzzy, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, fuzzy, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
 
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
 #, fuzzy, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
 #, fuzzy, c-format
 msgid "Aborting"
 msgstr "เลิก"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, fuzzy, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -10663,63 +11029,63 @@ msgstr ""
 "ของชื่อโฮสต์ที่ให้บริการเครื่องพิมพ์นั้น และชื่อคิวของเซิร์ฟเวอร์นั้น\n"
 "ซึ่งเป็นที่ๆงานพิมพ์จะถูกเก็บไว้"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
 #, fuzzy, c-format
 msgid "Remote host name"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, fuzzy, c-format
 msgid "Remote printer name"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, fuzzy, c-format
 msgid "Remote host name missing!"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, fuzzy, c-format
 msgid "Remote printer name missing!"
 msgstr "ชื่อโฮสต์รีโมท"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
 #, fuzzy, c-format
 msgid "Information"
 msgstr "แสดงข้อมูล"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, fuzzy, c-format
 msgid "Detected model: %s %s"
 msgstr "ค้นพบ %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, fuzzy, c-format
 msgid "Scanning network..."
 msgstr "ทดสอบ connection..."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ""
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
 #, fuzzy, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบ SMB (เครื่องพิมพ์ในระบบวินโดวส์ 9x/NT)"
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
 #, fuzzy, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -10733,54 +11099,54 @@ msgstr ""
 "ชื่อของเครื่องพิมพ์ที่ต้องการใช้ (share name) และชื่อของผู้ใช้ (username)\n"
 "รหัสผ่าน (password) และข้อมูลของเวิร์คกรุ๊ป (workgroup) ด้วย"
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "ชื่อโฮสต์ของ SMB server"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "ค่า IP ของ SMB เซิร์ฟเวอร์"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, fuzzy, c-format
 msgid "Auto-detected"
 msgstr "ใช้ auto detection"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr ""
 
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr ""
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -10804,7 +11170,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -10813,7 +11179,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -10822,12 +11188,12 @@ msgid ""
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์ในระบบเน็ตแวร์"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
 #, fuzzy, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -10840,49 +11206,49 @@ msgstr ""
 "โฮสต์แบบ TCP/IP) และข้อมูลชื่อคิวของเครื่องพิมพ์ที่ต้องการใช้\n"
 "รวมทั้งชื่อผู้ใช้และรหัสผ่านด้วย"
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "ชื่อพรินต์คิว"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr ""
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ""
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, fuzzy, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "อ็อปชั่นของเครื่องพิมพ์โลคอล"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
 #, fuzzy, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -10893,27 +11259,27 @@ msgstr ""
 "To print to a socket printer, you need to provide the\n"
 "hostname of the printer and optionally the port number."
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, fuzzy, c-format
 msgid "Printer host name or IP missing!"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, fuzzy, c-format
 msgid "Printer host name or IP"
 msgstr "ชื่อของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, fuzzy, c-format
 msgid "Refreshing Device URI list..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -10921,34 +11287,34 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr ""
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr ""
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, fuzzy, c-format
 msgid "Command line"
 msgstr "ชื่อโดเมน"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr ""
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -10956,115 +11322,115 @@ msgid ""
 "an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, fuzzy, c-format
 msgid "Installing HPOJ package..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr ""
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr ""
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, fuzzy, c-format
 msgid "Installing SANE packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, fuzzy, c-format
 msgid "Installing mtools packages..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr ""
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr ""
 
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr ""
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, fuzzy, c-format
 msgid "Reading printer database..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr ""
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
 "Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
 
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "ชื่อเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "รายละเอียด"
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Location"
 msgstr "ตำแหน่ง"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, fuzzy, c-format
 msgid "Preparing printer database..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, fuzzy, c-format
 msgid "Your printer model"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -11079,18 +11445,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, fuzzy, c-format
 msgid "The model is correct"
 msgstr "ถูกต้องหรือไม่?"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, fuzzy, c-format
 msgid "Select model manually"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -11100,38 +11466,38 @@ msgid ""
 "\"Raw printer\" is highlighted."
 msgstr ""
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr ""
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
 "delivered with the printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr ""
 
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
 
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -11139,65 +11505,58 @@ msgid ""
 "printer's hardware"
 msgstr ""
 
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
 
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
 #, fuzzy, c-format
 msgid "Install PPD file from"
 msgstr "ติดตั้ง"
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "ซีดี-รอม"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, fuzzy, c-format
 msgid "Floppy Disk"
 msgstr "บันทึกลงแผ่นฟล้อปปี้"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, fuzzy, c-format
 msgid "Other place"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, fuzzy, c-format
 msgid "Select PPD file"
 msgstr "เลือกไฟล์"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr ""
 
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr ""
 
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
 #, fuzzy, c-format
 msgid "Installing PPD file..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, fuzzy, c-format
 msgid "OKI winprinter configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -11208,12 +11567,12 @@ msgid ""
 "not work. Your connection type setting will be ignored by the driver."
 msgstr ""
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, fuzzy, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -11222,7 +11581,7 @@ msgid ""
 "to."
 msgstr ""
 
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -11235,12 +11594,12 @@ msgid ""
 "adjust the head alignment settings with this program."
 msgstr ""
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, fuzzy, c-format
 msgid "Lexmark X125 configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -11249,12 +11608,31 @@ msgid ""
 "connected to."
 msgstr ""
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, fuzzy, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "การปรับแต่ง LAN"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+
+#: printer/printerdrake.pm:2924
+#, fuzzy, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "การคอนฟิก"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr ""
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -11265,39 +11643,39 @@ msgid ""
 "printout quality/resolution printing can get substantially slower."
 msgstr ""
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, fuzzy, c-format
 msgid "Printer default settings"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr ""
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr ""
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, fuzzy, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, fuzzy, c-format
 msgid "Test pages"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -11306,57 +11684,57 @@ msgid ""
 "it is enough to print the standard test page."
 msgstr ""
 
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
 #, fuzzy, c-format
 msgid "No test pages"
 msgstr "ใช้ ให้พิมพ์กระดาษทดสอบทั้งสองแบบ"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, fuzzy, c-format
 msgid "Print"
 msgstr "เครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, fuzzy, c-format
 msgid "Standard test page"
 msgstr "เครื่องมีอ Standard"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr ""
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, fuzzy, c-format
 msgid "Alternative test page (A4)"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, fuzzy, c-format
 msgid "Photo test page"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, fuzzy, c-format
 msgid "Do not print any test page"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, fuzzy, c-format
 msgid "Could not install the %s package!"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, fuzzy, c-format
 msgid "Skipping photo test page."
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11372,7 +11750,7 @@ msgstr ""
 "\n"
 "มันทำงานถูกต้องใหมครับ"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, fuzzy, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -11382,17 +11760,17 @@ msgstr ""
 "กรุณารอสักครู่\n"
 "มันทำงานถูกต้องใหมครับ"
 
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr ""
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, fuzzy, c-format
 msgid "Raw printer"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -11401,7 +11779,7 @@ msgid ""
 "to modify the option settings easily.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -11409,8 +11787,8 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -11419,7 +11797,7 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -11427,22 +11805,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -11450,21 +11828,21 @@ msgid ""
 "because the file to print is provided by the application.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
 msgstr ""
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
 "<file>\" or \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -11475,7 +11853,7 @@ msgid ""
 "jams.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -11484,42 +11862,32 @@ msgid ""
 "line, e. g. \"%s <file>\".\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, fuzzy, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, fuzzy, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, fuzzy, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, fuzzy, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, fuzzy, c-format
-msgid "Close"
-msgstr "Mouse"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, fuzzy, c-format
 msgid "Print option list"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -11530,10 +11898,12 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
 msgstr ""
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -11547,18 +11917,13 @@ msgid ""
 "of the file lists."
 msgstr ""
 
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, fuzzy, c-format
-msgid "Reading printer data..."
-msgstr "อ่าน CUPS drivers database..."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, fuzzy, c-format
 msgid "Transfer printer configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -11568,33 +11933,33 @@ msgid ""
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr ""
 
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -11602,7 +11967,7 @@ msgid ""
 "or with native CUPS drivers cannot be transferred."
 msgstr ""
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -11610,17 +11975,17 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr ""
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr ""
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -11628,45 +11993,45 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, fuzzy, c-format
 msgid "New printer name"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr ""
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
 "the default printer under the new printing system %s?"
 msgstr ""
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, fuzzy, c-format
 msgid "Refreshing printer data..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, fuzzy, c-format
 msgid "Starting network..."
 msgstr "ทดสอบ connection..."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, fuzzy, c-format
 msgid "Configure the network now"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, fuzzy, c-format
 msgid "Network functionality not configured"
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -11675,12 +12040,12 @@ msgid ""
 "configuring now. How do you want to proceed?"
 msgstr ""
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, fuzzy, c-format
 msgid "Go on without configuring the network"
 msgstr "กำลังคอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -11690,7 +12055,7 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -11698,27 +12063,27 @@ msgid ""
 "printer again."
 msgstr ""
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, fuzzy, c-format
 msgid "Restarting printing system..."
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, fuzzy, c-format
 msgid "high"
 msgstr "สูง"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, fuzzy, c-format
 msgid "paranoid"
 msgstr "Paranoid"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr ""
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -11733,12 +12098,12 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, fuzzy, c-format
 msgid "Starting the printing system at boot time"
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -11752,67 +12117,150 @@ msgid ""
 "again?"
 msgstr ""
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr ""
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, fuzzy, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, fuzzy, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, fuzzy, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, fuzzy, c-format
 msgid "Could not install the %s printing system!"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+
+#: printer/printerdrake.pm:3950
+#, fuzzy, c-format
+msgid "Name or IP of remote server:"
+msgstr "รีโมต lpd"
+
+#: printer/printerdrake.pm:3970
 #, fuzzy, c-format
 msgid "Setting Default Printer..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, fuzzy, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Remote CUPS server"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr ""
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr ""
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr ""
+
+#: printer/printerdrake.pm:4018
+#, fuzzy, c-format
+msgid "Local CUPS printing system"
+msgstr "คอนฟิกระบบเน็ตเวิร์ก"
+
+#: printer/printerdrake.pm:4056
 #, fuzzy, c-format
 msgid "Select Printer Spooler"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, fuzzy, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "ประเภทของการพิมพ์ชนิดไหนที่คุณต้องการ"
 
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
 #, fuzzy, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "การคอนฟิกเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, fuzzy, c-format
 msgid "Installing Foomatic..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr ""
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, fuzzy, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -11822,184 +12270,157 @@ msgstr ""
 "ต่อไปนี้เป็นข้อมูลรอการพิมพ์\n"
 "คุณสามารถเพิ่มข้อมูลหรือแก้ไขข้อมูลที่มีได้"
 
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr ""
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
 #, fuzzy, c-format
 msgid "CUPS configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, fuzzy, c-format
 msgid "Change the printing system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "โหมดธรรมดา"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
 #, c-format
 msgid "Printer options"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, fuzzy, c-format
 msgid "Modify printer configuration"
 msgstr "การคอนฟิก Internet"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, fuzzy, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, fuzzy, c-format
+msgid "This printer is disabled"
+msgstr "พาร์ติชั่นนี้ไม่สามารถเปลี่ยนขนาดได้"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr ""
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, fuzzy, c-format
 msgid "Printer connection type"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, fuzzy, c-format
 msgid "Printer name, description, location"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr ""
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr ""
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr ""
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
-#, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
+#, fuzzy, c-format
+msgid "Enable Printer"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
-#, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
+#, fuzzy, c-format
+msgid "Disable Printer"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, fuzzy, c-format
 msgid "Print test pages"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, fuzzy, c-format
 msgid "Learn how to use this printer"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, fuzzy, c-format
 msgid "Remove printer"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, fuzzy, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
-
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
+#: printer/printerdrake.pm:4781
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now enabled."
+msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
+#: printer/printerdrake.pm:4786
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now disabled."
+msgstr "การเชื่อมต่อกับ Internet แบบ sharing ถูกยกเลิกแล้ว"
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, fuzzy, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, fuzzy, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, fuzzy, c-format
 msgid "Default printer"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr ""
 
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+#: raid.pm:36
+#, fuzzy, c-format
+msgid "Can't add a partition to _formatted_ RAID %s"
 msgstr "ไม่สามารถเพิ่มพาร์ติชั่นเป็น _formatted_ RAID md%d"
 
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid failed (maybe raidtools are missing?)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraid failed"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "ไม่มีพาร์ติชั่นพอสำหรับ RAID ระดับ %d\n"
@@ -12024,16 +12445,16 @@ msgstr ""
 msgid "Could not set permissions of firmware file %s!"
 msgstr ""
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
 #, fuzzy, c-format
 msgid "Scannerdrake"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
@@ -12063,7 +12484,8 @@ msgstr ""
 msgid "Allow/Forbid autologin."
 msgstr ""
 
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
 #, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -12073,29 +12495,38 @@ msgid ""
 "Else only /etc/issue is allowed."
 msgstr ""
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr ""
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, fuzzy, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, fuzzy, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
 "gdm)."
 msgstr ""
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -12107,14 +12538,15 @@ msgid ""
 "- NONE (no connection)."
 msgstr ""
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -12130,7 +12562,7 @@ msgid ""
 "(5))."
 msgstr ""
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -12143,7 +12575,7 @@ msgid ""
 "packages."
 msgstr ""
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -12152,100 +12584,105 @@ msgid ""
 "and crontab(1))."
 msgstr ""
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr ""
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, fuzzy, c-format
+msgid "Security Alerts:"
+msgstr "เลือกระดับระบบรักษาความปลอดภัย"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr ""
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr ""
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr ""
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr ""
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr ""
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr ""
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr ""
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr ""
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr ""
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, fuzzy, c-format
 msgid "Set the root umask."
 msgstr "ไม่มีรหัสผ่าน"
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr ""
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -12254,103 +12691,103 @@ msgid ""
 "- for users with the 0 id other than root."
 msgstr ""
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr ""
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr ""
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr ""
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr ""
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr ""
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr ""
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
 msgstr ""
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr ""
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr ""
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr ""
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr ""
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr ""
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr ""
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr ""
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, fuzzy, c-format
 msgid "Set the user umask."
 msgstr "ชื่อผู้ใช้"
@@ -12396,211 +12833,216 @@ msgid "List users on display managers (kdm and gdm)"
 msgstr ""
 
 #: security/l10n.pm:20
+#, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
 #, fuzzy, c-format
 msgid "Allow X Window connections"
 msgstr "การติดต่อโดยใช้ Modem ธรรมดา"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr ""
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr ""
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, fuzzy, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "ปรับแต่งการบริการต่างๆ"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr ""
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr ""
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr ""
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr ""
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr ""
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr ""
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr ""
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr ""
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr ""
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr ""
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, fuzzy, c-format
 msgid "No password aging for"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr ""
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, fuzzy, c-format
 msgid "Password history length"
 msgstr "รหัสผ่านนี้ง่ายต่อการเดา"
 
-#: security/l10n.pm:39
+#: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
 msgstr ""
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, fuzzy, c-format
 msgid "Root umask"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr ""
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, fuzzy, c-format
 msgid "Shell timeout"
 msgstr "Kernel Boot Timeout"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, fuzzy, c-format
 msgid "User umask"
 msgstr "ชื่อผู้ใช้"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, fuzzy, c-format
 msgid "Check open ports"
 msgstr "ค้นหาเจอบน port %s"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr ""
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr ""
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr ""
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr ""
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr ""
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr ""
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr ""
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr ""
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr ""
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr ""
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr ""
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr ""
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr ""
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr ""
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr ""
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr ""
@@ -12678,9 +13120,9 @@ msgid ""
 msgstr ""
 
 #: security/level.pm:55
-#, fuzzy, c-format
+#, c-format
 msgid "DrakSec Basic Options"
-msgstr "/Options/ทดลอง"
+msgstr ""
 
 #: security/level.pm:56
 #, fuzzy, c-format
@@ -12897,7 +13339,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 
 #: services.pm:66
@@ -12977,7 +13419,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 
 #: services.pm:87
@@ -12999,7 +13441,7 @@ msgstr ""
 
 #: services.pm:91
 #, fuzzy, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr "เริ่มและหยุด X Font Server ตอน boot และ เลิก"
 
 #: services.pm:117 services.pm:159
@@ -13044,7 +13486,7 @@ msgstr "หยุด"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr ""
 
 #: services.pm:221
@@ -13056,7 +13498,7 @@ msgstr ""
 "ไม่มีข้อมูลเพิ่มเติม\n"
 "สำหรับการบริการนี้ ขอโทษครับ"
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "ข้อมูล"
@@ -13071,719 +13513,1183 @@ msgstr ""
 msgid "On boot"
 msgstr "ขณะ boot"
 
-#: services.pm:244
+#: services.pm:246
 #, fuzzy, c-format
 msgid "Start"
 msgstr "สถานะ:"
 
-#: services.pm:244
+#: services.pm:246
 #, fuzzy, c-format
 msgid "Stop"
 msgstr "เซ็กเตอร์"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
 msgstr ""
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/01.pl:15
 #, fuzzy, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "ทดสอบการคอนฟิก"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "แบบผู้เชี่ยวชาญ (Expert)"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
 msgstr ""
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
+msgstr ""
+
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
 msgstr ""
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/02.pl:15
 #, fuzzy, c-format
-msgid "<b>Discovery</b>"
-msgstr "Driver"
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "ทดสอบการคอนฟิก"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
 msgstr ""
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
 msgstr ""
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>The KDE Choice</b>"
+msgid "<b>The GPL</b>"
 msgstr ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
+msgstr ""
+
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
 msgstr ""
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
 msgstr ""
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr ""
+
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "เฎ?เฏ?เฎฃเฎฏเฎฎเฎ?"
+#: share/advertising/05.pl:17
+#, c-format
+msgid ""
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:18
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:21
 #, c-format
-msgid "You can also:"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
 msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/06.pl:13
 #, c-format
-msgid "\t- browse the Web"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:17
+#: share/advertising/06.pl:15
 #, c-format
-msgid "\t- chat"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
 msgstr ""
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:17
 #, c-format
-msgid "\t- organize a video-conference"
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
 msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/07.pl:13
 #, c-format
-msgid "\t- create your own Web site"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
 msgstr ""
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- ..."
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
 msgstr ""
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:17
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
 msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/08.pl:13
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
 msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/08.pl:15
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
 msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:17
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid ""
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
 msgstr ""
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/09.pl:13
 #, fuzzy, c-format
-msgid "<b>Mandrake Control Center</b>"
+msgid "<b>Mandrakesoft Products</b>"
 msgstr "Control Center"
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr ""
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr ""
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
 msgstr ""
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:19
+#, c-format
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr ""
+
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
+
+#: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
-#, fuzzy, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "Control Center"
+#: share/advertising/10.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr ""
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:16
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
+msgid ""
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
-#, fuzzy, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "แบบผู้เชี่ยวชาญ (Expert)"
+#: share/advertising/10.pl:17
+#, c-format
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+
+#: share/advertising/11.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
+msgstr ""
+
+#: share/advertising/11.pl:16
+#, c-format
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/11.pl:17
 #, c-format
-msgid "\t- Full access to commercial applications"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:18
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
+msgid "<b>The KDE Choice</b>"
 msgstr ""
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/12.pl:15
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/12.pl:17
 #, c-format
-msgid "\t- Plus much more"
+msgid ""
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
 msgstr ""
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/12.pl:19
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
+msgid ""
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
 #, fuzzy, c-format
-msgid "Do you require assistance?"
-msgstr "คุณมีอินเทอร์เฟส %s จำนวนเท่าไหร่?"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "Graphical Desktops อื่นๆ"
+
+#: share/advertising/13-a.pl:15
+#, c-format
+msgid ""
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
+msgstr ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
+msgid ""
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
 msgstr ""
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/13-b.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/14.pl:13
+#, fuzzy, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "OpenOffice.org Math"
+
+#: share/advertising/14.pl:15
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
+msgid "<b>Kontact</b>"
 msgstr ""
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/15.pl:17
 #, c-format
 msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/16.pl:13
+#, fuzzy, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "เฎ?เฏ?เฎฃเฎฏเฎฎเฎ?"
+
+#: share/advertising/16.pl:15
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/16.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgid "\t* Browse the <b>Web</b> with Konqueror."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/16.pl:17
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/16.pl:18
 #, c-format
-msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr ""
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr ""
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr ""
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr ""
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr ""
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr ""
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr ""
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
 msgstr ""
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.pl:17
 #, c-format
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
+msgstr ""
+
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr ""
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:20
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
 msgstr ""
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr ""
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>รูปแบบการพัฒนาโปรแกรม</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
 msgstr ""
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/20.pl:13
 #, fuzzy, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "แบบผู้เชี่ยวชาญ (Expert)"
+msgid "<b>Development Editors</b>"
+msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
-#, fuzzy, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "คุณมีอินเทอร์เฟส %s จำนวนเท่าไหร่?"
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr ""
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:16
 #, c-format
-msgid "<b>Note</b>"
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
 msgstr ""
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:17
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
+msgid ""
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
 msgstr ""
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/21.pl:13
+#, fuzzy, c-format
+msgid "<b>Development Languages</b>"
+msgstr "พัฒนาซอฟท์แวร์ (Development)"
+
+#: share/advertising/21.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:16
 #, c-format
-msgid "<b>PowerPack+</b>"
+msgid "\t* The famous <b>C language</b>."
 msgstr ""
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/21.pl:17
 #, c-format
-msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+msgid "\t* Object oriented languages:"
 msgstr ""
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/21.pl:18
 #, c-format
-msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+msgid "\t\t* <b>C++</b>"
 msgstr ""
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr ""
+
+#: share/advertising/21.pl:20
 #, fuzzy, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "Graphical Desktops อื่นๆ"
+msgid "\t* Scripting languages:"
+msgstr "เครื่องมือจัดการการพิมพ์"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr ""
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr ""
+
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#, c-format
+msgid "\t* And many more."
+msgstr ""
+
+#: share/advertising/22.pl:13
+#, fuzzy, c-format
+msgid "<b>Development Tools</b>"
+msgstr "พัฒนาซอฟท์แวร์ (Development)"
+
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
+msgstr ""
+
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
+msgstr ""
+
+#: share/advertising/23.pl:16
+#, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/23.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr ""
+
+#: share/advertising/24.pl:13
+#, fuzzy, c-format
+msgid "<b>Servers</b>"
+msgstr "Driver"
+
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:16
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
+msgid ""
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:18
 #, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
 msgstr ""
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/24.pl:19
 #, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/24.pl:20
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/24.pl:21
 #, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/25.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "Control Center"
+
+#: share/advertising/25.pl:15
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
+msgid ""
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/25.pl:17
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
+msgid ""
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
 msgstr ""
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/26.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
+msgid "<b>The Open Source Model</b>"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:13
+#, fuzzy, c-format
+msgid "<b>Online Store</b>"
+msgstr "Control Center"
+
+#: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:17
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
+msgid "There you can find all our products, services and third-party products."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/27.pl:19
 #, c-format
-msgid "It includes both server and client features for:"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/27.pl:21
 #, c-format
-msgid "\t- Sending and receiving emails"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
 msgstr ""
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakeclub</b>"
+msgstr "Control Center"
+
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
 msgstr ""
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:17
 #, c-format
-msgid "\t- Address Book (server and client)"
+msgid ""
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:18
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:19
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid ""
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:20
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/28.pl:21
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
 msgstr ""
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakeonline</b>"
+msgstr "Control Center"
+
+#: share/advertising/29.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- And others"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
 
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr ""
+
+#: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakeexpert</b>"
+msgstr "Control Center"
+
+#: share/advertising/30.pl:15
 #, c-format
-msgid "<b>PowerPack</b>"
+msgid ""
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
 
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/compssUsers.pl:27
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:28
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:33
+#, fuzzy, c-format
+msgid "Game station"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/compssUsers.pl:34
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr ""
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:37
 #, fuzzy, c-format
-msgid "<b>Development tools</b>"
-msgstr "พัฒนาซอฟท์แวร์ (Development)"
+msgid "Multimedia station"
+msgstr "Multimedia - เขียน CD "
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:38
 #, c-format
+msgid "Sound and video playing/editing programs"
+msgstr ""
+
+#: share/compssUsers.pl:43
+#, fuzzy, c-format
+msgid "Internet station"
+msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
+
+#: share/compssUsers.pl:44
+#, fuzzy, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
+
+#: share/compssUsers.pl:49
+#, fuzzy, c-format
+msgid "Network Computer (client)"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Clients for different protocols including ssh"
+
+#: share/compssUsers.pl:54
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "การปรับแต่ง LAN"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr ""
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr ""
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, fuzzy, c-format
+msgid "Documentation"
+msgstr "ตำแหน่ง"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr ""
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr ""
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr ""
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr ""
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "เวิร์กกรุ๊ป (workgroup)"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "เซิร์ฟเวอร์ NIS"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, fuzzy, c-format
+msgid "Internet gateway"
+msgstr "การติดต่อ internet"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/ไฟล์/_ใหม่"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
+
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "เซิร์ฟเวอร์ NIS"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr ""
+
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "ใช้ NIS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "ชื่อโดเมน"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "เซิร์ฟเวอร์ NIS"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, fuzzy, c-format
+msgid "Database"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:121
 #, c-format
-msgid "And of course the editors!"
+msgid "Web/FTP"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr ""
+
+#: share/compssUsers.pl:125
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "เลือกภาษาที่คุณใช้"
+
+#: share/compssUsers.pl:126
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr ""
+
+#: share/compssUsers.pl:137
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr ""
+
+#: share/compssUsers.pl:146
+#, fuzzy, c-format
+msgid "KDE Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, fuzzy, c-format
+msgid "GNOME Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Graphical Desktops อื่นๆ"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr ""
 
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr ""
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, fuzzy, c-format
+msgid "SSH Server"
+msgstr "เซิร์ฟเวอร์ NIS"
+
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "อุปกรณ์"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "การคอนฟิก Internet"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Control Center"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "การคอนฟิกเครื่องพิมพ์"
+
 #: standalone.pm:21
 #, c-format
 msgid ""
@@ -13835,8 +14741,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -13859,7 +14765,7 @@ msgid ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -13872,7 +14778,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -13942,7 +14848,7 @@ msgid ""
 "       XFdrake resolution"
 msgstr ""
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -13950,106 +14856,100 @@ msgid ""
 "testing] [-v|--version] "
 msgstr ""
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "กรุณาออกไปและใช้ Ctrl-Alt-BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr ""
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr ""
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr ""
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
 "0/1 for Local Config...\n"
 msgstr ""
 
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr ""
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, fuzzy, c-format
 msgid "Terminal Server Configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, fuzzy, c-format
 msgid "Enable Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, fuzzy, c-format
 msgid "Disable Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, fuzzy, c-format
 msgid "Start Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, fuzzy, c-format
 msgid "Stop Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr ""
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr ""
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, fuzzy, c-format
 msgid "Add/Del Users"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, fuzzy, c-format
 msgid "Add/Del Clients"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr ""
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -14066,22 +14966,22 @@ msgid ""
 "    f) If it's thin clients, ask if you want to restart KDM.\n"
 msgstr ""
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, fuzzy, c-format
 msgid "Cancel Wizard"
 msgstr "Wizard"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr ""
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, fuzzy, c-format
 msgid "Use thin clients."
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -14090,45 +14990,45 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
 #, c-format
 msgid "Sync client X keyboard settings with server."
 msgstr ""
 
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr ""
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr ""
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, fuzzy, c-format
 msgid "Done!"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
 "be restarted. Restart now?"
 msgstr ""
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, fuzzy, c-format
 msgid "Terminal Server Overview"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -14144,7 +15044,7 @@ msgid ""
 "one full kernel."
 msgstr ""
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -14164,7 +15064,7 @@ msgid ""
 "like:"
 msgstr ""
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -14175,14 +15075,14 @@ msgid ""
 "\t\t\t\n"
 "        Note: The '#type' entry is only used by drakTermServ.  Clients can "
 "either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -14203,7 +15103,7 @@ msgid ""
 "clients."
 msgstr ""
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -14221,7 +15121,7 @@ msgid ""
 "        \tWith SUBNET/MASK being defined for your network."
 msgstr ""
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -14232,7 +15132,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -14243,7 +15143,7 @@ msgid ""
 "        \tdrakTermServ will help create these files."
 msgstr ""
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -14263,7 +15163,7 @@ msgid ""
 "machine is configured."
 msgstr ""
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -14273,7 +15173,7 @@ msgid ""
 "the boot image to \n"
 "        \teach diskless client.\n"
 "\n"
-"        \tA typical tftp configuration file looks like:\n"
+"        \tA typical TFTP configuration file looks like:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -14293,13 +15193,13 @@ msgid ""
 "        \tputs its images."
 msgstr ""
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -14311,62 +15211,62 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr ""
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr ""
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, fuzzy, c-format
 msgid "PXE Image"
 msgstr "Image"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, fuzzy, c-format
 msgid "Default kernel version"
 msgstr "kernel version"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr ""
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr ""
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr ""
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, fuzzy, c-format
 msgid "No NIC selected!"
 msgstr "ไม่เชื่อมต่อ"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr ""
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, fuzzy, c-format
 msgid "<-- Delete"
 msgstr "ลบ"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, fuzzy, c-format
 msgid "Delete All NBIs"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -14374,171 +15274,171 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, fuzzy, c-format
 msgid "Add User -->"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr ""
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, fuzzy, c-format
 msgid "type: %s"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr ""
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, fuzzy, c-format
 msgid ""
 "Allow local hardware\n"
 "configuration."
 msgstr "Boot Style Configuration"
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr ""
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, fuzzy, c-format
 msgid "Thin Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, fuzzy, c-format
 msgid "Allow Thin Clients"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr ""
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, fuzzy, c-format
 msgid "type: fat"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, fuzzy, c-format
 msgid "type: thin"
 msgstr "ประเภท: "
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, fuzzy, c-format
 msgid "local config: false"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, fuzzy, c-format
 msgid "local config: true"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, fuzzy, c-format
 msgid "<-- Edit Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr ""
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, fuzzy, c-format
 msgid "Delete Client"
 msgstr "DHCP Client"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, fuzzy, c-format
 msgid "dhcpd Config..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
 "(service dm restart - at the console)"
 msgstr ""
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr ""
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr ""
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, fuzzy, c-format
 msgid "Netmask:"
 msgstr "เน็ตมาสก์"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr ""
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr ""
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr ""
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, fuzzy, c-format
 msgid "Domain Name:"
 msgstr "ชื่อโดเมน"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, fuzzy, c-format
 msgid "Name Servers:"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr ""
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr ""
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr ""
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, fuzzy, c-format
 msgid "Write Config"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, fuzzy, c-format
 msgid "dhcpd Server Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -14546,103 +15446,97 @@ msgid ""
 "You can modify as needed."
 msgstr ""
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr ""
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, fuzzy, c-format
 msgid "Please insert floppy disk:"
 msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr ""
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr ""
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, fuzzy, c-format
 msgid "No floppy drive available!"
 msgstr "ไม่มีไดรว์ฟล้อปปี็เหลืออยู่"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr ""
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, fuzzy, c-format
 msgid "Error writing %s/%s"
 msgstr "ข้อผิดพลาดถูกบันทึกในไฟล์ %s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr ""
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr ""
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr ""
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr ""
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, fuzzy, c-format
 msgid "%s is not a user..\n"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr ""
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr ""
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr ""
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, fuzzy, c-format
 msgid "Deleted %s...\n"
 msgstr "ค้นพบ %s"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, fuzzy, c-format
 msgid "%s not found...\n"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr ""
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr ""
@@ -14725,8 +15619,8 @@ msgid ""
 "The parameters of the auto-install are available in the sections on the left"
 msgstr ""
 
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
 #, c-format
 msgid "Congratulations!"
 msgstr "ขอแสดงความยินดี"
@@ -14763,66 +15657,61 @@ msgstr ""
 msgid "tape"
 msgstr "ประเภท"
 
-#: standalone/drakbackup:112
-#, fuzzy, c-format
-msgid "No devices found"
-msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr ""
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
 "last backup."
 msgstr ""
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr ""
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
-"This should be a local user or email addresse that you want the backup "
+"This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
 "tree will not be backed up."
 msgstr ""
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -14830,7 +15719,7 @@ msgid ""
 "tar files after the backup."
 msgstr ""
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -14838,70 +15727,70 @@ msgid ""
 "path."
 msgstr ""
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
 "run-parts in /etc/crontab."
 msgstr ""
 
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr ""
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr ""
 
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
 "a complete email address!"
 msgstr ""
 
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr ""
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr ""
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
 msgstr ""
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 msgstr ""
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -14910,13 +15799,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
 #, fuzzy, c-format
 msgid "Total progress"
 msgstr "กำลังตรวจสอบพอร์ต"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -14925,42 +15814,42 @@ msgid ""
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr ""
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, fuzzy, c-format
 msgid "Cannot spawn %s."
 msgstr "Adapter %s: %s"
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr ""
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, fuzzy, c-format
 msgid "Bad password on %s"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr ""
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, fuzzy, c-format
 msgid "Can't find %s on %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr ""
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -14971,84 +15860,84 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr ""
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr ""
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr ""
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr ""
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr ""
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr ""
 
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr ""
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr ""
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
 "%d MB used vs %d MB allocated."
 msgstr ""
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr ""
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, fuzzy, c-format
 msgid "Hard Disk Backup files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, fuzzy, c-format
 msgid "Backup User files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, fuzzy, c-format
 msgid "Backup Other files..."
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr ""
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, fuzzy, c-format
 msgid "No changes to backup!"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -15056,7 +15945,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -15064,18 +15953,18 @@ msgid ""
 "FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr ""
 
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -15083,7 +15972,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -15091,1539 +15980,1540 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr ""
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, fuzzy, c-format
 msgid " Error while sending mail. \n"
 msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr ""
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
 "Please check all options that you need.\n"
 msgstr ""
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, fuzzy, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Incremental Backups"
 msgstr ""
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Differential Backups"
 msgstr ""
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr ""
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr ""
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, fuzzy, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr ""
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr ""
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, fuzzy, c-format
 msgid "Remove Selected"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, fuzzy, c-format
 msgid "Users"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, fuzzy, c-format
 msgid "Use network connection to backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr ""
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr ""
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr ""
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr ""
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, fuzzy, c-format
 msgid "Host name or IP."
 msgstr "ชื่อโฮสต์:"
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr ""
 
-#: standalone/drakbackup:1621
-#, fuzzy, c-format
-msgid "Login name"
-msgstr "ชื่อโดเมน"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, fuzzy, c-format
 msgid "Remember this password"
 msgstr "ไม่มีรหัสผ่าน"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr ""
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr ""
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, fuzzy, c-format
 msgid "Choose your CD/DVD device"
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, fuzzy, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, fuzzy, c-format
 msgid "Multisession CD"
 msgstr "Multimedia - เขียน CD "
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr ""
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, fuzzy, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "โปรดเลือกพาร์ติชั่น"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr ""
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr ""
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, fuzzy, c-format
 msgid "DVD-R media"
 msgstr "อุปกรณ์"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, fuzzy, c-format
 msgid "DVDRAM device"
 msgstr "อุปกรณ์"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, fuzzy, c-format
 msgid "No CD device defined!"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, fuzzy, c-format
 msgid "Use tape to backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr ""
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, fuzzy, c-format
 msgid "Don't rewind tape after backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, fuzzy, c-format
 msgid "Erase tape before backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, fuzzy, c-format
 msgid "Eject tape after the backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, fuzzy, c-format
 msgid "Enter the directory to save to:"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, fuzzy, c-format
 msgid "Directory to save to"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
 " allowed for Drakbackup (MB)"
 msgstr ""
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr ""
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr ""
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr ""
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr ""
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr ""
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr ""
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, fuzzy, c-format
 msgid "custom"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "มกราคม"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "มีนาคม"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "เมษายน"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "มิถุนายน"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "กรกฎาคม"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "สิงหาคม"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "กันยายน"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "ตุลาคม"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "ธันวาคม"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "อาทิตย์"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "จันทร์"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "อังคาร"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "พุธ"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "พฤหัสบดี"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "ศุกร์"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "เสาร์"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, fuzzy, c-format
 msgid "Use daemon"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, fuzzy, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr ""
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, fuzzy, c-format
 msgid "Minute"
 msgstr "1 นาที"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr ""
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, fuzzy, c-format
 msgid "Day"
 msgstr "พฤษภาคม"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, fuzzy, c-format
 msgid "Month"
 msgstr "เม้าท์"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, fuzzy, c-format
 msgid "Weekday"
 msgstr "พุธ"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, fuzzy, c-format
 msgid "Please choose the media for backup."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, fuzzy, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, fuzzy, c-format
 msgid "Please choose the compression type"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, fuzzy, c-format
 msgid "Use .backupignore files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr ""
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, fuzzy, c-format
 msgid "SMTP server for mail:"
 msgstr "ชื่อโฮสต์ของ SMB server"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr ""
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, fuzzy, c-format
 msgid "Where"
 msgstr "Wheel"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, fuzzy, c-format
 msgid "When"
 msgstr "Wheel"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, fuzzy, c-format
 msgid "More Options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, fuzzy, c-format
 msgid "Backup destination not configured..."
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, fuzzy, c-format
 msgid "Drakbackup Configuration"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, fuzzy, c-format
 msgid "Please choose where you want to backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr ""
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr ""
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr ""
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr ""
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, fuzzy, c-format
 msgid " (Default is all users)"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, fuzzy, c-format
 msgid "Please choose what you want to backup"
 msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง "
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, fuzzy, c-format
 msgid "Backup System"
 msgstr "เซ็ตอัพระบบไฟล์"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr ""
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, fuzzy, c-format
 msgid "Please select data to backup..."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
 "- System Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
 "- User Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
 "- Other Files:\n"
 msgstr ""
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr ""
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr ""
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr ""
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr ""
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, fuzzy, c-format
 msgid " on device: %s"
 msgstr "ดีไวซ์ของเม้าส์: %s\n"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr ""
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr ""
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
 "- Save via %s on host: %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
 "\t\t on path: %s \n"
 msgstr ""
 
-#: standalone/drakbackup:2518
-#, fuzzy, c-format
+#: standalone/drakbackup:2515
+#, c-format
 msgid ""
 "\n"
 "- Options:\n"
-msgstr "/Options/ทดลอง"
+msgstr ""
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr ""
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr ""
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr ""
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, fuzzy, c-format
 msgid "\tBackups use tar only\n"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, fuzzy, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, fuzzy, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
 "- Daemon, %s via:\n"
 msgstr ""
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr ""
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr ""
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr ""
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr ""
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr ""
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr ""
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr ""
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr ""
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, fuzzy, c-format
 msgid "- Restore System Files.\n"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr ""
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, fuzzy, c-format
 msgid "- Restore User Files: \n"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, fuzzy, c-format
 msgid "- Restore Other Files: \n"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, fuzzy, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "คุณต้องการให้โมเด็มของคุณต่อกับพอร์ตอนุกรมใด?"
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr ""
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr ""
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr ""
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, fuzzy, c-format
 msgid "         Restore Configuration       "
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr ""
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
 #, fuzzy, c-format
 msgid "Please choose the date to restore:"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, fuzzy, c-format
 msgid "Restore from Hard Disk."
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, fuzzy, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakbackup:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr ""
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, fuzzy, c-format
 msgid "Select another media to restore from"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, fuzzy, c-format
 msgid "Other Media"
 msgstr "อื่นๆ"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, fuzzy, c-format
 msgid "Restore system"
 msgstr "ติดตั้งระบบ"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, fuzzy, c-format
 msgid "Restore Users"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, fuzzy, c-format
 msgid "Restore Other"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, fuzzy, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, fuzzy, c-format
 msgid "Path To Restore To"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr ""
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr ""
 
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr ""
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, fuzzy, c-format
 msgid "No matches found..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, fuzzy, c-format
 msgid "Restore Selected"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, fuzzy, c-format
 msgid ""
 "Restore Selected\n"
 "Files"
 msgstr "ลบคิว"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr ""
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, fuzzy, c-format
 msgid "Restore From CD"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, fuzzy, c-format
 msgid "Restore From Tape"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr ""
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, fuzzy, c-format
 msgid "Restore Via Network"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr ""
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, fuzzy, c-format
 msgid "Host Name"
 msgstr "ชื่อโฮสต์:"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr ""
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, fuzzy, c-format
 msgid "Password required"
 msgstr "รหัสผ่าน"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, fuzzy, c-format
 msgid "Username required"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, fuzzy, c-format
 msgid "Hostname required"
 msgstr "ชื่อโฮสต์:"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr ""
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr ""
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, fuzzy, c-format
 msgid "Restore Failed..."
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, fuzzy, c-format
 msgid "%s not retrieved..."
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, fuzzy, c-format
 msgid "Search for files to restore"
 msgstr "คุณมีเม้าส์ชนิดใด"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr ""
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, fuzzy, c-format
 msgid "Custom Restore"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, fuzzy, c-format
 msgid "Restore From Catalog"
 msgstr "กู้ตารางพาร์ติชั่น"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, fuzzy, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, fuzzy, c-format
 msgid "Verify that %s is the correct path"
 msgstr "ถูกต้องหรือไม่?"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr ""
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr ""
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr ""
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, fuzzy, c-format
 msgid "Directory To Restore From"
 msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, fuzzy, c-format
 msgid "Restore Progress"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, fuzzy, c-format
 msgid "Save"
 msgstr "สถานะ:"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, fuzzy, c-format
 msgid "Build Backup"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, fuzzy, c-format
 msgid "Restore"
 msgstr "เรียกคืนจากไฟล์"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, fuzzy, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, fuzzy, c-format
 msgid "Please select data to restore..."
 msgstr "กรุณาเลือกภาษาที่ต้องการใช้"
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, fuzzy, c-format
 msgid "Backup system files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, fuzzy, c-format
 msgid "Backup user files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, fuzzy, c-format
 msgid "Backup other files"
 msgstr "ไฟล์แบ็คอัพมีปัญหา"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr ""
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, fuzzy, c-format
 msgid "Sending files by FTP"
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, fuzzy, c-format
 msgid "Sending files..."
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, fuzzy, c-format
 msgid "Backup Now from configuration file"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, fuzzy, c-format
 msgid "View Backup Configuration."
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, fuzzy, c-format
 msgid "Wizard Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, fuzzy, c-format
 msgid "Advanced Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, fuzzy, c-format
 msgid "View Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr ""
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, fuzzy, c-format
 msgid "Backup Now"
 msgstr "เซ็ตอัพระบบไฟล์"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr ""
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, fuzzy, c-format
 msgid "Graphical boot theme selection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "System mode"
 
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
 #, c-format
 msgid "/_File"
 msgstr "/_ไฟล์"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/ไฟล์/_เลิก"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, fuzzy, c-format
 msgid "Install themes"
 msgstr "ติดตั้งระบบ"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, fuzzy, c-format
 msgid "Create new theme"
 msgstr "สร้างพาร์ติชั่นใหม่"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr ""
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
 
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, fuzzy, c-format
+msgid "Do you want to configure it now?"
+msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
+
+#: standalone/drakboot:177
 #, fuzzy, c-format
 msgid "Theme"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
 "under console"
 msgstr ""
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "รัน X-Window เมื่อเริ่มทำงาน"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "ไม่ต้องการ autologin"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "ใช่แล้ว ผมต้องการ autologin สำหรับผู้ใช้รายนี้"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, fuzzy, c-format
 msgid "Default user"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, fuzzy, c-format
 msgid "Default desktop"
 msgstr "Default"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "การติดตั้ง %s ล้มเหลว ต่อไปนี้เป็นข้อผิดพลาดที่เกิดขึ้น"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 msgstr ""
 
-#: standalone/drakbug:48
+#: standalone/drakbug:41
 #, c-format
-msgid "Mandrake Bug Report Tool"
+msgid "Mandrakelinux Bug Report Tool"
 msgstr ""
 
-#: standalone/drakbug:53
-#, fuzzy, c-format
-msgid "Mandrake Control Center"
-msgstr "Control Center"
+#: standalone/drakbug:46
+#, c-format
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinux ฐานควบคุม"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr ""
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr ""
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
-msgstr ""
+msgstr "HardDrake"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, fuzzy, c-format
-msgid "Mandrake Online"
+msgid "Mandrakeonline"
 msgstr "Control Center"
 
-#: standalone/drakbug:59
+#: standalone/drakbug:52
 #, fuzzy, c-format
 msgid "Menudrake"
 msgstr "แบบผู้เชี่ยวชาญ (Expert)"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, fuzzy, c-format
 msgid "Msec"
 msgstr "Mouse"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, fuzzy, c-format
 msgid "Remote Control"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, fuzzy, c-format
 msgid "Software Manager"
 msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr ""
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr ""
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, fuzzy, c-format
 msgid "Userdrake"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, fuzzy, c-format
 msgid "Configuration Wizards"
 msgstr "Network Configuration Wizard"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, fuzzy, c-format
 msgid "Application:"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, fuzzy, c-format
 msgid "Package: "
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr ""
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, fuzzy, c-format
 msgid "Release: "
 msgstr "โปรดรอสักครู่"
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
 "or Full Path:"
 msgstr ""
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, fuzzy, c-format
 msgid "Find Package"
 msgstr "แพ็คเก็จ %d ชุด"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "รวมความ"
 
-#: standalone/drakbug:129
+#: standalone/drakbug:104
 #, c-format
-msgid "YOUR TEXT HERE"
+msgid "Bug Description/System Information"
 msgstr ""
 
-#: standalone/drakbug:132
+#: standalone/drakbug:105
 #, c-format
-msgid "Bug Description/System Information"
+msgid "YOUR TEXT HERE"
 msgstr ""
 
-#: standalone/drakbug:136
+#: standalone/drakbug:108
 #, fuzzy, c-format
 msgid "Submit kernel version"
 msgstr "kernel version"
 
-#: standalone/drakbug:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr ""
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr ""
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open  a web browser window on %s\n"
+" where you'll find a form to fill in.  The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+
+#: standalone/drakbug:130
 #, fuzzy, c-format
 msgid "Report"
 msgstr "Port"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, fuzzy, c-format
 msgid "Not installed"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, fuzzy, c-format
 msgid "Package not installed"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr ""
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, fuzzy, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "อ่าน CUPS drivers database..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, fuzzy, c-format
 msgid "No browser available! Please install one"
 msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, fuzzy, c-format
 msgid "Please enter a package name."
 msgstr "โปรดป้อนชื่อผู้ใช้"
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr ""
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, fuzzy, c-format
 msgid "not defined"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, fuzzy, c-format
 msgid "Change Time Zone"
 msgstr "โซนเวลา"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "ช่วงเวลา-DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT-DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, fuzzy, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "คุณต้องการให้เซ็ตนาฬิกาฮาร์ดแวร์เป็น GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, fuzzy, c-format
 msgid "Network Time Protocol"
 msgstr "Network interface"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
 " with a remote time server using NTP"
 msgstr ""
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr ""
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, fuzzy, c-format
 msgid "Server:"
 msgstr "เซิร์ฟเวอร์"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, fuzzy, c-format
 msgid "Reset"
 msgstr "ไม่ยอมรับ"
 
-#: standalone/drakclock:214
-#, c-format
+#: standalone/drakclock:225
+#, fuzzy, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
 msgstr ""
+"แพกเกจนี้จำเป็นต้องถูก upgrade\n"
+"คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก (%d adapters)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "เกตเวย์:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Interface:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr ""
@@ -16633,12 +17523,8 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Driver"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, fuzzy, c-format
 msgid "State"
 msgstr "สถานะ:"
@@ -16653,7 +17539,7 @@ msgstr "ชื่อโฮสต์:"
 msgid "Configure hostname..."
 msgstr "คอนฟิกเม้าส์"
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "การปรับแต่ง LAN"
@@ -16663,8 +17549,8 @@ msgstr "การปรับแต่ง LAN"
 msgid "Configure Local Area Network..."
 msgstr "ปรับแต่งระบบเน็ตเวิร์กภายใน..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "มีผลทันที"
@@ -16674,272 +17560,298 @@ msgstr "มีผลทันที"
 msgid "Manage connections"
 msgstr "cable connection"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, fuzzy, c-format
 msgid "Device selected"
 msgstr "ลบคิว"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, fuzzy, c-format
 msgid "IP configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, fuzzy, c-format
 msgid "DNS servers"
 msgstr "เซิร์ฟเวอร์ DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, fuzzy, c-format
 msgid "Search Domain"
 msgstr "โดเมน NIS"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, fuzzy, c-format
 msgid "static"
 msgstr "กำหนดค่า IP แบบอัตโนมัติ"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr ""
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, fuzzy, c-format
+msgid "Metric"
+msgstr "จำเพาะ"
+
+#: standalone/drakconnect:491
 #, fuzzy, c-format
 msgid "Flow control"
 msgstr "<control>S"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, fuzzy, c-format
 msgid "Line termination"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, fuzzy, c-format
 msgid "Modem timeout"
 msgstr "Kernel Boot Timeout"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, fuzzy, c-format
 msgid "Use lock file"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr ""
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, fuzzy, c-format
 msgid "Busy wait"
 msgstr "ออก"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, fuzzy, c-format
 msgid "Modem sound"
 msgstr "Mouse"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "enable"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "disable"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr ""
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "ชี่อ module"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, fuzzy, c-format
 msgid "Mac Address"
 msgstr "ค่า IP"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr ""
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr ""
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
 msgstr "ไม่สามารถตรวจพบ network adapter บนเครื่องนี้ กรุณารันโปรแกรมปรับแต่ง hardware"
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, fuzzy, c-format
 msgid "Remove a network interface"
 msgstr "เลือก network interface"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, fuzzy, c-format
 msgid "Select the network interface to remove:"
 msgstr "เลือก network interface"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, fuzzy, c-format
 msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr ""
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
+msgid "No IP"
 msgstr ""
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "แพ็คเก็จชำรุด"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr ""
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, fuzzy, c-format
 msgid "down"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "เชื่อมต่ออยู่"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "ไม่เชื่อมต่อ"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "ยกเลิกติดต่อ..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "ติดต่อ"
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, fuzzy, c-format
 msgid "Deactivate now"
 msgstr "แอ็คทีฟ"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, fuzzy, c-format
 msgid "Activate now"
 msgstr "แอ็คทีฟ"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Boot Protocol"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "เริ่มทำงานตอน boot"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, fuzzy, c-format
 msgid "Third DNS server (optional)"
 msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "การติดต่อ internet"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "สถานะ:"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr ""
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr ""
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -16947,94 +17859,101 @@ msgid ""
 "several different X sessions on your local machine at the same time."
 msgstr ""
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, fuzzy, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+msgid ""
+"You are going to close all running programs and lose your current session. "
+"Are you really sure that you want to restart the dm service?"
+msgstr ""
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, fuzzy, c-format
 msgid "Boot disk creation"
 msgstr "สร้าง boot disk"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "ทั่วไป"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, fuzzy, c-format
 msgid "Device"
 msgstr "อุปกรณ์: "
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, fuzzy, c-format
 msgid "Kernel version"
 msgstr "kernel version"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, fuzzy, c-format
 msgid "Preferences"
 msgstr "ข้อกำหนด: "
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, fuzzy, c-format
 msgid "Advanced preferences"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "ขนาด"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, fuzzy, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "mkinitrd optional arguments"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "บังคับ"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "ยกเว้น raid modules"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "ถ้าต้องการ"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "ยกเว้น scsi modules"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "เพิ่ม 1 module"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "ลบทิ้ง 1 module"
 
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "ตรวจให้แน่ใจว่ามีอุปกรณ์อยู่ใน%s"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, fuzzy, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -17043,22 +17962,23 @@ msgstr ""
 "ยังไม่มีอุปกรณ์ใน %s \n"
 "กรุณาใส่อุปกรณ์ด้วย"
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "ไม่สามารถ forkได้.%s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, fuzzy, c-format
 msgid "Floppy creation completed"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr ""
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, fuzzy, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -17196,7 +18116,7 @@ msgstr "กำหนดจุดเม้าท์"
 msgid "About"
 msgstr "เลิก"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, fuzzy, c-format
 msgid "Uninstall"
 msgstr "ออกจากการติดตั้ง"
@@ -17206,10 +18126,11 @@ msgstr "ออกจากการติดตั้ง"
 msgid "Import"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -17219,7 +18140,7 @@ msgid ""
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -17239,7 +18160,7 @@ msgid ""
 " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -17257,12 +18178,12 @@ msgid ""
 "             Convert ttf font files to afm and pfb fonts\n"
 msgstr ""
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, fuzzy, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "เลือกพาร์ติชั่นที่คุณต้องการฟอร์แมต"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -17272,122 +18193,127 @@ msgid ""
 "hang up your X Server."
 msgstr ""
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr ""
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, fuzzy, c-format
 msgid "StarOffice"
 msgstr "ดี"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, fuzzy, c-format
 msgid "Abiword"
 msgstr "เลิก"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, fuzzy, c-format
 msgid "Generic Printers"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr ""
 
-#: standalone/drakfont:587
+#: standalone/drakfont:589
 #, fuzzy, c-format
 msgid "File Selection"
 msgstr "เลือกกลุ่มแพ็คเก็จ"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, fuzzy, c-format
 msgid "You've not selected any font"
 msgstr "ลบคิว"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, fuzzy, c-format
 msgid "Import fonts"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, fuzzy, c-format
 msgid "Install fonts"
 msgstr "ติดตั้งระบบ"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr ""
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr ""
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr ""
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, fuzzy, c-format
 msgid "Selected All"
 msgstr "เลือกไฟล์"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, fuzzy, c-format
 msgid "Remove List"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, fuzzy, c-format
 msgid "Importing fonts"
 msgstr "ฟอร์แมตพาร์ติชั่น"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, fuzzy, c-format
 msgid "Initial tests"
 msgstr "ข้อความ init"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, fuzzy, c-format
 msgid "Copy fonts on your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr ""
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, fuzzy, c-format
 msgid "Post Install"
 msgstr "ติดตั้ง"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, fuzzy, c-format
 msgid "Remove fonts on your system"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, fuzzy, c-format
 msgid "Post Uninstall"
 msgstr "ออกจากการติดตั้ง"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr ""
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "การติดต่อ internet แบบ share ถูกยกเลิกแล้ว"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -17396,39 +18322,39 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "enable"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "คอนฟิกใหม่"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "เลิก"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "เริ่มทำงาน server"
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing เริ่มทำงานแล้ว"
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "การเชื่อมต่อ internet แบบ share ได้ทำงานแล้ว"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -17437,22 +18363,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "disable"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "ยกเลิกการทำงานของ server"
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "การเชื่อมต่อกับ Internet แบบ sharing ถูกยกเลิกแล้ว"
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, fuzzy, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -17471,27 +18397,27 @@ msgstr ""
 "\n"
 "คุณต้องการให้ผู้อื่นใช้ internet ร่วมด้วยหรือไม่\n"
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Interface %s (using module %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Interface %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Network interface"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -17506,19 +18432,24 @@ msgstr ""
 "\n"
 "ผมกำลังจะใช้ adapter นี้กับระบบ LAN"
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "เลือก network interface"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "กรุณาเลือก network adapter ที่จะใช้กับระบบ LAN"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, fuzzy, c-format
 msgid "Network interface already configured"
 msgstr "ไม่มีการคอนฟิกจอภาพ"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -17528,27 +18459,27 @@ msgid ""
 "You can do it manually but you need to know what you're doing."
 msgstr ""
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, fuzzy, c-format
 msgid "Automatic reconfiguration"
 msgstr "Boot Style Configuration"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr ""
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, fuzzy, c-format
 msgid "Show current interface configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, fuzzy, c-format
 msgid "Current interface configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -17559,7 +18490,7 @@ msgid ""
 "Driver: %s"
 msgstr ""
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -17575,12 +18506,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, fuzzy, c-format
 msgid "Local Network adress"
 msgstr "ไม่พบการ์ดเน็ตเวิร์ก"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -17589,72 +18520,72 @@ msgid ""
 "If you don't know the meaning of an option, simply leave it as it is."
 msgstr ""
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, fuzzy, c-format
 msgid "(This) DHCP Server IP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, fuzzy, c-format
 msgid "The DNS Server IP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, fuzzy, c-format
 msgid "The internal domain name"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr ""
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr ""
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr ""
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr ""
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr ""
 
-#: standalone/drakgw:352
+#: standalone/drakgw:354
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "มีความขัดแย้งของ LAN address ซึ่งเจอในคอนฟิกปัจจุบันใน %s!\n"
 
-#: standalone/drakgw:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "กำลังทำการคอนฟิก"
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "กำลังปรับแต่ง scripts ติดตั้งโปรแกรม และเริ่มทำงาน servers..."
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "ปัญหาการติดตั้งแพ็คเก็จ %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -17669,7 +18600,7 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -17694,56 +18625,61 @@ msgid ""
 "frontend)\n"
 msgstr ""
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, fuzzy, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinux ฐานควบคุม"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
 ". No Help entry of this type\n"
 msgstr ""
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
 "browse the help system"
 msgstr ""
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, fuzzy, c-format
 msgid "System settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, fuzzy, c-format
 msgid "Custom settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, fuzzy, c-format
 msgid "Custom & system settings"
 msgstr "กำลังพาร์ติชั่น Custom disk"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, fuzzy, c-format
 msgid "Editable"
 msgstr "disable"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr ""
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, fuzzy, c-format
 msgid "User"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, fuzzy, c-format
 msgid "Group"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, fuzzy, c-format
 msgid "Permissions"
 msgstr "เวอร์ชั่น: %s\n"
@@ -17799,9 +18735,9 @@ msgid "Delete selected rule"
 msgstr "ลบคิว"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, fuzzy, c-format
 msgid "Edit"
 msgstr "Ext2"
@@ -17811,99 +18747,117 @@ msgstr "Ext2"
 msgid "Edit current rule"
 msgstr ""
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr ""
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "user"
+msgstr "Mouse"
+
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "group"
+msgstr "เวิร์กกรุ๊ป (workgroup)"
+
+#: standalone/drakperm:247
+#, fuzzy, c-format
+msgid "other"
+msgstr "อื่นๆ"
+
+#: standalone/drakperm:252
 #, fuzzy, c-format
 msgid "Read"
 msgstr "เรียกอีกครั้ง"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr ""
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, fuzzy, c-format
 msgid "Write"
-msgstr "XFree %s"
+msgstr "Xorg %s"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr ""
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr ""
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr ""
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr ""
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
 msgstr ""
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr ""
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, fuzzy, c-format
 msgid "Use owner id for execution"
 msgstr "ใช้ auto detection"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr ""
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, fuzzy, c-format
 msgid "Use group id for execution"
 msgstr "ใช้ auto detection"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, fuzzy, c-format
-msgid "User :"
+msgid "User:"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, fuzzy, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "เวิร์กกรุ๊ป (workgroup)"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, fuzzy, c-format
 msgid "Current user"
 msgstr "ยอมรับผู้ใช้"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr ""
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, fuzzy, c-format
 msgid "Path selection"
 msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, fuzzy, c-format
 msgid "Property"
 msgstr "Port"
@@ -18009,54 +18963,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr ""
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr ""
 
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "default"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
 #, fuzzy, c-format
-msgid "ignore"
+msgid "Ignore"
 msgstr "ไม่มี"
 
-#: standalone/draksec:44
-#, fuzzy, c-format
-msgid "no"
-msgstr "ข้อมูล"
-
-#: standalone/draksec:44
-#, fuzzy, c-format
-msgid "yes"
-msgstr "ใช่"
-
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -18091,59 +19033,54 @@ msgid ""
 "maximum"
 msgstr ""
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+
+#: standalone/draksec:168
 #, fuzzy, c-format
 msgid "(default value: %s)"
 msgstr " (Default)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, fuzzy, c-format
 msgid "Security Level:"
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: standalone/draksec:173
-#, fuzzy, c-format
-msgid "Security Alerts:"
-msgstr "เลือกระดับระบบรักษาความปลอดภัย"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, fuzzy, c-format
 msgid "Security Administrator:"
 msgstr "อ๊อปชั่นของเครื่องพิมพ์แบบรีโมท"
 
-#: standalone/draksec:179
-#, fuzzy, c-format
-msgid "Basic options"
-msgstr "/Options/ทดลอง"
-
-#: standalone/draksec:192
+#: standalone/draksec:219
 #, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
+msgid "Basic options"
 msgstr ""
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, fuzzy, c-format
 msgid "Network Options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, fuzzy, c-format
 msgid "System Options"
 msgstr "อ๊อปชั่นของโมดูล:"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr ""
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, fuzzy, c-format
 msgid "Please wait, setting security level..."
 msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, fuzzy, c-format
 msgid "Please wait, setting security options..."
 msgstr "กำลังเตรียมการติดตั้ง"
@@ -18153,7 +19090,8 @@ msgstr "กำลังเตรียมการติดตั้ง"
 msgid "No Sound Card detected!"
 msgstr "ไม่เชื่อมต่อ"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -18166,7 +19104,7 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -18291,15 +19229,15 @@ msgstr ""
 msgid "Make kernel message quiet by default"
 msgstr ""
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, fuzzy, c-format
 msgid "Notice"
 msgstr "NoVideo"
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
 msgstr ""
 
 #: standalone/draksplash:167
@@ -18312,183 +19250,193 @@ msgstr "เลือกกิจกรรม"
 msgid "saving Bootsplash theme..."
 msgstr ""
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, fuzzy, c-format
 msgid "ProgressBar color selection"
 msgstr "เลือกการเชื่อมต่อกับเครื่องพิมพ์"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, fuzzy, c-format
 msgid "You must choose an image file first!"
 msgstr "อุปกรณ์เครื่องพิมพ์ URI"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, fuzzy, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "กำลังตรวจสอบอุปกรณ์..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr ""
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr ""
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, fuzzy, c-format
 msgid "Add an UPS device"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, fuzzy, c-format
 msgid "Autodetection"
 msgstr "ใช้ auto detection"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, fuzzy, c-format
 msgid "Detection in progress"
 msgstr "ค้นหาเจอบน port %s"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, fuzzy, c-format
 msgid "Congratulations"
 msgstr "ขอแสดงความยินดี"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr ""
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, fuzzy, c-format
 msgid "No new UPS devices was found"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, fuzzy, c-format
 msgid "UPS driver configuration"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, fuzzy, c-format
 msgid "Please select your UPS model."
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr ""
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
 "Please fill in its name, its driver and its port."
 msgstr ""
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr ""
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr ""
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, fuzzy, c-format
 msgid "Port:"
 msgstr "Port"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, fuzzy, c-format
 msgid "The port on which is connected your ups"
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr ""
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, fuzzy, c-format
 msgid "UPS devices"
 msgstr "อุปกรณ์"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "ชื่อ"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, fuzzy, c-format
 msgid "UPS users"
 msgstr "ชื่อผู้ใช้"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr ""
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr ""
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, fuzzy, c-format
 msgid "Rules"
 msgstr "ไม่ยอมรับ"
 
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
 msgid "Action"
-msgstr "/_Options"
+msgstr ""
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, fuzzy, c-format
 msgid "Level"
 msgstr "ระดับ"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, fuzzy, c-format
 msgid "ACL name"
 msgstr "ชื่อ LVM"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
 #, fuzzy, c-format
 msgid "DrakUPS"
 msgstr "Dvorak (US)"
 
-#: standalone/drakups:307
+#: standalone/drakups:335
 #, fuzzy, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "ทดสอบการคอนฟิก"
@@ -18510,7 +19458,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:105
@@ -18535,7 +19483,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 
 #: standalone/drakvpn:135
@@ -18593,7 +19541,7 @@ msgstr "ลบทิ้ง 1 module"
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -18618,13 +19566,13 @@ msgstr "การปรับแต่ง LAN"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 
 #: standalone/drakvpn:307
@@ -18647,12 +19595,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 
 #: standalone/drakvpn:333 standalone/drakvpn:694
@@ -18695,7 +19643,7 @@ msgstr ""
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -18722,7 +19670,7 @@ msgstr "โหมดธรรมดา"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, fuzzy, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Ext2"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -18926,7 +19874,7 @@ msgstr "ชื่อการเชื่อมต่อ"
 
 #: standalone/drakvpn:590
 #, fuzzy, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Adapter %s: %s"
 
 #: standalone/drakvpn:591
@@ -18934,10 +19882,10 @@ msgstr "Adapter %s: %s"
 msgid ""
 "You cannot edit this section.\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 msgstr ""
 
 #: standalone/drakvpn:600
@@ -18973,7 +19921,7 @@ msgstr ""
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
@@ -18998,7 +19946,7 @@ msgid ""
 "The racoon.conf file configuration.\n"
 "\n"
 "The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
 "  - display \t\t (display the file contents)\n"
 "  - add\t\t\t (add one section)\n"
 "  - edit \t\t\t (modify parameters of an existing section)\n"
@@ -19026,7 +19974,7 @@ msgstr ""
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -19067,23 +20015,23 @@ msgstr "เปลี่ยนประเภทพาร์ติชั่น"
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
@@ -19190,7 +20138,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19218,7 +20166,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19243,7 +20191,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19271,7 +20219,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -19291,7 +20239,7 @@ msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
 "Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"group is one of the following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
 
@@ -19305,11 +20253,11 @@ msgstr "หมายเลขโทรศัพท์"
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -19331,18 +20279,18 @@ msgstr ""
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
 "\n"
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
@@ -19382,7 +20330,7 @@ msgid ""
 "ments apply to all peers which do not match any other remote\n"
 "directive.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "remote anonymous\n"
 "remote ::1 [8000]"
@@ -19507,7 +20455,7 @@ msgstr ""
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -19516,7 +20464,7 @@ msgid ""
 "\tmy_identifier user_fqdn string;\n"
 "\t\tthe type is a USER_FQDN (user fully-qualified\n"
 "\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\tthe type is a FQDN (fully-qualified domain name).\n"
 "\tmy_identifier keyid file;\n"
 "\t\tthe type is a KEY_ID.\n"
@@ -19525,7 +20473,7 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
@@ -19545,9 +20493,9 @@ msgstr "Protocol"
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
@@ -19595,7 +20543,7 @@ msgstr "พฤษภาคม"
 #: standalone/drakvpn:1138
 #, c-format
 msgid "Flag"
-msgstr ""
+msgstr "ธง"
 
 #: standalone/drakvpn:1139
 #, fuzzy, c-format
@@ -19643,6 +20591,11 @@ msgid "require"
 msgstr ""
 
 #: standalone/drakvpn:1146
+#, c-format
+msgid "default"
+msgstr "default"
+
+#: standalone/drakvpn:1146
 #, fuzzy, c-format
 msgid "use"
 msgstr "Mouse"
@@ -19652,114 +20605,115 @@ msgstr "Mouse"
 msgid "unique"
 msgstr "มิถุนายน"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr ""
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, fuzzy, c-format
 msgid "Canada (cable)"
 msgstr "คานาดา (ควิเบค)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr ""
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr ""
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "West Europe"
 msgstr "ยุโรป"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "East Europe"
 msgstr "ยุโรป"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, fuzzy, c-format
 msgid "France [SECAM]"
 msgstr "ฝรั่งเศษ"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr ""
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr ""
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr ""
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr ""
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr ""
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr ""
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr ""
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, fuzzy, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr ""
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr ""
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr ""
 
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -19772,46 +20726,23 @@ msgid ""
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, fuzzy, c-format
 msgid "Alternative drivers"
 msgstr "กำลังพิมพ์กระดาษทดสอบ"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr ""
 
-#: standalone/harddrake2:22
-#, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: standalone/harddrake2:23
-#, fuzzy, c-format
-msgid "Channel"
-msgstr "ยกเลิก"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr ""
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr ""
-
 #: standalone/harddrake2:24
 #, c-format
 msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
 
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, fuzzy, c-format
 msgid "Bus identification"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
@@ -19832,131 +20763,280 @@ msgid ""
 msgstr ""
 
 #: standalone/harddrake2:33
-#, fuzzy, c-format
-msgid "Cache size"
-msgstr "ขนาดของ chunk"
+#, c-format
+msgid "Drive capacity"
+msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
+msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr ""
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
+msgid "this field describes the device"
 msgstr ""
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
+#, fuzzy, c-format
+msgid "Old device file"
+msgstr "เลือกไฟล์"
+
+#: standalone/harddrake2:36
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
+msgid "old static device name used in dev package"
 msgstr ""
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
+#, fuzzy, c-format
+msgid "New devfs device"
+msgstr "อุปกรณ์เกตเวย์"
+
+#: standalone/harddrake2:38
 #, c-format
-msgid "Coma bug"
+msgid "new dynamic device name generated by core kernel devfs"
 msgstr ""
 
-#: standalone/harddrake2:37
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
+#, fuzzy, c-format
+msgid "Module"
+msgstr "Mouse"
+
+#: standalone/harddrake2:41
 #, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr ""
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:42
+#, fuzzy, c-format
+msgid "Extended partitions"
+msgstr "สร้างพาร์ติชั่นใหม่"
+
+#: standalone/harddrake2:42
+#, fuzzy, c-format
+msgid "the number of extended partitions"
+msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
+
+#: standalone/harddrake2:43
+#, fuzzy, c-format
+msgid "Geometry"
+msgstr "เรียกคืนจากไฟล์"
+
+#: standalone/harddrake2:43
 #, c-format
-msgid "Cpuid family"
+msgid "Cylinder/head/sectors geometry of the disk"
 msgstr ""
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:44
 #, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
+msgid "Disk controller"
+msgstr ""
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
 msgstr ""
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:45
+#, c-format
+msgid "class of hardware device"
+msgstr ""
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
 #, fuzzy, c-format
-msgid "Cpuid level"
-msgstr "เลือกระดับระบบรักษาความปลอดภัย"
+msgid "Model"
+msgstr "Mouse"
+
+#: standalone/harddrake2:46
+#, fuzzy, c-format
+msgid "hard disk model"
+msgstr "Card mem (DMA)"
+
+#: standalone/harddrake2:47
+#, fuzzy, c-format
+msgid "network printer port"
+msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "Primary partitions"
+msgstr "ฟอร์แมตพาร์ติชั่น"
+
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "the number of the primary partitions"
+msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
+
+#: standalone/harddrake2:49
 #, c-format
-msgid "information level that can be obtained through the cpuid instruction"
+msgid "the vendor name of the device"
 msgstr ""
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:50
 #, c-format
-msgid "Frequency (MHz)"
+msgid "Bus PCI #"
 msgstr ""
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:50
+#, fuzzy, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
+
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device #"
+msgstr "อุปกรณ์"
+
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device number"
+msgstr "หมายเลขโทรศัพท์"
+
+#: standalone/harddrake2:52
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
+msgid "PCI function #"
 msgstr ""
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "ชื่อการเชื่อมต่อ"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "ยกเลิก"
+
+#: standalone/harddrake2:53
 #, c-format
-msgid "this field describes the device"
+msgid "this is the standard numerical identifier of the vendor"
 msgstr ""
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:54
 #, fuzzy, c-format
-msgid "Old device file"
-msgstr "เลือกไฟล์"
+msgid "Device ID"
+msgstr "อุปกรณ์: "
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:54
 #, c-format
-msgid "old static device name used in dev package"
+msgid "this is the numerical identifier of the device"
 msgstr ""
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr ""
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:56
 #, fuzzy, c-format
-msgid "New devfs device"
-msgstr "อุปกรณ์เกตเวย์"
+msgid "Sub device ID"
+msgstr "อุปกรณ์"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:56
 #, c-format
-msgid "new dynamic device name generated by core kernel devfs"
+msgid "this is the minor numerical identifier of the device"
 msgstr ""
 
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
+#: standalone/harddrake2:57
 #, fuzzy, c-format
-msgid "Module"
-msgstr "Mouse"
+msgid "Device USB ID"
+msgstr "อุปกรณ์: "
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:57
 #, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
+msgid ".."
 msgstr ""
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr ""
+
+#: standalone/harddrake2:61
+#, c-format
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
+
+#: standalone/harddrake2:62
 #, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "สร้างพาร์ติชั่นใหม่"
+msgid "Cache size"
+msgstr "ขนาดของ chunk"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr ""
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr ""
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr ""
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr ""
+
+#: standalone/harddrake2:67
 #, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "ไม่มีพื้นที่เพียงพอสำหรับ พาร์ติชั่น ใหม่"
+msgid "Cpuid level"
+msgstr "เลือกระดับระบบรักษาความปลอดภัย"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr ""
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+
+#: standalone/harddrake2:69
 #, c-format
 msgid "Flags"
 msgstr ""
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr ""
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr ""
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -19964,478 +21044,548 @@ msgid ""
 "Floating point DIVision (FDIV)"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr ""
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr ""
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr ""
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "เรียกคืนจากไฟล์"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr ""
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
 "after the \"halt\" instruction is used"
 msgstr ""
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr ""
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr ""
+
+#: standalone/harddrake2:79
 #, fuzzy, c-format
-msgid "Floppy format"
-msgstr "ฟอร์แมต"
+msgid "Model name"
+msgstr "ชี่อ module"
 
-#: standalone/harddrake2:60
+#: standalone/harddrake2:79
 #, c-format
-msgid "format of floppies supported by the drive"
+msgid "official vendor name of the cpu"
 msgstr ""
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:80
 #, c-format
-msgid "sub generation of the cpu"
+msgid "the name of the CPU"
 msgstr ""
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:81
 #, c-format
-msgid "class of hardware device"
+msgid "Processor ID"
 msgstr ""
 
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr ""
+
+#: standalone/harddrake2:82
 #, fuzzy, c-format
-msgid "Model"
-msgstr "Mouse"
+msgid "Model stepping"
+msgstr "ฟอร์แมต"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr ""
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr ""
 
-#: standalone/harddrake2:63
+#: standalone/harddrake2:84
 #, fuzzy, c-format
-msgid "hard disk model"
-msgstr "Card mem (DMA)"
+msgid "Write protection"
+msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:64
+#: standalone/harddrake2:84
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgid ""
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
+"memory page level, thus enabling the processor to prevent unchecked kernel "
+"accesses to user memory (aka this is a bug guard)"
 msgstr ""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:88
 #, fuzzy, c-format
-msgid "Model name"
-msgstr "ชี่อ module"
+msgid "Floppy format"
+msgstr "ฟอร์แมต"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:88
 #, c-format
-msgid "official vendor name of the cpu"
+msgid "format of floppies supported by the drive"
 msgstr ""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:92
 #, fuzzy, c-format
-msgid "Number of buttons"
-msgstr "2 buttons"
+msgid "Channel"
+msgstr "ยกเลิก"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr ""
+
+#: standalone/harddrake2:93
 #, fuzzy, c-format
-msgid "the number of buttons the mouse has"
-msgstr "2 buttons"
+msgid "Disk identifier"
+msgstr "เครื่องพิมพ์"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:93
 #, c-format
-msgid "the name of the CPU"
+msgid "usually the disk serial number"
 msgstr ""
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:94
 #, fuzzy, c-format
-msgid "network printer port"
-msgstr "เครื่องพิมพ์ในระบบ Network (TCP/Socket)"
+msgid "Logical unit number"
+msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:94
 #, c-format
-msgid "Processor ID"
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
 msgstr ""
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:99
+#, fuzzy, c-format
+msgid "Device file"
+msgstr "เลือกไฟล์"
+
+#: standalone/harddrake2:99
 #, c-format
-msgid "the number of the processor"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:100
+#, c-format
+msgid "Emulated wheel"
+msgstr ""
+
+#: standalone/harddrake2:100
 #, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "ฟอร์แมตพาร์ติชั่น"
+msgid "whether the wheel is emulated or not"
+msgstr "Logitech MouseMan"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:101
 #, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
+msgid "the type of the mouse"
+msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:102
 #, fuzzy, c-format
-msgid "Model stepping"
-msgstr "ฟอร์แมต"
+msgid "the name of the mouse"
+msgstr "2 buttons"
 
-#: standalone/harddrake2:71
-#, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr ""
+#: standalone/harddrake2:103
+#, fuzzy, c-format
+msgid "Number of buttons"
+msgstr "2 buttons"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:103
+#, fuzzy, c-format
+msgid "the number of buttons the mouse has"
+msgstr "2 buttons"
+
+#: standalone/harddrake2:104
 #, fuzzy, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:105
 #, c-format
-msgid "the vendor name of the device"
+msgid "Mouse protocol used by X11"
 msgstr ""
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:105
 #, c-format
-msgid "the vendor name of the processor"
+msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
 #, fuzzy, c-format
-msgid "Write protection"
-msgstr "ใช้ auto detection"
+msgid "Identification"
+msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, fuzzy, c-format
+msgid "Connection"
+msgstr "ชื่อการเชื่อมต่อ"
+
+#: standalone/harddrake2:122
+#, fuzzy, c-format
+msgid "Performances"
+msgstr "ข้อกำหนด: "
+
+#: standalone/harddrake2:123
+#, fuzzy, c-format
+msgid "Bugs"
+msgstr "สิงหาคม"
+
+#: standalone/harddrake2:124
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
+msgid "FPU"
 msgstr ""
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:132
+#, fuzzy, c-format
+msgid "Partitions"
+msgstr "พาร์ติชั่น %s"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr ""
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
-msgstr "/_Options"
+msgstr "/_อ็อปชั่น"
 
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
 #, c-format
 msgid "/_Help"
 msgstr "/_ช่วยเหลือ"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, fuzzy, c-format
 msgid "/Autodetect _printers"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, fuzzy, c-format
 msgid "/Autodetect _modems"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, fuzzy, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "ใช้ auto detection"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
-#, fuzzy, c-format
+#: standalone/harddrake2:172 standalone/printerdrake:158
+#, c-format
 msgid "/_Quit"
-msgstr "ออก"
+msgstr "/_ออก"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, fuzzy, c-format
 msgid "/_Fields description"
 msgstr "รายละเอียด"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr ""
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
 msgstr ""
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_แจ้ง Bug"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
-#, fuzzy, c-format
+#: standalone/harddrake2:198 standalone/printerdrake:180
+#, c-format
 msgid "/_About..."
-msgstr "/ช่วยเหลือ/_เกี่ยวกับ..."
+msgstr "/_เกี่ยวกับ..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr ""
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, fuzzy, c-format
-msgid "Harddrake2 version %s"
-msgstr "การตรวจหาฮาร์ดไดรว์"
+msgid "Harddrake2"
+msgstr "ฮาร์ดแวร์"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, fuzzy, c-format
 msgid "Detected hardware"
 msgstr "อ่านต่อข้อมูลของฮาร์ดแวร์"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, fuzzy, c-format
 msgid "Configure module"
 msgstr "คอนฟิกเม้าส์"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr ""
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr ""
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, fuzzy, c-format
 msgid "Unknown"
 msgstr "Generic"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, fuzzy, c-format
+msgid "Misc"
+msgstr "Mouse"
+
+#: standalone/harddrake2:332
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, fuzzy, c-format
 msgid "secondary"
 msgstr "%d วินาที"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr ""
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, fuzzy, c-format
 msgid "burner"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "DVD"
 msgstr "ดีวีดี"
 
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "คุณต้องการเลือกคีย์บอร์ดเลย์เอ้าท์แบบใด "
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr ""
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, fuzzy, c-format
+msgid "LocaleDrake"
+msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 
-#: standalone/logdrake:51
+#: standalone/logdrake:50
 #, fuzzy, c-format
-msgid "Mandrake Tools Logs"
+msgid "Mandrakelinux Tools Logs"
 msgstr "Control Center"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, fuzzy, c-format
 msgid "Logdrake"
 msgstr "logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr ""
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/ไฟล์/_ใหม่"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/ไฟล์/_เปิด"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/ไฟล์/_บันทึก"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/ไฟล์/บันทึก_เป็น"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/ไฟล์/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
-msgstr "/Options/ทดลอง"
+msgstr "/อ็อปชั่น/ทดลอง"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/ช่วยเหลือ/_เกี่ยวกับ..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr ""
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr ""
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr ""
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr ""
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "ค้นหา"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "อุปกรณ์ตรวจสอบ logs"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "ค่าติดตั้ง"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, fuzzy, c-format
 msgid "Matching"
 msgstr "matching"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "but not matching"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "เลือก file"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "ปฎิทิน"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "ข้อความของ file"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr ""
 
-#: standalone/logdrake:170
+#: standalone/logdrake:169
 #, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
 msgstr ""
 
 #: standalone/logdrake:221
@@ -20443,62 +21593,57 @@ msgstr ""
 msgid "please wait, parsing file: %s"
 msgstr "โปรดกรุณารอ,parsing file:%s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr ""
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, fuzzy, c-format
 msgid "Domain Name Resolver"
 msgstr "ชื่อโดเมน"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, fuzzy, c-format
 msgid "Ftp Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, fuzzy, c-format
 msgid "Postfix Mail Server"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, fuzzy, c-format
 msgid "Samba Server"
 msgstr "เซิร์ฟเวอร์ NIS"
 
-#: standalone/logdrake:411
-#, fuzzy, c-format
-msgid "SSH Server"
-msgstr "เซิร์ฟเวอร์ NIS"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, fuzzy, c-format
 msgid "Webmin Service"
 msgstr "อุปกรณ์"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, fuzzy, c-format
 msgid "Xinetd Service"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, fuzzy, c-format
 msgid "Configure the mail alert system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr ""
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, fuzzy, c-format
 msgid "Mail alert configuration"
 msgstr "การปรับแต่ง LAN"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -20506,66 +21651,66 @@ msgid ""
 "Here, you'll be able to set up the alert system.\n"
 msgstr ""
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, fuzzy, c-format
 msgid "What do you want to do?"
 msgstr "คุณต้องการเม้าท์อุปกรณ์ %s ไว้ที่ใด?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, fuzzy, c-format
 msgid "Services settings"
 msgstr "อุปกรณ์"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr ""
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, fuzzy, c-format
 msgid "Load setting"
 msgstr "ฟอร์แมต"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr ""
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr ""
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, fuzzy, c-format
 msgid "Alert configuration"
 msgstr "การคอนฟิก"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, fuzzy, c-format
 msgid "Please enter your email address below "
 msgstr "โปรดลองอีกครั้ง"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr ""
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr ""
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr ""
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "บันทึกแฟ้มเป็น"
@@ -20590,293 +21735,330 @@ msgstr "Mouse Systems"
 msgid "Please test your mouse:"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, 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:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "ไม่มีการคอนฟิกจอภาพ"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, fuzzy, c-format
+msgid "Connect %s"
+msgstr "เชื่อมต่ออยู่"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, fuzzy, c-format
+msgid "Disconnect %s"
+msgstr "ยกเลิกติดต่อ..."
+
+#: standalone/net_applet:55
+#, fuzzy, c-format
+msgid "Monitor Network"
+msgstr "เรียกคืนจากไฟล์"
+
+#: standalone/net_applet:56
+#, fuzzy, c-format
+msgid "Configure Network"
+msgstr "คอนฟิกระบบเน็ตเวิร์ก"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, fuzzy, c-format
+msgid "Refresh"
+msgstr "ไม่ยอมรับ"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr ""
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, fuzzy, c-format
 msgid "Network Monitoring"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr ""
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr ""
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, fuzzy, c-format
 msgid ""
 "Sending\n"
 "speed:"
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, fuzzy, c-format
 msgid ""
 "Receiving\n"
 "speed:"
 msgstr "บันทึกลงไฟล์"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, fuzzy, c-format
 msgid ""
 "Connection\n"
 "time: "
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, fuzzy, c-format
 msgid "Wait please, testing your connection..."
 msgstr "ทดสอบ connection..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, fuzzy, c-format
 msgid "Disconnecting from Internet "
 msgstr "ต่อเข้า Internet "
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, fuzzy, c-format
 msgid "Connecting to Internet "
 msgstr "ต่อเข้า Internet "
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, fuzzy, c-format
 msgid "Disconnection from Internet failed."
 msgstr "ต่อเข้า Internet "
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, fuzzy, c-format
 msgid "Disconnection from Internet complete."
 msgstr "ต่อเข้า Internet "
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, fuzzy, c-format
 msgid "Connection complete."
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, fuzzy, c-format
 msgid "Color configuration"
 msgstr "การคอนฟิก"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr ""
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr ""
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr ""
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, fuzzy, c-format
 msgid "Local measure"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr ""
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr ""
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 
-#: standalone/net_monitor:421
-#, fuzzy, c-format
-msgid "Disconnect %s"
-msgstr "ยกเลิกติดต่อ..."
-
-#: standalone/net_monitor:421
-#, fuzzy, c-format
-msgid "Connect %s"
-msgstr "เชื่อมต่ออยู่"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, fuzzy, c-format
 msgid "No internet connection configured"
 msgstr "การปรับแต่งการติดต่อเข้า internet"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, fuzzy, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "การคอนฟิก Internet"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, fuzzy, c-format
 msgid "Reading data of installed printers..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, fuzzy, c-format
 msgid "%s Printer Management Tool"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
-#, fuzzy, c-format
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
+#, c-format
 msgid "/_Actions"
-msgstr "/_Options"
+msgstr ""
+
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, fuzzy, c-format
+msgid "/_Add Printer"
+msgstr "เครื่องพิมพ์"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:149
 #, fuzzy, c-format
 msgid "/Set as _Default"
 msgstr " (Default)"
 
-#: standalone/printerdrake:144
-#, fuzzy, c-format
+#: standalone/printerdrake:150
+#, c-format
 msgid "/_Edit"
-msgstr "Ext2"
+msgstr "/แ_ก้ไข"
 
-#: standalone/printerdrake:145
-#, fuzzy, c-format
+#: standalone/printerdrake:151
+#, c-format
 msgid "/_Delete"
-msgstr "ลบ"
+msgstr "/_ลบ"
 
-#: standalone/printerdrake:146
-#, fuzzy, c-format
+#: standalone/printerdrake:152
+#, c-format
 msgid "/_Expert mode"
-msgstr "โหมดผู้เชี่ยวชาญ"
+msgstr "/โหมดผู้เชี่ยวชาญ"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
-msgstr ""
-
-#: standalone/printerdrake:154
-#, fuzzy, c-format
-msgid "/_Add Printer"
-msgstr "เครื่องพิมพ์"
+msgstr "/เ_รยกใหม"
 
-#: standalone/printerdrake:158
-#, fuzzy, c-format
+#: standalone/printerdrake:164
+#, c-format
 msgid "/_Configure CUPS"
-msgstr "คอนฟิกระบบ X"
+msgstr "/_คอนฟิกระบบ CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, fuzzy, c-format
 msgid "Search:"
 msgstr "ค้นหา"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr ""
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr ""
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, fuzzy, c-format
 msgid "Printer Name"
 msgstr "ชื่อพรินต์คิว"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, fuzzy, c-format
 msgid "Connection Type"
 msgstr "ชนิดการเชื่อมต่อ"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, fuzzy, c-format
 msgid "Server Name"
 msgstr "เซิร์ฟเวอร์"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, fuzzy, c-format
 msgid "Add Printer"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, fuzzy, c-format
 msgid "Add a new printer to the system"
 msgstr "ไม่มีเครื่องพิมพ์"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, fuzzy, c-format
 msgid "Set as default"
 msgstr "default"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, fuzzy, c-format
 msgid "Set selected printer as the default printer"
 msgstr "คุณต้องการพิมพ์ทดสอบหรือไม่?"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, fuzzy, c-format
 msgid "Edit selected printer"
 msgstr "ค้นพบ %s"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, fuzzy, c-format
 msgid "Delete selected printer"
 msgstr "ลบคิว"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, fuzzy, c-format
-msgid "Refresh"
-msgstr "ไม่ยอมรับ"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, fuzzy, c-format
 msgid "Refresh the list"
 msgstr "ฟอร์แมต loopback file %s"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, fuzzy, c-format
 msgid "Configure CUPS"
 msgstr "คอนฟิกระบบ X"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, fuzzy, c-format
 msgid "Configure CUPS printing system"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "enable"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, fuzzy, c-format
+msgid "Disabled"
+msgstr "disable"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "ผู้แต่ง:  "
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, fuzzy, c-format
 msgid "Printer Management \n"
 msgstr "ไม่มีเครื่องพิมพ์"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, fuzzy, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -20886,209 +22068,198 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, fuzzy, c-format
 msgid "Aborting Scannerdrake."
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr ""
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, fuzzy, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, fuzzy, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr ""
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr ""
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, fuzzy, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "คุณต้องการคอนฟิกเครื่องพิมพ์ด้วยหรือไม่"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, fuzzy, c-format
 msgid "Select a scanner model"
 msgstr "เลือกกราฟฟิคการ์ด"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr ""
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, fuzzy, c-format
 msgid "Detected model: %s"
 msgstr "ค้นพบ %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ""
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, fuzzy, c-format
 msgid "Port: %s"
 msgstr "Port"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr ""
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr ""
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr ""
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr ""
 
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
 
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr ""
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, fuzzy, c-format
 msgid "Select firmware file"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr ""
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
 "everytime when they are turned on."
 msgstr ""
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
 "can be installed."
 msgstr ""
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
 "firmware here by supplying the new firmware file."
 msgstr ""
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr ""
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, fuzzy, c-format
 msgid "Select firmware file for the %s"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, fuzzy, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr ""
 
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr ""
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
 "You can launch printerdrake from the %s Control Center in Hardware section."
 msgstr ""
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, fuzzy, c-format
 msgid "Auto-detect available ports"
 msgstr "ใช้ auto detection"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr ""
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr ""
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, fuzzy, c-format
 msgid "choose device"
 msgstr "อุปกรณ์บูต"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, fuzzy, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -21096,7 +22267,7 @@ msgid ""
 "Graphics in the applications menu."
 msgstr ""
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, fuzzy, c-format
 msgid ""
 "The following scanners\n"
@@ -21105,7 +22276,7 @@ msgid ""
 "are available on your system.\n"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, fuzzy, c-format
 msgid ""
 "The following scanner\n"
@@ -21114,137 +22285,137 @@ msgid ""
 "is available on your system.\n"
 msgstr "ไม่มีอุปกรณ์ Network บนเครื่องคุณ"
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr ""
 
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
 #, fuzzy, c-format
 msgid "Search for new scanners"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr ""
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, fuzzy, c-format
 msgid "Install/Update firmware files"
 msgstr "เลือกไฟล์"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, fuzzy, c-format
 msgid "Scanner sharing"
 msgstr "เครื่องพิมพ์"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, fuzzy, c-format
 msgid "All remote machines"
 msgstr "เครื่องพิมพ์แบบรีโมท"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, fuzzy, c-format
 msgid "This machine"
 msgstr "matching"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
 
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
 "available on this machine."
 msgstr ""
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr ""
 
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
 #, fuzzy, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "เครื่องพิมพ์"
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr ""
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr ""
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, fuzzy, c-format
 msgid "Sharing of local scanners"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
 "available:"
 msgstr ""
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, fuzzy, c-format
 msgid "Add host"
 msgstr "เพิ่มผู้ใช้"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, fuzzy, c-format
 msgid "Edit selected host"
 msgstr "ค้นพบ %s"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, fuzzy, c-format
 msgid "Remove selected host"
 msgstr "ลบคิว"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
 msgstr ""
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, fuzzy, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: standalone/scannerdrake:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr ""
 
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
 #, fuzzy, c-format
 msgid "Usage of remote scanners"
 msgstr "ใช้พื้นที่ที่ว่าง"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr ""
 
-#: standalone/scannerdrake:913
+#: standalone/scannerdrake:909
 #, fuzzy, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -21254,32 +22425,32 @@ msgstr ""
 "แพกเกจนี้จำเป็นต้องถูก upgrade\n"
 "คุณแน่ใจว่าจะไม่เลือกมันหรือ"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr ""
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr ""
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr ""
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, fuzzy, c-format
 msgid "Some devices were added: %s\n"
 msgstr "ดีไวซ์ของเม้าส์: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr ""
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, fuzzy, c-format
 msgid "Hardware probing in progress"
 msgstr "ค้นหาเจอบน port %s"
@@ -21291,7 +22462,7 @@ msgstr ""
 
 #: standalone/service_harddrake_confirm:8
 #, fuzzy, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
 #: steps.pm:14
@@ -21384,22 +22555,22 @@ msgstr "ติดตั้งระบบ"
 msgid "Exit install"
 msgstr "ออกจากการติดตั้ง"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "ถูกต้องหรือไม่?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "ขยาย tree"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "ยุบ tree"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "เปลี่ยนไปมาระหว่างการจัดเรียงแบบ flat หรือ group"
@@ -21416,172 +22587,355 @@ msgstr ""
 msgid "Installation failed"
 msgstr "เลือกชุดการติดตั้ง"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Workstation ที่ทำงาน"
+#, fuzzy
+#~ msgid "The "
+#~ msgstr "ชื่อที่ใช้ในกรุ๊ป (sharename)"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
+#, fuzzy
+#~ msgid "Server Information:"
+#~ msgstr "แสดงข้อมูล"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Game station"
-msgstr "Workstation ที่ทำงาน"
+#~ msgid "Use SSL connection"
+#~ msgstr "LAN connection"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr ""
+#, fuzzy
+#~ msgid "User Base:"
+#~ msgstr "ชื่อผู้ใช้"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Multimedia station"
-msgstr "Multimedia - เขียน CD "
+#~ msgid "Base:"
+#~ msgstr "ชื่อ:"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr ""
+#, fuzzy
+#~ msgid "Scope:"
+#~ msgstr "เซ็กเตอร์"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet station"
-msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
+#~ msgid "Bind Server:"
+#~ msgstr "เซิร์ฟเวอร์"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "เชคโกสโลวาเกีย (QWERTZ)"
+
+#~ msgid "German"
+#~ msgstr "เยอรมัน"
+
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid "Spanish"
+#~ msgstr "สเปน"
+
+#~ msgid "Finnish"
+#~ msgstr "ฟินแลนด์"
+
+#~ msgid "French"
+#~ msgstr "ฝรั่งเศษ"
+
+#~ msgid "Norwegian"
+#~ msgstr "นอร์เวย์"
+
+#~ msgid "Polish"
+#~ msgstr "โปแลนด์"
+
+#~ msgid "Russian"
+#~ msgstr "รัสเซีย"
+
+#~ msgid "Swedish"
+#~ msgstr "สวีเดน"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
+#~ msgid "Albanian"
+#~ msgstr "Iranian"
+
+#~ msgid "Armenian (old)"
+#~ msgstr "อาร์เมเนียน (เก่า)"
+
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "อาร์เมเนียน (พิมพ์ดีด)"
+
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "อาร์เมเนียน (โฟเนติค)"
+
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "Azerbaidjani (latin)"
+
+#~ msgid "Belgian"
+#~ msgstr "เบลเยี่ยม"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer (client)"
-msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+#~ msgid "Bengali"
+#~ msgstr "enable"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients for different protocols including ssh"
+#, fuzzy
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Configuration"
-msgstr "การปรับแต่ง LAN"
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "บัลกาเรีย"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "บราซิล"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr ""
+#, fuzzy
+#~ msgid "Bosnian"
+#~ msgstr "Estonian"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr ""
+#~ msgid "Belarusian"
+#~ msgstr "Belarusian"
+
+#~ msgid "Swiss (German layout)"
+#~ msgstr "สวิส (เลย์เอ้าท์ตามเยอรมัน)"
+
+#~ msgid "Swiss (French layout)"
+#~ msgstr "สวิส (เลย์เอ้าท์ตามฝรั่งเศษ)"
+
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "เชคโกสโลวาเกีย (QWERTY)"
+
+#~ msgid "German (no dead keys)"
+#~ msgstr "German (no dead keys)"
+
+#~ msgid "Danish"
+#~ msgstr "เดนมาร์ก"
+
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak (US)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "KDE Workstation"
-msgstr "Workstation ที่ทำงาน"
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (Norwegian)"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak (Norwegian)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "GNOME Workstation"
-msgstr "Workstation ที่ทำงาน"
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak (US)"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
+#~ msgid "Estonian"
+#~ msgstr "Estonian"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Graphical Desktops อื่นๆ"
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "จอร์เจีย (เลย์เอ้าท์แบบรัสเซีย)"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr ""
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "จอร์เจีย (เลย์เอ้าท์แบบละติน)"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
+#~ msgid "Greek"
+#~ msgstr "กรีก"
+
+#~ msgid "Hungarian"
+#~ msgstr "อังการี"
+
+#~ msgid "Croatian"
+#~ msgstr "Croatian"
+
+#~ msgid "Israeli"
+#~ msgstr "อิสราเอล"
+
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "อิลราเอล (โฟเนติค)"
+
+#~ msgid "Iranian"
+#~ msgstr "Iranian"
+
+#~ msgid "Icelandic"
+#~ msgstr "ไอซ์แลนด์"
+
+#~ msgid "Italian"
+#~ msgstr "อิตาลี"
+
+#~ msgid "Japanese 106 keys"
+#~ msgstr "Japanese 106 keys"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Documentation"
-msgstr "ตำแหน่ง"
+#~ msgid "Kannada"
+#~ msgstr "ปฎิทิน"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr ""
+#~ msgid "Korean keyboard"
+#~ msgstr "Korean keyboard"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+#, fuzzy
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "อังกฤษ"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+#~ msgid "Latin American"
+#~ msgstr "ละตินอเมริกา"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr ""
+#, fuzzy
+#~ msgid "Laotian"
+#~ msgstr "ตำแหน่ง"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr ""
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "Lithuanian AZERTY (old)"
+
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "Lithuanian AZERTY (new)"
+
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "ลิธัวเนีย \"แถวตัวเลข\" QWERTY"
+
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "ลิธัวเนีย \"โฟเนติค\" QWERTY"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Mail"
-msgstr "เลือกภาษาที่คุณใช้"
+#~ msgid "Latvian"
+#~ msgstr "ตำแหน่ง"
+
+#~ msgid "Macedonian"
+#~ msgstr "Macedonian"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Postfix mail server"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "Azerbaidjani (cyrillic)"
+
+#~ msgid "Dutch"
+#~ msgstr "ฮอลแลนด์"
+
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "Polish (qwerty layout)"
+
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "Polish (qwertz layout)"
+
+#~ msgid "Portuguese"
+#~ msgstr "โปรตุเกส"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "คานาดา (ควิเบค)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "รัสเซีย (โฟเนติค)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Database"
-msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Dvorak (Norwegian)"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr ""
+#~ msgid "Slovenian"
+#~ msgstr "สโลวาเนีย"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr ""
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "สโลวาเกีย (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "สโลวาเกีย (QWERTY)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Internet gateway"
-msgstr "การติดต่อ internet"
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "Azerbaidjani (cyrillic)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Network Computer server"
-msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+#~ msgid "Syriac"
+#~ msgstr "พอร์ตอนุกรม"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr ""
+#, fuzzy
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: ../../share/compssUsers:999
 #, fuzzy
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
+#~ msgid "Telugu"
+#~ msgstr "เบลเยี่ยม"
+
+#, fuzzy
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "อาร์เมเนียน (พิมพ์ดีด)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "ไทย"
+
+#, fuzzy
+#~ msgid "Tajik keyboard"
+#~ msgstr "ไทย"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "ตุรกี (โมเดลแบบแผน \"F\")"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "ตุรกี (โมเดลสมัยใหม่ \"Q\")"
+
+#~ msgid "Ukrainian"
+#~ msgstr "ยูเครน"
+
+#, fuzzy
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "Azerbaidjani (cyrillic)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "Vietnamese \"numeric row\" QWERTY"
+
+#, fuzzy
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "ยูโกสลาเวีย (เลย์เอ้าท์แบบละติน)"
+
+#, fuzzy
+#~ msgid "No devices found"
+#~ msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
+
+#~ msgid "Enable multiple profiles"
+#~ msgstr "Enable multiple profiles"
+
+#~ msgid ""
+#~ "You may now provide options to module %s.\n"
+#~ "Options are in format ``name=value name2=value2...''.\n"
+#~ "For instance, ``io=0x300 irq=7''"
+#~ msgstr ""
+#~ "คุณสามารถป้อนข้อมูลอ๊อปชั่นให้กับโมดูล %s ได้แล้ว\n"
+#~ "อ๊อปชั่นจะอยู่ในรูปแบบ ``name=value name2=value2 ...''\n"
+#~ "ตัวอย่างเช่น, ``io=0x300 irq=7''"
+
+#~ msgid "Installation of %s failed. The following error occurred:"
+#~ msgstr "การติดตั้ง %s ล้มเหลว ต่อไปนี้เป็นข้อผิดพลาดที่เกิดขึ้น"
+
+#~ msgid "Use auto detection"
+#~ msgstr "ใช้ auto detection"
+
+#~ msgid "/dev/hda"
+#~ msgstr "/dev/hda"
+
+#~ msgid "/dev/hdb"
+#~ msgstr "/dev/hdb"
+
+#~ msgid "/dev/fd0"
+#~ msgstr "/dev/fd0"
+
+#~ msgid ""
+#~ "No ethernet network adapter has been detected on your system.\n"
+#~ "I cannot set up this connection type."
+#~ msgstr ""
+#~ "ไม่พบการ์ด ethernet \n"
+#~ "ผมไม่สามารถจัดทำการติดต่อชนิดนี้"
+
+#~ msgid ""
+#~ "Please choose which network adapter you want to use to connect to "
+#~ "Internet."
+#~ msgstr "กรุณาเลือก Network Adaptor สำหรับการต่อเข้า Internet"
+
+#~ msgid "chunk size"
+#~ msgstr "ขนาดของ chunk"
+
+#~ msgid "mkraid failed (maybe raidtools are missing?)"
+#~ msgstr "mkraid failed (maybe raidtools are missing?)"
+
+#~ msgid "mkraid failed"
+#~ msgstr "mkraid failed"
+
+#~ msgid "SILO Installation"
+#~ msgstr "การติดตั้ง SILO"
+
+#~ msgid "First sector of boot partition"
+#~ msgstr "เซ็กเตอร์แรกของบูตพาร์ติชั่น"
+
+#~ msgid "Bootloader installation"
+#~ msgstr "การติดตั้ง Bootloader"
+
+#~ msgid "SILO"
+#~ msgstr "SILO"
 
 #~ msgid "4 billion colors (32 bits)"
 #~ msgstr "สี่พันล้านสี (32 บิต)"
author	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:40:59 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-10-07 13:40:59 +0000
commit	79ecddfe11c0aa12f6ebefb6542b7c286b66400d (patch)
tree	8a2aeb882e59d623794d2b734b74d7bd5035461a /perl-install/share/po/th.po
parent	54f5f51c6dcfc30abb2d64781404ba7bdbead24e (diff)
download	drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.gz drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.bz2 drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.tar.xz drakx-backup-do-not-use-79ecddfe11c0aa12f6ebefb6542b7c286b66400d.zip